From f61b0831a21f65c44013008541b081cd0ac1b657 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 7 Mar 2019 00:57:02 +0000
Subject: [PATCH] Various improvements. Contributed by Liamxroy.

---
 .../dist/game/data/EnchantItemData.xml        |  24 +++-
 .../game/data/spawns/Elven/ElvenFortress.xml  |   2 -
 .../dist/game/data/stats/armorsets/Sets.xml   |  15 ++
 .../game/data/stats/items/32300-32399.xml     |   2 -
 .../game/data/stats/items/33800-33899.xml     |   3 +-
 .../game/data/stats/items/34000-34099.xml     |   2 -
 .../dist/game/data/stats/npcs/34300-34399.xml |   2 +-
 .../dist/game/data/EnchantItemData.xml        |  24 +++-
 .../game/data/spawns/Elven/ElvenFortress.xml  |   2 -
 .../dist/game/data/stats/armorsets/Sets.xml   |  15 ++
 .../game/data/stats/items/32300-32399.xml     |   2 -
 .../game/data/stats/items/33800-33899.xml     |   3 +-
 .../game/data/stats/items/34000-34099.xml     |   2 -
 .../game/data/stats/items/46000-46099.xml     |  91 ++++++++++++
 .../dist/game/data/stats/npcs/34300-34399.xml |   2 +-
 .../dist/game/data/EnchantItemData.xml        |  24 +++-
 .../game/data/spawns/Elven/ElvenFortress.xml  |   2 -
 .../dist/game/data/stats/armorsets/Sets.xml   |  15 ++
 .../game/data/stats/items/32300-32399.xml     |   2 -
 .../game/data/stats/items/33800-33899.xml     |   3 +-
 .../game/data/stats/items/34000-34099.xml     |   2 -
 .../game/data/stats/items/46000-46099.xml     |  91 ++++++++++++
 .../dist/game/data/stats/npcs/34300-34399.xml |   2 +-
 .../game/data/stats/skills/13900-13999.xml    |  98 +++++++++++++
 .../dist/game/data/EnchantItemData.xml        |  24 +++-
 .../game/data/spawns/Elven/ElvenFortress.xml  |   2 -
 .../dist/game/data/stats/armorsets/Sets.xml   |  15 ++
 .../game/data/stats/items/32300-32399.xml     |   2 -
 .../game/data/stats/items/33800-33899.xml     |   3 +-
 .../game/data/stats/items/34000-34099.xml     |   2 -
 .../game/data/stats/items/46000-46099.xml     |  91 ++++++++++++
 .../game/data/stats/skills/13900-13999.xml    |  98 +++++++++++++
 .../dist/game/data/EnchantItemData.xml        |  24 +++-
 .../dist/game/data/PrimeShop.xml              |  35 +++++
 .../game/data/spawns/Elven/ElvenFortress.xml  |   2 -
 .../dist/game/data/stats/armorsets/Sets.xml   |  15 ++
 .../game/data/stats/items/32300-32399.xml     |   2 -
 .../game/data/stats/items/33800-33899.xml     |   3 +-
 .../game/data/stats/items/34000-34099.xml     |   2 -
 .../game/data/stats/items/46000-46099.xml     |  91 ++++++++++++
 .../game/data/stats/items/47900-47999.xml     |  15 +-
 .../game/data/stats/items/48100-48199.xml     |  13 ++
 .../game/data/stats/skills/11500-11599.xml    |   6 +-
 .../game/data/stats/skills/13900-13999.xml    |  98 +++++++++++++
 .../dist/game/data/EnchantItemData.xml        |  24 +++-
 .../dist/game/data/PrimeShop.xml              |  35 +++++
 .../game/data/spawns/Elven/ElvenFortress.xml  |   2 -
 .../dist/game/data/stats/armorsets/Sets.xml   |  15 ++
 .../game/data/stats/items/32300-32399.xml     |   2 -
 .../game/data/stats/items/33800-33899.xml     |   3 +-
 .../game/data/stats/items/34000-34099.xml     |   2 -
 .../game/data/stats/items/46000-46099.xml     |  91 ++++++++++++
 .../game/data/stats/items/47900-47999.xml     |  15 +-
 .../game/data/stats/items/48100-48199.xml     |  13 ++
 .../game/data/stats/skills/11500-11599.xml    |   6 +-
 .../game/data/stats/skills/13900-13999.xml    |  98 +++++++++++++
 .../dist/game/data/EnchantItemData.xml        |  24 +++-
 .../dist/game/data/PrimeShop.xml              |  35 +++++
 .../game/data/spawns/Elven/ElvenFortress.xml  |   2 -
 .../data/spawns/Innadril/FafurionTemple.xml   | 129 ++++++++++++++++++
 .../dist/game/data/stats/armorsets/Sets.xml   |  15 ++
 .../game/data/stats/items/32300-32399.xml     |   2 -
 .../game/data/stats/items/33800-33899.xml     |   3 +-
 .../game/data/stats/items/34000-34099.xml     |   2 -
 .../game/data/stats/items/46000-46099.xml     |  91 ++++++++++++
 .../game/data/stats/items/47900-47999.xml     |  15 +-
 .../game/data/stats/items/48100-48199.xml     |  13 ++
 .../game/data/stats/skills/11500-11599.xml    |   6 +-
 .../game/data/stats/skills/13900-13999.xml    |  91 +++++++++++-
 69 files changed, 1611 insertions(+), 96 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml
index 301b9d9a38..9562ab4e90 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/EnchantItemData.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Hair's -->
-	<enchant id="33818" />
-	<enchant id="34940" />
-	<enchant id="36978" />
+	<enchant id="33818" maxEnchant="10" />
+	<enchant id="34940" maxEnchant="10" />
+	<enchant id="36978" maxEnchant="10" />
+	<!-- Heavenly Enchant Scroll: Weapon -->
+	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
+	<!-- Heavenly Enchant Scroll: Armor -->
+	<enchant id="22430" targetGrade="R" maxEnchant="12" bonusRate="100" />
 
 	<!-- Scrolls: Enchant Weapon -->
 	<enchant id="729" targetGrade="A" />
@@ -159,6 +163,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 	</enchant>
 
 	<!-- Blessed Scroll: Enchant Elemental Shirt" type="EtcItem -->
@@ -170,6 +175,13 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
+	</enchant>
+
+	<!-- Blessed Olf's T-shirt Enchant Scroll - Event -->
+	<enchant id="21707" maxEnchant="10">
+		<item id="21580" /> <!-- Olf's T-shirt -->
+		<item id="21706" /> <!-- Olf's T-shirt (Event) -->
 	</enchant>
 
 	<!-- Event - Herdsman's Love Scroll Event -->
@@ -437,6 +449,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -462,6 +475,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -487,6 +501,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -512,6 +527,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -537,6 +553,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -562,6 +579,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Elven/ElvenFortress.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Elven/ElvenFortress.xml
index 6a8a8a9dc4..337063f6f9 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Elven/ElvenFortress.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Elven/ElvenFortress.xml
@@ -301,8 +301,6 @@
 			<npc id="20470" x="37540" y="51439" z="-3448" heading="13509" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="37594" y="56473" z="-3648" heading="20606" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="40459" y="57654" z="-3632" heading="23176" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42083" y="55710" z="-3640" heading="48516" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42119" y="57328" z="-3664" heading="50780" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42366" y="62646" z="-3512" heading="59103" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42759" y="59357" z="-3592" heading="40920" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42933" y="57610" z="-3704" heading="11026" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/armorsets/Sets.xml
index 9604f216c1..fcd49f8394 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/armorsets/Sets.xml
@@ -6001,6 +6001,11 @@
 			<item id="19590" /> <!-- Bound Immortal Boots -->
 			<item id="19654" /> <!-- Blessed Immortal Boots -->
 			<item id="33955" /> <!-- Immortal Boots -->
+			<item id="37207" /> <!-- Steel Immortal Breastplate (30-day) -->
+			<item id="37208" /> <!-- Steel Immortal Gaiters (30-day) -->
+			<item id="37209" /> <!-- Steel Immortal Helmet (30-day) -->
+			<item id="37210" /> <!-- Steel Immortal Gauntlets (30-day) -->
+			<item id="37211" /> <!-- Steel Immortal Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13065" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Heavy Armor 2 Piece (Attack Type) -->
@@ -6035,6 +6040,11 @@
 			<item id="19596" /> <!-- Bound Immortal Leather Boots -->
 			<item id="19660" /> <!-- Blessed Immortal Leather Boots -->
 			<item id="33961" /> <!-- Immortal Leather Boots -->
+			<item id="37213" /> <!-- Steel Immortal Leather Armor (30-day) -->
+			<item id="37214" /> <!-- Steel Immortal Leather Leggings (30-day) -->
+			<item id="37215" /> <!-- Steel Immortal Leather Helmet (30-day) -->
+			<item id="37216" /> <!-- Steel Immortal Leather Gloves (30-day) -->
+			<item id="37217" /> <!-- Steel Immortal Leather Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13074" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Light Armor 2 Piece (Assassin Type) -->
@@ -6068,6 +6078,11 @@
 			<item id="19601" /> <!-- Bound Immortal Shoes -->
 			<item id="19665" /> <!-- Blessed Immortal Shoes -->
 			<item id="33966" /> <!-- Immortal Shoes -->
+			<item id="37218" /> <!-- Steel Immortal Tunic (30-day) -->
+			<item id="37219" /> <!-- Steel Immortal Stockings (30-day) -->
+			<item id="37220" /> <!-- Steel Immortal Circlet (30-day) -->
+			<item id="37221" /> <!-- Steel Immortal Gloves (30-day) -->
+			<item id="37222" /> <!-- Steel Immortal Shoes (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13084" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Robe 2 Piece (Magic Type) -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/32300-32399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/32300-32399.xml
index 28e598663e..105138bd7d 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/32300-32399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/32300-32399.xml
@@ -187,10 +187,8 @@
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="POTION" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
 			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/33800-33899.xml
index 3837cafc0a..80ea64fdcc 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/33800-33899.xml
@@ -1116,11 +1116,10 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
+			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
 	</item>
 	<item id="33863" name="Fire Stone (+ 60)" additionalName="Event" type="EtcItem">
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/34000-34099.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/34000-34099.xml
index ac88f7ea35..ed0ee7d80e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/34000-34099.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/34000-34099.xml
@@ -1508,10 +1508,8 @@
 		<set name="is_stackable" val="true" />
 		<skills>
 			<skill id="9281" level="2" /> <!-- Drum Melody - Heavenly Cocktail -->
-			<skill id="9282" level="2" /> <!-- Lute Melody - Heavenly Cocktail -->
 			<skill id="9283" level="2" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
 			<skill id="9284" level="2" /> <!-- Guitar Melody - Heavenly Cocktail -->
-			<skill id="9285" level="2" /> <!-- Harp Melody - Heavenly Cocktail -->
 			<skill id="9280" level="2" /> <!-- Horn Melody - Heavenly Cocktail -->
 		</skills>
 	</item>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/34300-34399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/34300-34399.xml
index e68499f1ca..774c573f03 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/34300-34399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/34300-34399.xml
@@ -19,7 +19,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32293" displayId="33407" level="85" type="L2Npc" usingServerSideName="true" name="Dinford" usingServerSideTitle="true" title="Quartermaster">
+	<npc id="34332" displayId="33407" level="85" type="L2Npc" usingServerSideName="true" name="Dinford" usingServerSideTitle="true" title="Quartermaster">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml b/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml
index 27ac8aca88..5a9a3fa437 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/EnchantItemData.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Hair's -->
-	<enchant id="33818" />
-	<enchant id="34940" />
-	<enchant id="36978" />
+	<enchant id="33818" maxEnchant="10" />
+	<enchant id="34940" maxEnchant="10" />
+	<enchant id="36978" maxEnchant="10" />
+	<!-- Heavenly Enchant Scroll: Weapon -->
+	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
+	<!-- Heavenly Enchant Scroll: Armor -->
+	<enchant id="22430" targetGrade="R" maxEnchant="12" bonusRate="100" />
 
 	<!-- Scroll: Enchant Shadow Weapon -->
 	<enchant id="46337" targetGrade="R" maxEnchant="10">
@@ -183,6 +187,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 	</enchant>
 
 	<!-- Blessed Scroll: Enchant Elemental Shirt" type="EtcItem -->
@@ -194,6 +199,13 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
+	</enchant>
+
+	<!-- Blessed Olf's T-shirt Enchant Scroll - Event -->
+	<enchant id="21707" maxEnchant="10">
+		<item id="21580" /> <!-- Olf's T-shirt -->
+		<item id="21706" /> <!-- Olf's T-shirt (Event) -->
 	</enchant>
 
 	<!-- Event - Herdsman's Love Scroll Event -->
@@ -461,6 +473,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -486,6 +499,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -511,6 +525,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -536,6 +551,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -561,6 +577,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -586,6 +603,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Elven/ElvenFortress.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Elven/ElvenFortress.xml
index 6a8a8a9dc4..337063f6f9 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Elven/ElvenFortress.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Elven/ElvenFortress.xml
@@ -301,8 +301,6 @@
 			<npc id="20470" x="37540" y="51439" z="-3448" heading="13509" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="37594" y="56473" z="-3648" heading="20606" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="40459" y="57654" z="-3632" heading="23176" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42083" y="55710" z="-3640" heading="48516" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42119" y="57328" z="-3664" heading="50780" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42366" y="62646" z="-3512" heading="59103" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42759" y="59357" z="-3592" heading="40920" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42933" y="57610" z="-3704" heading="11026" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/armorsets/Sets.xml
index 1782fbceed..87fc96d634 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/armorsets/Sets.xml
@@ -6091,6 +6091,11 @@
 			<item id="19590" /> <!-- Bound Immortal Boots -->
 			<item id="19654" /> <!-- Blessed Immortal Boots -->
 			<item id="33955" /> <!-- Immortal Boots -->
+			<item id="37207" /> <!-- Steel Immortal Breastplate (30-day) -->
+			<item id="37208" /> <!-- Steel Immortal Gaiters (30-day) -->
+			<item id="37209" /> <!-- Steel Immortal Helmet (30-day) -->
+			<item id="37210" /> <!-- Steel Immortal Gauntlets (30-day) -->
+			<item id="37211" /> <!-- Steel Immortal Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13065" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Heavy Armor 2 Piece (Attack Type) -->
@@ -6125,6 +6130,11 @@
 			<item id="19596" /> <!-- Bound Immortal Leather Boots -->
 			<item id="19660" /> <!-- Blessed Immortal Leather Boots -->
 			<item id="33961" /> <!-- Immortal Leather Boots -->
+			<item id="37213" /> <!-- Steel Immortal Leather Armor (30-day) -->
+			<item id="37214" /> <!-- Steel Immortal Leather Leggings (30-day) -->
+			<item id="37215" /> <!-- Steel Immortal Leather Helmet (30-day) -->
+			<item id="37216" /> <!-- Steel Immortal Leather Gloves (30-day) -->
+			<item id="37217" /> <!-- Steel Immortal Leather Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13074" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Light Armor 2 Piece (Assassin Type) -->
@@ -6158,6 +6168,11 @@
 			<item id="19601" /> <!-- Bound Immortal Shoes -->
 			<item id="19665" /> <!-- Blessed Immortal Shoes -->
 			<item id="33966" /> <!-- Immortal Shoes -->
+			<item id="37218" /> <!-- Steel Immortal Tunic (30-day) -->
+			<item id="37219" /> <!-- Steel Immortal Stockings (30-day) -->
+			<item id="37220" /> <!-- Steel Immortal Circlet (30-day) -->
+			<item id="37221" /> <!-- Steel Immortal Gloves (30-day) -->
+			<item id="37222" /> <!-- Steel Immortal Shoes (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13084" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Robe 2 Piece (Magic Type) -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/32300-32399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/32300-32399.xml
index 28e598663e..105138bd7d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/32300-32399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/32300-32399.xml
@@ -187,10 +187,8 @@
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="POTION" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
 			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/33800-33899.xml
index 96774958ce..c4e45d5e23 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/33800-33899.xml
@@ -1116,11 +1116,10 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
+			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
 	</item>
 	<item id="33863" name="Fire Stone (+ 60)" additionalName="Event" type="EtcItem">
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/34000-34099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/34000-34099.xml
index a78c49d0a5..d3d3ca5a9b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/34000-34099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/34000-34099.xml
@@ -1508,10 +1508,8 @@
 		<set name="is_stackable" val="true" />
 		<skills>
 			<skill id="9281" level="2" /> <!-- Drum Melody - Heavenly Cocktail -->
-			<skill id="9282" level="2" /> <!-- Lute Melody - Heavenly Cocktail -->
 			<skill id="9283" level="2" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
 			<skill id="9284" level="2" /> <!-- Guitar Melody - Heavenly Cocktail -->
-			<skill id="9285" level="2" /> <!-- Harp Melody - Heavenly Cocktail -->
 			<skill id="9280" level="2" /> <!-- Horn Melody - Heavenly Cocktail -->
 		</skills>
 	</item>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/46000-46099.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/46000-46099.xml
index 36c87749a4..5e279cf91b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/46000-46099.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/46000-46099.xml
@@ -452,7 +452,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18380" level="1" /> <!-- Player Commendation - Talisman - STR -->
+		</skills>
 	</item>
 	<item id="46040" name="Player Commendation Talisman - INT" additionalName="PC-exclusive" type="Armor">
 		<!-- INT + 5 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -465,7 +472,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18381" level="1" /> <!-- Player Commendation - Talisman - INT -->
+		</skills>
 	</item>
 	<item id="46041" name="Player Commendation Talisman - DEX" additionalName="PC-exclusive" type="Armor">
 		<!-- DEX + 5 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -478,7 +492,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18382" level="1" /> <!-- Player Commendation - Talisman - DEX -->
+		</skills>
 	</item>
 	<item id="46042" name="Player Commendation Talisman - WIT" additionalName="PC-exclusive" type="Armor">
 		<!-- WIT + 5 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -491,7 +512,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18383" level="1" /> <!-- Player Commendation - Talisman - WIT -->
+		</skills>
 	</item>
 	<item id="46043" name="Player Commendation Talisman - CON" additionalName="PC-exclusive" type="Armor">
 		<!-- CON + 5 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -504,7 +532,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18384" level="1" /> <!-- Player Commendation - Talisman - CON -->
+		</skills>
 	</item>
 	<item id="46044" name="Player Commendation Talisman - MEN" additionalName="PC-exclusive" type="Armor">
 		<!-- MEN + 5 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -517,7 +552,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18385" level="1" /> <!-- Player Commendation - Talisman - MEN -->
+		</skills>
 	</item>
 	<item id="46045" name="Player Commendation Talisman - Atk. Attribute Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Atk. Attribute + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -530,7 +572,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18386" level="1" /> <!-- Player Commendation - Talisman - Attack Attribute -->
+		</skills>
 	</item>
 	<item id="46046" name="Player Commendation Talisman - Fire Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Fire Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -543,7 +592,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18387" level="1" /> <!-- Player Commendation - Talisman - Fire Resistance -->
+		</skills>
 	</item>
 	<item id="46047" name="Player Commendation Talisman - Water Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Water Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -556,7 +612,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18388" level="1" /> <!-- Player Commendation - Talisman - Water Resistance -->
+		</skills>
 	</item>
 	<item id="46048" name="Player Commendation Talisman - Wind Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Wind Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -569,7 +632,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18389" level="1" /> <!-- Player Commendation - Talisman - Wind Resistance -->
+		</skills>
 	</item>
 	<item id="46049" name="Player Commendation Talisman - Earth Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Earth Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -582,7 +652,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18390" level="1" /> <!-- Player Commendation - Talisman - Earth Resistance -->
+		</skills>
 	</item>
 	<item id="46050" name="Player Commendation Talisman - Holy Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Holy Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -595,7 +672,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18391" level="1" /> <!-- Player Commendation - Talisman - Holy Resistance -->
+		</skills>
 	</item>
 	<item id="46051" name="Player Commendation Talisman - Dark Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Dark Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -608,7 +692,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18392" level="1" /> <!-- Player Commendation - Talisman - Dark Resistance -->
+		</skills>
 	</item>
 	<item id="46052" name="Veridan's Soul Stone" type="EtcItem">
 		<!-- Soul Stone obtained from defeating Armed Veridan. When combined with Kechi's Soul Stone and Michaela's Soul Stone, it will be turned into a Dark Soul Stone. Take it to Head Priest of the Earth Daichir to be recognized for defeating Earth Wyrm Trasken. -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/34300-34399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/34300-34399.xml
index e659546c6f..625a52e69e 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/34300-34399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/34300-34399.xml
@@ -19,7 +19,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32293" displayId="33407" level="85" type="L2Npc" usingServerSideName="true" name="Dinford" usingServerSideTitle="true" title="Quartermaster">
+	<npc id="34332" displayId="33407" level="85" type="L2Npc" usingServerSideName="true" name="Dinford" usingServerSideTitle="true" title="Quartermaster">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml b/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml
index fea1168c5a..0562932f33 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/EnchantItemData.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Hair's -->
-	<enchant id="33818" />
-	<enchant id="34940" />
-	<enchant id="36978" />
+	<enchant id="33818" maxEnchant="10" />
+	<enchant id="34940" maxEnchant="10" />
+	<enchant id="36978" maxEnchant="10" />
+	<!-- Heavenly Enchant Scroll: Weapon -->
+	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
+	<!-- Heavenly Enchant Scroll: Armor -->
+	<enchant id="22430" targetGrade="R" maxEnchant="12" bonusRate="100" />
 
 	<!-- Scroll: Enchant Shadow Weapon -->
 	<enchant id="46337" targetGrade="R" maxEnchant="10">
@@ -183,6 +187,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 	</enchant>
 
 	<!-- Blessed Scroll: Enchant Elemental Shirt" type="EtcItem -->
@@ -194,6 +199,13 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
+	</enchant>
+
+	<!-- Blessed Olf's T-shirt Enchant Scroll - Event -->
+	<enchant id="21707" maxEnchant="10">
+		<item id="21580" /> <!-- Olf's T-shirt -->
+		<item id="21706" /> <!-- Olf's T-shirt (Event) -->
 	</enchant>
 
 	<!-- Event - Herdsman's Love Scroll Event -->
@@ -461,6 +473,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -486,6 +499,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -511,6 +525,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -536,6 +551,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -561,6 +577,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -586,6 +603,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Elven/ElvenFortress.xml b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Elven/ElvenFortress.xml
index 6a8a8a9dc4..337063f6f9 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Elven/ElvenFortress.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Elven/ElvenFortress.xml
@@ -301,8 +301,6 @@
 			<npc id="20470" x="37540" y="51439" z="-3448" heading="13509" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="37594" y="56473" z="-3648" heading="20606" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="40459" y="57654" z="-3632" heading="23176" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42083" y="55710" z="-3640" heading="48516" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42119" y="57328" z="-3664" heading="50780" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42366" y="62646" z="-3512" heading="59103" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42759" y="59357" z="-3592" heading="40920" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42933" y="57610" z="-3704" heading="11026" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/armorsets/Sets.xml
index 1c51ef13b3..29fa5d863f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/armorsets/Sets.xml
@@ -6559,6 +6559,11 @@
 			<item id="19590" /> <!-- Bound Immortal Boots -->
 			<item id="19654" /> <!-- Blessed Immortal Boots -->
 			<item id="33955" /> <!-- Immortal Boots -->
+			<item id="37207" /> <!-- Steel Immortal Breastplate (30-day) -->
+			<item id="37208" /> <!-- Steel Immortal Gaiters (30-day) -->
+			<item id="37209" /> <!-- Steel Immortal Helmet (30-day) -->
+			<item id="37210" /> <!-- Steel Immortal Gauntlets (30-day) -->
+			<item id="37211" /> <!-- Steel Immortal Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13065" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Heavy Armor 2 Piece (Attack Type) -->
@@ -6595,6 +6600,11 @@
 			<item id="19596" /> <!-- Bound Immortal Leather Boots -->
 			<item id="19660" /> <!-- Blessed Immortal Leather Boots -->
 			<item id="33961" /> <!-- Immortal Leather Boots -->
+			<item id="37213" /> <!-- Steel Immortal Leather Armor (30-day) -->
+			<item id="37214" /> <!-- Steel Immortal Leather Leggings (30-day) -->
+			<item id="37215" /> <!-- Steel Immortal Leather Helmet (30-day) -->
+			<item id="37216" /> <!-- Steel Immortal Leather Gloves (30-day) -->
+			<item id="37217" /> <!-- Steel Immortal Leather Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13074" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Light Armor 2 Piece (Assassin Type) -->
@@ -6630,6 +6640,11 @@
 			<item id="19601" /> <!-- Bound Immortal Shoes -->
 			<item id="19665" /> <!-- Blessed Immortal Shoes -->
 			<item id="33966" /> <!-- Immortal Shoes -->
+			<item id="37218" /> <!-- Steel Immortal Tunic (30-day) -->
+			<item id="37219" /> <!-- Steel Immortal Stockings (30-day) -->
+			<item id="37220" /> <!-- Steel Immortal Circlet (30-day) -->
+			<item id="37221" /> <!-- Steel Immortal Gloves (30-day) -->
+			<item id="37222" /> <!-- Steel Immortal Shoes (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13084" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Robe 2 Piece (Magic Type) -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/32300-32399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/32300-32399.xml
index 28e598663e..105138bd7d 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/32300-32399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/32300-32399.xml
@@ -187,10 +187,8 @@
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="POTION" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
 			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/33800-33899.xml
index 5187d0c3a8..6b55f54cae 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/33800-33899.xml
@@ -1116,11 +1116,10 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
+			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
 	</item>
 	<item id="33863" name="Fire Stone (+ 60)" additionalName="Event" type="EtcItem">
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/34000-34099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/34000-34099.xml
index 3f7f0d9923..5db5eafbcd 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/34000-34099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/34000-34099.xml
@@ -1508,10 +1508,8 @@
 		<set name="is_stackable" val="true" />
 		<skills>
 			<skill id="9281" level="2" /> <!-- Drum Melody - Heavenly Cocktail -->
-			<skill id="9282" level="2" /> <!-- Lute Melody - Heavenly Cocktail -->
 			<skill id="9283" level="2" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
 			<skill id="9284" level="2" /> <!-- Guitar Melody - Heavenly Cocktail -->
-			<skill id="9285" level="2" /> <!-- Harp Melody - Heavenly Cocktail -->
 			<skill id="9280" level="2" /> <!-- Horn Melody - Heavenly Cocktail -->
 		</skills>
 	</item>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/46000-46099.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/46000-46099.xml
index 22962550fd..3d52784b7a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/46000-46099.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/46000-46099.xml
@@ -452,7 +452,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18380" level="1" /> <!-- Player Commendation - Talisman - STR -->
+		</skills>
 	</item>
 	<item id="46040" name="Player Commendation Talisman - INT" additionalName="PC-exclusive" type="Armor">
 		<!-- INT +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -465,7 +472,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18381" level="1" /> <!-- Player Commendation - Talisman - INT -->
+		</skills>
 	</item>
 	<item id="46041" name="Player Commendation Talisman - DEX" additionalName="PC-exclusive" type="Armor">
 		<!-- DEX +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -478,7 +492,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18382" level="1" /> <!-- Player Commendation - Talisman - DEX -->
+		</skills>
 	</item>
 	<item id="46042" name="Player Commendation Talisman - WIT" additionalName="PC-exclusive" type="Armor">
 		<!-- WIT +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -491,7 +512,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18383" level="1" /> <!-- Player Commendation - Talisman - WIT -->
+		</skills>
 	</item>
 	<item id="46043" name="Player Commendation Talisman - CON" additionalName="PC-exclusive" type="Armor">
 		<!-- CON +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -504,7 +532,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18384" level="1" /> <!-- Player Commendation - Talisman - CON -->
+		</skills>
 	</item>
 	<item id="46044" name="Player Commendation Talisman - MEN" additionalName="PC-exclusive" type="Armor">
 		<!-- MEN +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -517,7 +552,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18385" level="1" /> <!-- Player Commendation - Talisman - MEN -->
+		</skills>
 	</item>
 	<item id="46045" name="Player Commendation Talisman - Atk. Attribute Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Attack Attribute Bonus +50 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -530,7 +572,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18386" level="1" /> <!-- Player Commendation - Talisman - Attack Attribute -->
+		</skills>
 	</item>
 	<item id="46046" name="Player Commendation Talisman - Fire Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Fire Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -543,7 +592,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18387" level="1" /> <!-- Player Commendation - Talisman - Fire Resistance -->
+		</skills>
 	</item>
 	<item id="46047" name="Player Commendation Talisman - Water Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Water Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -556,7 +612,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18388" level="1" /> <!-- Player Commendation - Talisman - Water Resistance -->
+		</skills>
 	</item>
 	<item id="46048" name="Player Commendation Talisman - Wind Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Wind Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -569,7 +632,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18389" level="1" /> <!-- Player Commendation - Talisman - Wind Resistance -->
+		</skills>
 	</item>
 	<item id="46049" name="Player Commendation Talisman - Earth Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Earth Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -582,7 +652,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18390" level="1" /> <!-- Player Commendation - Talisman - Earth Resistance -->
+		</skills>
 	</item>
 	<item id="46050" name="Player Commendation Talisman - Holy Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Holy Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -595,7 +672,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18391" level="1" /> <!-- Player Commendation - Talisman - Holy Resistance -->
+		</skills>
 	</item>
 	<item id="46051" name="Player Commendation Talisman - Dark Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Dark Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -608,7 +692,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18392" level="1" /> <!-- Player Commendation - Talisman - Dark Resistance -->
+		</skills>
 	</item>
 	<item id="46052" name="Veridan's Soul Stone" type="EtcItem">
 		<!-- Soul Stone obtained from defeating Armed Veridan. When combined with Kechi's Soul Stone and Michaela's Soul Stone, it will be turned into a Dark Soul Stone. Take it to Head Priest of the Earth Daichir to be recognized for defeating Earth Wyrm Trasken. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/34300-34399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/34300-34399.xml
index e659546c6f..625a52e69e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/34300-34399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/34300-34399.xml
@@ -19,7 +19,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32293" displayId="33407" level="85" type="L2Npc" usingServerSideName="true" name="Dinford" usingServerSideTitle="true" title="Quartermaster">
+	<npc id="34332" displayId="33407" level="85" type="L2Npc" usingServerSideName="true" name="Dinford" usingServerSideTitle="true" title="Quartermaster">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13900-13999.xml
index 2f455afc6c..710c0ca3db 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13900-13999.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13900-13999.xml
@@ -2320,4 +2320,102 @@
 			</effect>
 		</effects>
 	</skill>
+	<skill id="13976" toLevel="3" name="La Vie En Rose's Glorious Brooch">
+		<!-- Equips up to 6 Jewels and adds 12 inventory slots. -->
+		<icon>
+			<value level="1">icon.etc_bm_brooch_lavianrose_i04</value>
+			<value level="2">icon.etc_bm_brooch_lavianrose_i05</value>
+			<value level="3">icon.etc_bm_brooch_lavianrose_i06</value>
+		</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="JewelSlot">
+				<amount>
+					<value level="1">6</value>
+					<value level="2">6</value>
+					<value level="3">6</value>
+				</amount>
+			</effect>
+			<effect name="EnlargeSlot">
+				<amount>
+					<value level="1">12</value>
+					<value level="2">12</value>
+					<value level="3">12</value>
+				</amount>
+				<type>INVENTORY_NORMAL</type>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">1</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>CHA</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="MaxCp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
+	</skill>
 </list>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
index 52ab652d43..b7ee681403 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/EnchantItemData.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Hair's -->
-	<enchant id="33818" />
-	<enchant id="34940" />
-	<enchant id="36978" />
+	<enchant id="33818" maxEnchant="10" />
+	<enchant id="34940" maxEnchant="10" />
+	<enchant id="36978" maxEnchant="10" />
+	<!-- Heavenly Enchant Scroll: Weapon -->
+	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
+	<!-- Heavenly Enchant Scroll: Armor -->
+	<enchant id="22430" targetGrade="R" maxEnchant="12" bonusRate="100" />
 
 	<!-- Scroll: Enchant Shadow Weapon -->
 	<enchant id="46337" targetGrade="R" maxEnchant="10">
@@ -211,6 +215,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 	</enchant>
 
 	<!-- Blessed Scroll: Enchant Elemental Shirt" type="EtcItem -->
@@ -222,6 +227,13 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
+	</enchant>
+
+	<!-- Blessed Olf's T-shirt Enchant Scroll - Event -->
+	<enchant id="21707" maxEnchant="10">
+		<item id="21580" /> <!-- Olf's T-shirt -->
+		<item id="21706" /> <!-- Olf's T-shirt (Event) -->
 	</enchant>
 
 	<!-- Event - Herdsman's Love Scroll Event -->
@@ -489,6 +501,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -514,6 +527,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -539,6 +553,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -564,6 +579,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -589,6 +605,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -614,6 +631,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Elven/ElvenFortress.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Elven/ElvenFortress.xml
index 6a8a8a9dc4..337063f6f9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Elven/ElvenFortress.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Elven/ElvenFortress.xml
@@ -301,8 +301,6 @@
 			<npc id="20470" x="37540" y="51439" z="-3448" heading="13509" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="37594" y="56473" z="-3648" heading="20606" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="40459" y="57654" z="-3632" heading="23176" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42083" y="55710" z="-3640" heading="48516" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42119" y="57328" z="-3664" heading="50780" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42366" y="62646" z="-3512" heading="59103" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42759" y="59357" z="-3592" heading="40920" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42933" y="57610" z="-3704" heading="11026" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/armorsets/Sets.xml
index f732a5a2c1..35ae2b8fa3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/armorsets/Sets.xml
@@ -6559,6 +6559,11 @@
 			<item id="19590" /> <!-- Bound Immortal Boots -->
 			<item id="19654" /> <!-- Blessed Immortal Boots -->
 			<item id="33955" /> <!-- Immortal Boots -->
+			<item id="37207" /> <!-- Steel Immortal Breastplate (30-day) -->
+			<item id="37208" /> <!-- Steel Immortal Gaiters (30-day) -->
+			<item id="37209" /> <!-- Steel Immortal Helmet (30-day) -->
+			<item id="37210" /> <!-- Steel Immortal Gauntlets (30-day) -->
+			<item id="37211" /> <!-- Steel Immortal Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13065" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Heavy Armor 2 Piece (Attack Type) -->
@@ -6595,6 +6600,11 @@
 			<item id="19596" /> <!-- Bound Immortal Leather Boots -->
 			<item id="19660" /> <!-- Blessed Immortal Leather Boots -->
 			<item id="33961" /> <!-- Immortal Leather Boots -->
+			<item id="37213" /> <!-- Steel Immortal Leather Armor (30-day) -->
+			<item id="37214" /> <!-- Steel Immortal Leather Leggings (30-day) -->
+			<item id="37215" /> <!-- Steel Immortal Leather Helmet (30-day) -->
+			<item id="37216" /> <!-- Steel Immortal Leather Gloves (30-day) -->
+			<item id="37217" /> <!-- Steel Immortal Leather Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13074" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Light Armor 2 Piece (Assassin Type) -->
@@ -6630,6 +6640,11 @@
 			<item id="19601" /> <!-- Bound Immortal Shoes -->
 			<item id="19665" /> <!-- Blessed Immortal Shoes -->
 			<item id="33966" /> <!-- Immortal Shoes -->
+			<item id="37218" /> <!-- Steel Immortal Tunic (30-day) -->
+			<item id="37219" /> <!-- Steel Immortal Stockings (30-day) -->
+			<item id="37220" /> <!-- Steel Immortal Circlet (30-day) -->
+			<item id="37221" /> <!-- Steel Immortal Gloves (30-day) -->
+			<item id="37222" /> <!-- Steel Immortal Shoes (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13084" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Robe 2 Piece (Magic Type) -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/32300-32399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/32300-32399.xml
index 28e598663e..105138bd7d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/32300-32399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/32300-32399.xml
@@ -187,10 +187,8 @@
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="POTION" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
 			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/33800-33899.xml
index d08276a026..019ae6896b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/33800-33899.xml
@@ -1116,11 +1116,10 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
+			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
 	</item>
 	<item id="33863" name="Fire Stone (+ 60)" additionalName="Event" type="EtcItem">
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/34000-34099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/34000-34099.xml
index 3f7f0d9923..5db5eafbcd 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/34000-34099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/34000-34099.xml
@@ -1508,10 +1508,8 @@
 		<set name="is_stackable" val="true" />
 		<skills>
 			<skill id="9281" level="2" /> <!-- Drum Melody - Heavenly Cocktail -->
-			<skill id="9282" level="2" /> <!-- Lute Melody - Heavenly Cocktail -->
 			<skill id="9283" level="2" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
 			<skill id="9284" level="2" /> <!-- Guitar Melody - Heavenly Cocktail -->
-			<skill id="9285" level="2" /> <!-- Harp Melody - Heavenly Cocktail -->
 			<skill id="9280" level="2" /> <!-- Horn Melody - Heavenly Cocktail -->
 		</skills>
 	</item>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46000-46099.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46000-46099.xml
index de92123fc3..eeaf6df52f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46000-46099.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/items/46000-46099.xml
@@ -452,7 +452,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18380" level="1" /> <!-- Player Commendation - Talisman - STR -->
+		</skills>
 	</item>
 	<item id="46040" name="Player Commendation Talisman - INT" additionalName="PC-exclusive" type="Armor">
 		<!-- INT +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -465,7 +472,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18381" level="1" /> <!-- Player Commendation - Talisman - INT -->
+		</skills>
 	</item>
 	<item id="46041" name="Player Commendation Talisman - DEX" additionalName="PC-exclusive" type="Armor">
 		<!-- DEX +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -478,7 +492,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18382" level="1" /> <!-- Player Commendation - Talisman - DEX -->
+		</skills>
 	</item>
 	<item id="46042" name="Player Commendation Talisman - WIT" additionalName="PC-exclusive" type="Armor">
 		<!-- WIT +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -491,7 +512,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18383" level="1" /> <!-- Player Commendation - Talisman - WIT -->
+		</skills>
 	</item>
 	<item id="46043" name="Player Commendation Talisman - CON" additionalName="PC-exclusive" type="Armor">
 		<!-- CON +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -504,7 +532,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18384" level="1" /> <!-- Player Commendation - Talisman - CON -->
+		</skills>
 	</item>
 	<item id="46044" name="Player Commendation Talisman - MEN" additionalName="PC-exclusive" type="Armor">
 		<!-- MEN +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -517,7 +552,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18385" level="1" /> <!-- Player Commendation - Talisman - MEN -->
+		</skills>
 	</item>
 	<item id="46045" name="Player Commendation Talisman - Atk. Attribute Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Attack Attribute Bonus +50 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -530,7 +572,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18386" level="1" /> <!-- Player Commendation - Talisman - Attack Attribute -->
+		</skills>
 	</item>
 	<item id="46046" name="Player Commendation Talisman - Fire Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Fire Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -543,7 +592,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18387" level="1" /> <!-- Player Commendation - Talisman - Fire Resistance -->
+		</skills>
 	</item>
 	<item id="46047" name="Player Commendation Talisman - Water Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Water Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -556,7 +612,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18388" level="1" /> <!-- Player Commendation - Talisman - Water Resistance -->
+		</skills>
 	</item>
 	<item id="46048" name="Player Commendation Talisman - Wind Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Wind Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -569,7 +632,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18389" level="1" /> <!-- Player Commendation - Talisman - Wind Resistance -->
+		</skills>
 	</item>
 	<item id="46049" name="Player Commendation Talisman - Earth Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Earth Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -582,7 +652,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18390" level="1" /> <!-- Player Commendation - Talisman - Earth Resistance -->
+		</skills>
 	</item>
 	<item id="46050" name="Player Commendation Talisman - Holy Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Holy Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -595,7 +672,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18391" level="1" /> <!-- Player Commendation - Talisman - Holy Resistance -->
+		</skills>
 	</item>
 	<item id="46051" name="Player Commendation Talisman - Dark Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Dark Resistance + 50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -608,7 +692,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18392" level="1" /> <!-- Player Commendation - Talisman - Dark Resistance -->
+		</skills>
 	</item>
 	<item id="46052" name="Veridan's Soul Stone" type="EtcItem">
 		<!-- Soul Stone obtained from defeating Armed Veridan. When combined with Kechi's Soul Stone and Michaela's Soul Stone, it will be turned into a Dark Soul Stone. Take it to Head Priest of the Earth Daichir to be recognized for defeating Earth Wyrm Trasken. -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13900-13999.xml
index 031f8576ce..28b79e56a4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13900-13999.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13900-13999.xml
@@ -2681,4 +2681,102 @@
 			</effect>
 		</effects>
 	</skill>
+	<skill id="13976" toLevel="3" name="La Vie En Rose's Glorious Brooch">
+		<!-- Equips up to 6 Jewels and adds 12 inventory slots. -->
+		<icon>
+			<value level="1">icon.etc_bm_brooch_lavianrose_i04</value>
+			<value level="2">icon.etc_bm_brooch_lavianrose_i05</value>
+			<value level="3">icon.etc_bm_brooch_lavianrose_i06</value>
+		</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="JewelSlot">
+				<amount>
+					<value level="1">6</value>
+					<value level="2">6</value>
+					<value level="3">6</value>
+				</amount>
+			</effect>
+			<effect name="EnlargeSlot">
+				<amount>
+					<value level="1">12</value>
+					<value level="2">12</value>
+					<value level="3">12</value>
+				</amount>
+				<type>INVENTORY_NORMAL</type>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">1</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>CHA</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="MaxCp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
+	</skill>
 </list>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/EnchantItemData.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/EnchantItemData.xml
index 52ab652d43..b7ee681403 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/EnchantItemData.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Hair's -->
-	<enchant id="33818" />
-	<enchant id="34940" />
-	<enchant id="36978" />
+	<enchant id="33818" maxEnchant="10" />
+	<enchant id="34940" maxEnchant="10" />
+	<enchant id="36978" maxEnchant="10" />
+	<!-- Heavenly Enchant Scroll: Weapon -->
+	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
+	<!-- Heavenly Enchant Scroll: Armor -->
+	<enchant id="22430" targetGrade="R" maxEnchant="12" bonusRate="100" />
 
 	<!-- Scroll: Enchant Shadow Weapon -->
 	<enchant id="46337" targetGrade="R" maxEnchant="10">
@@ -211,6 +215,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 	</enchant>
 
 	<!-- Blessed Scroll: Enchant Elemental Shirt" type="EtcItem -->
@@ -222,6 +227,13 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
+	</enchant>
+
+	<!-- Blessed Olf's T-shirt Enchant Scroll - Event -->
+	<enchant id="21707" maxEnchant="10">
+		<item id="21580" /> <!-- Olf's T-shirt -->
+		<item id="21706" /> <!-- Olf's T-shirt (Event) -->
 	</enchant>
 
 	<!-- Event - Herdsman's Love Scroll Event -->
@@ -489,6 +501,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -514,6 +527,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -539,6 +553,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -564,6 +579,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -589,6 +605,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -614,6 +631,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/PrimeShop.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/PrimeShop.xml
index 5d2b71ae2c..8eead691e6 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/PrimeShop.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/PrimeShop.xml
@@ -6,4 +6,39 @@
 	<!-- recommended = 1 - Top, 2 - Left, 4 - Right (bit flags) -->
 	<!-- startSale = unixTime -->
 	<!-- endSale = unixTime -->
+	<item id="1090335" cat="3" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="36308" count="1" /> <!-- Beauty Shop Ticket-->
+	</item>
+	<item id="1091000" cat="2" paymentType="0" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="5" /> <!-- Hero Coin-->
+		<item itemId="28405" count="1" /> <!-- Maphr's Rune 100% Pack (1-hour)-->
+	</item>
+	<item id="1091001" cat="2" paymentType="0" price="500" panelType="4" recommended="1" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="50" /> <!-- Hero Coin-->
+		<item itemId="28406" count="1" /> <!-- Maphr's Rune 100% Pack (7-day)-->
+	</item>
+	<item id="1090026" cat="3" paymentType="2" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="20079" count="1" /> <!-- Good Luck Lucky Pack-->
+	</item>
+	<item id="1090027" cat="2" paymentType="0" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="5" /> <!-- Hero Coin-->
+		<item itemId="21631" count="1" /> <!-- Vitality Replenish Potion Pack-->
+	</item>
+	<item id="1090028" cat="2" paymentType="0" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="5" /> <!-- Hero Coin-->
+		<item itemId="20033" count="1" /> <!-- Vitality Maintaining Potion Pack-->
+	</item>
+	<item id="1090029" cat="2" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="20033" count="50" /> <!-- My Teleport Flag-->
+	</item>
+	<item id="1090030" cat="2" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="13015" count="1" /> <!-- My Teleport Book-->
+	</item>
+	<item id="1090031" cat="2" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="20025" count="50" /> <!-- My Teleport Scroll-->
+	</item>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Elven/ElvenFortress.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Elven/ElvenFortress.xml
index 6a8a8a9dc4..337063f6f9 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Elven/ElvenFortress.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Elven/ElvenFortress.xml
@@ -301,8 +301,6 @@
 			<npc id="20470" x="37540" y="51439" z="-3448" heading="13509" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="37594" y="56473" z="-3648" heading="20606" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="40459" y="57654" z="-3632" heading="23176" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42083" y="55710" z="-3640" heading="48516" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42119" y="57328" z="-3664" heading="50780" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42366" y="62646" z="-3512" heading="59103" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42759" y="59357" z="-3592" heading="40920" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42933" y="57610" z="-3704" heading="11026" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/armorsets/Sets.xml
index f732a5a2c1..35ae2b8fa3 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/armorsets/Sets.xml
@@ -6559,6 +6559,11 @@
 			<item id="19590" /> <!-- Bound Immortal Boots -->
 			<item id="19654" /> <!-- Blessed Immortal Boots -->
 			<item id="33955" /> <!-- Immortal Boots -->
+			<item id="37207" /> <!-- Steel Immortal Breastplate (30-day) -->
+			<item id="37208" /> <!-- Steel Immortal Gaiters (30-day) -->
+			<item id="37209" /> <!-- Steel Immortal Helmet (30-day) -->
+			<item id="37210" /> <!-- Steel Immortal Gauntlets (30-day) -->
+			<item id="37211" /> <!-- Steel Immortal Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13065" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Heavy Armor 2 Piece (Attack Type) -->
@@ -6595,6 +6600,11 @@
 			<item id="19596" /> <!-- Bound Immortal Leather Boots -->
 			<item id="19660" /> <!-- Blessed Immortal Leather Boots -->
 			<item id="33961" /> <!-- Immortal Leather Boots -->
+			<item id="37213" /> <!-- Steel Immortal Leather Armor (30-day) -->
+			<item id="37214" /> <!-- Steel Immortal Leather Leggings (30-day) -->
+			<item id="37215" /> <!-- Steel Immortal Leather Helmet (30-day) -->
+			<item id="37216" /> <!-- Steel Immortal Leather Gloves (30-day) -->
+			<item id="37217" /> <!-- Steel Immortal Leather Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13074" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Light Armor 2 Piece (Assassin Type) -->
@@ -6630,6 +6640,11 @@
 			<item id="19601" /> <!-- Bound Immortal Shoes -->
 			<item id="19665" /> <!-- Blessed Immortal Shoes -->
 			<item id="33966" /> <!-- Immortal Shoes -->
+			<item id="37218" /> <!-- Steel Immortal Tunic (30-day) -->
+			<item id="37219" /> <!-- Steel Immortal Stockings (30-day) -->
+			<item id="37220" /> <!-- Steel Immortal Circlet (30-day) -->
+			<item id="37221" /> <!-- Steel Immortal Gloves (30-day) -->
+			<item id="37222" /> <!-- Steel Immortal Shoes (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13084" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Robe 2 Piece (Magic Type) -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/32300-32399.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/32300-32399.xml
index b693d239c6..da622585b1 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/32300-32399.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/32300-32399.xml
@@ -187,10 +187,8 @@
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="POTION" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
 			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/33800-33899.xml
index 17763e81c8..55ff06359a 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/33800-33899.xml
@@ -1116,11 +1116,10 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
+			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
 	</item>
 	<item id="33863" name="Fire Stone (+ 60)" additionalName="Event" type="EtcItem">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/34000-34099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/34000-34099.xml
index dd9a91d15e..b950f36316 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/34000-34099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/34000-34099.xml
@@ -1508,10 +1508,8 @@
 		<set name="is_stackable" val="true" />
 		<skills>
 			<skill id="9281" level="2" /> <!-- Drum Melody - Heavenly Cocktail -->
-			<skill id="9282" level="2" /> <!-- Lute Melody - Heavenly Cocktail -->
 			<skill id="9283" level="2" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
 			<skill id="9284" level="2" /> <!-- Guitar Melody - Heavenly Cocktail -->
-			<skill id="9285" level="2" /> <!-- Harp Melody - Heavenly Cocktail -->
 			<skill id="9280" level="2" /> <!-- Horn Melody - Heavenly Cocktail -->
 		</skills>
 	</item>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/46000-46099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/46000-46099.xml
index 8a5f4a68bc..6a1eec8f62 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/46000-46099.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/46000-46099.xml
@@ -452,7 +452,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18380" level="1" /> <!-- Player Commendation - Talisman - STR -->
+		</skills>
 	</item>
 	<item id="46040" name="Player Commendation Talisman - INT" additionalName="PC-exclusive" type="Armor">
 		<!-- INT +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -465,7 +472,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18381" level="1" /> <!-- Player Commendation - Talisman - INT -->
+		</skills>
 	</item>
 	<item id="46041" name="Player Commendation Talisman - DEX" additionalName="PC-exclusive" type="Armor">
 		<!-- DEX +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -478,7 +492,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18382" level="1" /> <!-- Player Commendation - Talisman - DEX -->
+		</skills>
 	</item>
 	<item id="46042" name="Player Commendation Talisman - WIT" additionalName="PC-exclusive" type="Armor">
 		<!-- WIT +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -491,7 +512,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18383" level="1" /> <!-- Player Commendation - Talisman - WIT -->
+		</skills>
 	</item>
 	<item id="46043" name="Player Commendation Talisman - CON" additionalName="PC-exclusive" type="Armor">
 		<!-- CON +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -504,7 +532,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18384" level="1" /> <!-- Player Commendation - Talisman - CON -->
+		</skills>
 	</item>
 	<item id="46044" name="Player Commendation Talisman - MEN" additionalName="PC-exclusive" type="Armor">
 		<!-- MEN +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -517,7 +552,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18385" level="1" /> <!-- Player Commendation - Talisman - MEN -->
+		</skills>
 	</item>
 	<item id="46045" name="Player Commendation Talisman - Atk. Attribute Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Attack Attribute Bonus +50 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -530,7 +572,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18386" level="1" /> <!-- Player Commendation - Talisman - Attack Attribute -->
+		</skills>
 	</item>
 	<item id="46046" name="Player Commendation Talisman - Fire Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Fire Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -543,7 +592,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18387" level="1" /> <!-- Player Commendation - Talisman - Fire Resistance -->
+		</skills>
 	</item>
 	<item id="46047" name="Player Commendation Talisman - Water Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Water Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -556,7 +612,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18388" level="1" /> <!-- Player Commendation - Talisman - Water Resistance -->
+		</skills>
 	</item>
 	<item id="46048" name="Player Commendation Talisman - Wind Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Wind Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -569,7 +632,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18389" level="1" /> <!-- Player Commendation - Talisman - Wind Resistance -->
+		</skills>
 	</item>
 	<item id="46049" name="Player Commendation Talisman - Earth Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Earth Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -582,7 +652,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18390" level="1" /> <!-- Player Commendation - Talisman - Earth Resistance -->
+		</skills>
 	</item>
 	<item id="46050" name="Player Commendation Talisman - Holy Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Holy Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -595,7 +672,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18391" level="1" /> <!-- Player Commendation - Talisman - Holy Resistance -->
+		</skills>
 	</item>
 	<item id="46051" name="Player Commendation Talisman - Dark Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Dark Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -608,7 +692,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18392" level="1" /> <!-- Player Commendation - Talisman - Dark Resistance -->
+		</skills>
 	</item>
 	<item id="46052" name="Veridan's Soul Stone" type="EtcItem">
 		<!-- Soul Stone obtained from defeating Armed Veridan. When combined with Kechi's Soul Stone and Michaela's Soul Stone, it will be turned into a Dark Soul Stone. Take it to Head Priest of the Earth Daichir to be recognized for defeating Earth Wyrm Trasken. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47900-47999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47900-47999.xml
index 7fc6f773d9..b11173d34c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47900-47999.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/47900-47999.xml
@@ -1320,7 +1320,7 @@
 		<!-- When equipped, activates six Jewel Slots. Inventory Slots +12. -->
 		<set name="icon" val="icon.etc_bm_brooch_lavianrose_i04" />
 		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="gloves" />
+		<set name="bodypart" val="brooch" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="5" />
@@ -1328,6 +1328,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="13976" level="1" /> <!-- La Vie En Rose's Glorious Brooch -->
+		</skills>
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
@@ -1336,7 +1339,7 @@
 		<!-- When equipped, activates six Jewel Slots. Inventory Slots +12. CHA +1. Can be augmented. -->
 		<set name="icon" val="icon.etc_bm_brooch_lavianrose_i05" />
 		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="gloves" />
+		<set name="bodypart" val="brooch" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="5" />
@@ -1344,6 +1347,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="13976" level="2" /> <!-- La Vie En Rose's Glorious Brooch -->
+		</skills>
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
@@ -1391,7 +1397,7 @@
 		<!-- When equipped, activates six Jewel Slots. Inventory Slots +12. All stats +1. Can be augmented. -->
 		<set name="icon" val="icon.etc_bm_brooch_lavianrose_i06" />
 		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="gloves" />
+		<set name="bodypart" val="brooch" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="5" />
@@ -1399,6 +1405,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="13976" level="3" /> <!-- La Vie En Rose's Glorious Brooch -->
+		</skills>
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/48100-48199.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/48100-48199.xml
index 4c7114be31..6ddca55b9d 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/48100-48199.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/items/48100-48199.xml
@@ -453,6 +453,19 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
+		<set name="weight" val="150" />
+		<set name="bodypart" val="lbracelet" />
+		<set name="immediate_effect" val="true" />
+		<set name="time" val="43200" />
+		<skills>
+			<skill id="3267" level="1" /> <!-- Seal Agathion -->
+			<skill id="18172" level="1" /> <!-- Joon's Magic -->
+			<skill id="18173" level="1" /> <!-- Joon's Ressurection -->
+			<skill id="18174" level="1" /> <!-- Agathion - Joon -->
+			<skill id="18175" level="1" /> <!-- Joon's Cute Trick -->
+		</skills>
 	</item>
 	<item id="48134" name="Agathion - Shiny Charm" type="Armor">
 		<!-- Can summon an Agathion - Shiny when equipped. <Active Skill>. 1. Agathion Teleport: Enables teleportation to Town of Aden/ Town of Rune/ Talking Island Village/ Town of Giran/ Town of Goddard/ Town of Schuttgart. (Cooldown 30 min). <Item Skill>. 1. Chase Down: For 15 sec, Speed +66. <Item Skill>. 2. Sneak: Monsters do not attack first. -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
index c6e5411049..6445d951d3 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/11500-11599.xml
@@ -1928,8 +1928,10 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL</slot>
 			</effect>
 			<effect name="MAtk">
-				<value level="1">40</value>
-				<value level="2">45</value>
+				<amount>
+					<value level="1">40</value>
+					<value level="2">45</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalAttackSpeed">
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13900-13999.xml
index 9a2348e88d..5e7ace3b7c 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13900-13999.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13900-13999.xml
@@ -2681,4 +2681,102 @@
 			</effect>
 		</effects>
 	</skill>
+	<skill id="13976" toLevel="3" name="La Vie En Rose's Glorious Brooch">
+		<!-- Equips up to 6 Jewels and adds 12 inventory slots. -->
+		<icon>
+			<value level="1">icon.etc_bm_brooch_lavianrose_i04</value>
+			<value level="2">icon.etc_bm_brooch_lavianrose_i05</value>
+			<value level="3">icon.etc_bm_brooch_lavianrose_i06</value>
+		</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="JewelSlot">
+				<amount>
+					<value level="1">6</value>
+					<value level="2">6</value>
+					<value level="3">6</value>
+				</amount>
+			</effect>
+			<effect name="EnlargeSlot">
+				<amount>
+					<value level="1">12</value>
+					<value level="2">12</value>
+					<value level="3">12</value>
+				</amount>
+				<type>INVENTORY_NORMAL</type>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">1</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>CHA</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="MaxCp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
+	</skill>
 </list>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/EnchantItemData.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/EnchantItemData.xml
index 52ab652d43..b7ee681403 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/EnchantItemData.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Hair's -->
-	<enchant id="33818" />
-	<enchant id="34940" />
-	<enchant id="36978" />
+	<enchant id="33818" maxEnchant="10" />
+	<enchant id="34940" maxEnchant="10" />
+	<enchant id="36978" maxEnchant="10" />
+	<!-- Heavenly Enchant Scroll: Weapon -->
+	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
+	<!-- Heavenly Enchant Scroll: Armor -->
+	<enchant id="22430" targetGrade="R" maxEnchant="12" bonusRate="100" />
 
 	<!-- Scroll: Enchant Shadow Weapon -->
 	<enchant id="46337" targetGrade="R" maxEnchant="10">
@@ -211,6 +215,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 	</enchant>
 
 	<!-- Blessed Scroll: Enchant Elemental Shirt" type="EtcItem -->
@@ -222,6 +227,13 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
+	</enchant>
+
+	<!-- Blessed Olf's T-shirt Enchant Scroll - Event -->
+	<enchant id="21707" maxEnchant="10">
+		<item id="21580" /> <!-- Olf's T-shirt -->
+		<item id="21706" /> <!-- Olf's T-shirt (Event) -->
 	</enchant>
 
 	<!-- Event - Herdsman's Love Scroll Event -->
@@ -489,6 +501,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -514,6 +527,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -539,6 +553,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -564,6 +579,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -589,6 +605,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -614,6 +631,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/PrimeShop.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/PrimeShop.xml
index 5d2b71ae2c..8eead691e6 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/PrimeShop.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/PrimeShop.xml
@@ -6,4 +6,39 @@
 	<!-- recommended = 1 - Top, 2 - Left, 4 - Right (bit flags) -->
 	<!-- startSale = unixTime -->
 	<!-- endSale = unixTime -->
+	<item id="1090335" cat="3" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="36308" count="1" /> <!-- Beauty Shop Ticket-->
+	</item>
+	<item id="1091000" cat="2" paymentType="0" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="5" /> <!-- Hero Coin-->
+		<item itemId="28405" count="1" /> <!-- Maphr's Rune 100% Pack (1-hour)-->
+	</item>
+	<item id="1091001" cat="2" paymentType="0" price="500" panelType="4" recommended="1" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="50" /> <!-- Hero Coin-->
+		<item itemId="28406" count="1" /> <!-- Maphr's Rune 100% Pack (7-day)-->
+	</item>
+	<item id="1090026" cat="3" paymentType="2" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="20079" count="1" /> <!-- Good Luck Lucky Pack-->
+	</item>
+	<item id="1090027" cat="2" paymentType="0" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="5" /> <!-- Hero Coin-->
+		<item itemId="21631" count="1" /> <!-- Vitality Replenish Potion Pack-->
+	</item>
+	<item id="1090028" cat="2" paymentType="0" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="5" /> <!-- Hero Coin-->
+		<item itemId="20033" count="1" /> <!-- Vitality Maintaining Potion Pack-->
+	</item>
+	<item id="1090029" cat="2" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="20033" count="50" /> <!-- My Teleport Flag-->
+	</item>
+	<item id="1090030" cat="2" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="13015" count="1" /> <!-- My Teleport Book-->
+	</item>
+	<item id="1090031" cat="2" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="20025" count="50" /> <!-- My Teleport Scroll-->
+	</item>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Elven/ElvenFortress.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Elven/ElvenFortress.xml
index 6a8a8a9dc4..337063f6f9 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Elven/ElvenFortress.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Elven/ElvenFortress.xml
@@ -301,8 +301,6 @@
 			<npc id="20470" x="37540" y="51439" z="-3448" heading="13509" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="37594" y="56473" z="-3648" heading="20606" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="40459" y="57654" z="-3632" heading="23176" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42083" y="55710" z="-3640" heading="48516" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42119" y="57328" z="-3664" heading="50780" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42366" y="62646" z="-3512" heading="59103" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42759" y="59357" z="-3592" heading="40920" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42933" y="57610" z="-3704" heading="11026" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/armorsets/Sets.xml
index 13a6c96712..b8e715f899 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/armorsets/Sets.xml
@@ -6559,6 +6559,11 @@
 			<item id="19590" /> <!-- Bound Immortal Boots -->
 			<item id="19654" /> <!-- Blessed Immortal Boots -->
 			<item id="33955" /> <!-- Immortal Boots -->
+			<item id="37207" /> <!-- Steel Immortal Breastplate (30-day) -->
+			<item id="37208" /> <!-- Steel Immortal Gaiters (30-day) -->
+			<item id="37209" /> <!-- Steel Immortal Helmet (30-day) -->
+			<item id="37210" /> <!-- Steel Immortal Gauntlets (30-day) -->
+			<item id="37211" /> <!-- Steel Immortal Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13065" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Heavy Armor 2 Piece (Attack Type) -->
@@ -6595,6 +6600,11 @@
 			<item id="19596" /> <!-- Bound Immortal Leather Boots -->
 			<item id="19660" /> <!-- Blessed Immortal Leather Boots -->
 			<item id="33961" /> <!-- Immortal Leather Boots -->
+			<item id="37213" /> <!-- Steel Immortal Leather Armor (30-day) -->
+			<item id="37214" /> <!-- Steel Immortal Leather Leggings (30-day) -->
+			<item id="37215" /> <!-- Steel Immortal Leather Helmet (30-day) -->
+			<item id="37216" /> <!-- Steel Immortal Leather Gloves (30-day) -->
+			<item id="37217" /> <!-- Steel Immortal Leather Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13074" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Light Armor 2 Piece (Assassin Type) -->
@@ -6630,6 +6640,11 @@
 			<item id="19601" /> <!-- Bound Immortal Shoes -->
 			<item id="19665" /> <!-- Blessed Immortal Shoes -->
 			<item id="33966" /> <!-- Immortal Shoes -->
+			<item id="37218" /> <!-- Steel Immortal Tunic (30-day) -->
+			<item id="37219" /> <!-- Steel Immortal Stockings (30-day) -->
+			<item id="37220" /> <!-- Steel Immortal Circlet (30-day) -->
+			<item id="37221" /> <!-- Steel Immortal Gloves (30-day) -->
+			<item id="37222" /> <!-- Steel Immortal Shoes (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13084" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Robe 2 Piece (Magic Type) -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/32300-32399.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/32300-32399.xml
index 0b991aa96d..7713d06238 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/32300-32399.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/32300-32399.xml
@@ -187,10 +187,8 @@
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="POTION" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
 			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/33800-33899.xml
index fcea6487e4..4df7a11d63 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/33800-33899.xml
@@ -1116,11 +1116,10 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
+			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
 	</item>
 	<item id="33863" name="Fire Stone (+ 60)" additionalName="Event" type="EtcItem">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/34000-34099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/34000-34099.xml
index 2ba294fa92..aa87c238cc 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/34000-34099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/34000-34099.xml
@@ -1508,10 +1508,8 @@
 		<set name="is_stackable" val="true" />
 		<skills>
 			<skill id="9281" level="2" /> <!-- Drum Melody - Heavenly Cocktail -->
-			<skill id="9282" level="2" /> <!-- Lute Melody - Heavenly Cocktail -->
 			<skill id="9283" level="2" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
 			<skill id="9284" level="2" /> <!-- Guitar Melody - Heavenly Cocktail -->
-			<skill id="9285" level="2" /> <!-- Harp Melody - Heavenly Cocktail -->
 			<skill id="9280" level="2" /> <!-- Horn Melody - Heavenly Cocktail -->
 		</skills>
 	</item>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/46000-46099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/46000-46099.xml
index 4406b8f1cb..4925bf448d 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/46000-46099.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/46000-46099.xml
@@ -452,7 +452,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18380" level="1" /> <!-- Player Commendation - Talisman - STR -->
+		</skills>
 	</item>
 	<item id="46040" name="Player Commendation Talisman - INT" additionalName="PC-exclusive" type="Armor">
 		<!-- INT +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -465,7 +472,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18381" level="1" /> <!-- Player Commendation - Talisman - INT -->
+		</skills>
 	</item>
 	<item id="46041" name="Player Commendation Talisman - DEX" additionalName="PC-exclusive" type="Armor">
 		<!-- DEX +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -478,7 +492,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18382" level="1" /> <!-- Player Commendation - Talisman - DEX -->
+		</skills>
 	</item>
 	<item id="46042" name="Player Commendation Talisman - WIT" additionalName="PC-exclusive" type="Armor">
 		<!-- WIT +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -491,7 +512,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18383" level="1" /> <!-- Player Commendation - Talisman - WIT -->
+		</skills>
 	</item>
 	<item id="46043" name="Player Commendation Talisman - CON" additionalName="PC-exclusive" type="Armor">
 		<!-- CON +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -504,7 +532,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18384" level="1" /> <!-- Player Commendation - Talisman - CON -->
+		</skills>
 	</item>
 	<item id="46044" name="Player Commendation Talisman - MEN" additionalName="PC-exclusive" type="Armor">
 		<!-- MEN +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -517,7 +552,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18385" level="1" /> <!-- Player Commendation - Talisman - MEN -->
+		</skills>
 	</item>
 	<item id="46045" name="Player Commendation Talisman - Atk. Attribute Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Atk. Attribute Bonus +50 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -530,7 +572,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18386" level="1" /> <!-- Player Commendation - Talisman - Attack Attribute -->
+		</skills>
 	</item>
 	<item id="46046" name="Player Commendation Talisman - Fire Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Fire Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -543,7 +592,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18387" level="1" /> <!-- Player Commendation - Talisman - Fire Resistance -->
+		</skills>
 	</item>
 	<item id="46047" name="Player Commendation Talisman - Water Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Water Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -556,7 +612,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18388" level="1" /> <!-- Player Commendation - Talisman - Water Resistance -->
+		</skills>
 	</item>
 	<item id="46048" name="Player Commendation Talisman - Wind Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Wind Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -569,7 +632,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18389" level="1" /> <!-- Player Commendation - Talisman - Wind Resistance -->
+		</skills>
 	</item>
 	<item id="46049" name="Player Commendation Talisman - Earth Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Earth Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -582,7 +652,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18390" level="1" /> <!-- Player Commendation - Talisman - Earth Resistance -->
+		</skills>
 	</item>
 	<item id="46050" name="Player Commendation Talisman - Holy Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Holy Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -595,7 +672,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18391" level="1" /> <!-- Player Commendation - Talisman - Holy Resistance -->
+		</skills>
 	</item>
 	<item id="46051" name="Player Commendation Talisman - Dark Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Dark Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -608,7 +692,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18392" level="1" /> <!-- Player Commendation - Talisman - Dark Resistance -->
+		</skills>
 	</item>
 	<item id="46052" name="Veridan's Soul Stone" type="EtcItem">
 		<!-- Soul Stone obtained from defeating Armed Veridan. When combined with Kechi's Soul Stone and Michaela's Soul Stone, it will be turned into a Dark Soul Stone. Take it to Head Priest of the Earth Daichir to be recognized for defeating Earth Wyrm Trasken. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47900-47999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47900-47999.xml
index 0a1b444fe0..2a100b8cb9 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47900-47999.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/47900-47999.xml
@@ -1320,7 +1320,7 @@
 		<!-- When equipped, activates six Jewel Slots. Inventory Slots +12. -->
 		<set name="icon" val="icon.etc_bm_brooch_lavianrose_i04" />
 		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="gloves" />
+		<set name="bodypart" val="brooch" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="5" />
@@ -1328,6 +1328,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="13976" level="1" /> <!-- La Vie En Rose's Glorious Brooch -->
+		</skills>
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
@@ -1336,7 +1339,7 @@
 		<!-- When equipped, activates six Jewel Slots. Inventory Slots +12. CHA +1. Can be augmented. -->
 		<set name="icon" val="icon.etc_bm_brooch_lavianrose_i05" />
 		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="gloves" />
+		<set name="bodypart" val="brooch" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="5" />
@@ -1344,6 +1347,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="13976" level="2" /> <!-- La Vie En Rose's Glorious Brooch -->
+		</skills>
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
@@ -1391,7 +1397,7 @@
 		<!-- When equipped, activates six Jewel Slots. Inventory Slots +12. All stats +1. Can be augmented. -->
 		<set name="icon" val="icon.etc_bm_brooch_lavianrose_i06" />
 		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="gloves" />
+		<set name="bodypart" val="brooch" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="5" />
@@ -1399,6 +1405,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="13976" level="3" /> <!-- La Vie En Rose's Glorious Brooch -->
+		</skills>
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48100-48199.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48100-48199.xml
index 2fcbf2d7d7..fc4daabda6 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48100-48199.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48100-48199.xml
@@ -453,6 +453,19 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
+		<set name="weight" val="150" />
+		<set name="bodypart" val="lbracelet" />
+		<set name="immediate_effect" val="true" />
+		<set name="time" val="43200" />
+		<skills>
+			<skill id="3267" level="1" /> <!-- Seal Agathion -->
+			<skill id="18172" level="1" /> <!-- Joon's Magic -->
+			<skill id="18173" level="1" /> <!-- Joon's Ressurection -->
+			<skill id="18174" level="1" /> <!-- Agathion - Joon -->
+			<skill id="18175" level="1" /> <!-- Joon's Cute Trick -->
+		</skills>
 	</item>
 	<item id="48134" name="Agathion - Shiny Charm" type="Armor">
 		<!-- Can summon an Agathion - Shiny when equipped. <Active Skill>. 1. Agathion Teleport: Enables teleportation to Town of Aden/ Town of Rune/ Talking Island Village/ Town of Giran/ Town of Goddard/ Town of Schuttgart. (Cooldown 30 min). <Item Skill>. 1. Chase Down: For 15 sec, Movement Speed +66. <Item Skill>. 2. Sneak: Monsters do not attack first. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
index cbc529b0a6..d2bde73e61 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/11500-11599.xml
@@ -1913,8 +1913,10 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL</slot>
 			</effect>
 			<effect name="MAtk">
-				<value level="1">40</value>
-				<value level="2">45</value>
+				<amount>
+					<value level="1">40</value>
+					<value level="2">45</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalAttackSpeed">
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13900-13999.xml
index 30b1916325..36b1f54f13 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13900-13999.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13900-13999.xml
@@ -2681,4 +2681,102 @@
 			</effect>
 		</effects>
 	</skill>
+	<skill id="13976" toLevel="3" name="La Vie En Rose's Glorious Brooch">
+		<!-- Equips up to 6 Jewels and adds 12 inventory slots. -->
+		<icon>
+			<value level="1">icon.etc_bm_brooch_lavianrose_i04</value>
+			<value level="2">icon.etc_bm_brooch_lavianrose_i05</value>
+			<value level="3">icon.etc_bm_brooch_lavianrose_i06</value>
+		</icon>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="JewelSlot">
+				<amount>
+					<value level="1">6</value>
+					<value level="2">6</value>
+					<value level="3">6</value>
+				</amount>
+			</effect>
+			<effect name="EnlargeSlot">
+				<amount>
+					<value level="1">12</value>
+					<value level="2">12</value>
+					<value level="3">12</value>
+				</amount>
+				<type>INVENTORY_NORMAL</type>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">1</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>CHA</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="MaxCp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
+	</skill>
 </list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/EnchantItemData.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/EnchantItemData.xml
index 52ab652d43..b7ee681403 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/EnchantItemData.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Hair's -->
-	<enchant id="33818" />
-	<enchant id="34940" />
-	<enchant id="36978" />
+	<enchant id="33818" maxEnchant="10" />
+	<enchant id="34940" maxEnchant="10" />
+	<enchant id="36978" maxEnchant="10" />
+	<!-- Heavenly Enchant Scroll: Weapon -->
+	<enchant id="22427" targetGrade="R" maxEnchant="12" bonusRate="100" />
+	<!-- Heavenly Enchant Scroll: Armor -->
+	<enchant id="22430" targetGrade="R" maxEnchant="12" bonusRate="100" />
 
 	<!-- Scroll: Enchant Shadow Weapon -->
 	<enchant id="46337" targetGrade="R" maxEnchant="10">
@@ -211,6 +215,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 	</enchant>
 
 	<!-- Blessed Scroll: Enchant Elemental Shirt" type="EtcItem -->
@@ -222,6 +227,13 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
+	</enchant>
+
+	<!-- Blessed Olf's T-shirt Enchant Scroll - Event -->
+	<enchant id="21707" maxEnchant="10">
+		<item id="21580" /> <!-- Olf's T-shirt -->
+		<item id="21706" /> <!-- Olf's T-shirt (Event) -->
 	</enchant>
 
 	<!-- Event - Herdsman's Love Scroll Event -->
@@ -489,6 +501,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -514,6 +527,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -539,6 +553,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -564,6 +579,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -589,6 +605,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
@@ -614,6 +631,7 @@
 		<item id="34624" /> <!-- Sayha's Shirt -->
 		<item id="34625" /> <!-- Eva's Shirt -->
 		<item id="34626" /> <!-- Maphr's Shirt -->
+		<item id="23307" /> <!-- Maphr's Shirt -->
 		<item id="34732" /> <!-- Exchanged Power Shirt -->
 		<item id="34770" /> <!-- Pa'agrio's Shirt -->
 		<item id="34771" /> <!-- Sayha's Shirt -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/PrimeShop.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/PrimeShop.xml
index 5d2b71ae2c..8eead691e6 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/PrimeShop.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/PrimeShop.xml
@@ -6,4 +6,39 @@
 	<!-- recommended = 1 - Top, 2 - Left, 4 - Right (bit flags) -->
 	<!-- startSale = unixTime -->
 	<!-- endSale = unixTime -->
+	<item id="1090335" cat="3" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="36308" count="1" /> <!-- Beauty Shop Ticket-->
+	</item>
+	<item id="1091000" cat="2" paymentType="0" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="5" /> <!-- Hero Coin-->
+		<item itemId="28405" count="1" /> <!-- Maphr's Rune 100% Pack (1-hour)-->
+	</item>
+	<item id="1091001" cat="2" paymentType="0" price="500" panelType="4" recommended="1" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="50" /> <!-- Hero Coin-->
+		<item itemId="28406" count="1" /> <!-- Maphr's Rune 100% Pack (7-day)-->
+	</item>
+	<item id="1090026" cat="3" paymentType="2" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="20079" count="1" /> <!-- Good Luck Lucky Pack-->
+	</item>
+	<item id="1090027" cat="2" paymentType="0" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="5" /> <!-- Hero Coin-->
+		<item itemId="21631" count="1" /> <!-- Vitality Replenish Potion Pack-->
+	</item>
+	<item id="1090028" cat="2" paymentType="0" price="50" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="5" /> <!-- Hero Coin-->
+		<item itemId="20033" count="1" /> <!-- Vitality Maintaining Potion Pack-->
+	</item>
+	<item id="1090029" cat="2" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="20033" count="50" /> <!-- My Teleport Flag-->
+	</item>
+	<item id="1090030" cat="2" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="13015" count="1" /> <!-- My Teleport Book-->
+	</item>
+	<item id="1090031" cat="2" paymentType="0" price="100" panelType="0" recommended="0" startSale="315558000" endSale="2127452400" dayOfWeek="127" startHour="0" startMinute="0" stopHour="23" stopMinute="59" stock="-1" maxStock="-1" salePercent="0" minLevel="0" maxLevel="0" minBirthday="0" maxBirthday="0" restrictionDay="0" availableCount="0" >
+		<item itemId="23805" count="10" /> <!-- Hero Coin-->
+		<item itemId="20025" count="50" /> <!-- My Teleport Scroll-->
+	</item>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Elven/ElvenFortress.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Elven/ElvenFortress.xml
index 6a8a8a9dc4..337063f6f9 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Elven/ElvenFortress.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Elven/ElvenFortress.xml
@@ -301,8 +301,6 @@
 			<npc id="20470" x="37540" y="51439" z="-3448" heading="13509" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="37594" y="56473" z="-3648" heading="20606" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="40459" y="57654" z="-3632" heading="23176" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42083" y="55710" z="-3640" heading="48516" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
-			<npc id="20470" x="42119" y="57328" z="-3664" heading="50780" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42366" y="62646" z="-3512" heading="59103" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42759" y="59357" z="-3592" heading="40920" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
 			<npc id="20470" x="42933" y="57610" z="-3704" heading="11026" respawnTime="60sec" /> <!-- Kaboo Orc Soldier -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Innadril/FafurionTemple.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Innadril/FafurionTemple.xml
index 89c423a454..01bfd535f8 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Innadril/FafurionTemple.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Innadril/FafurionTemple.xml
@@ -297,6 +297,135 @@
 			<npc id="24326" x="181144" y="254856" z="-3466" heading="40603" respawnTime="60sec" /> <!-- Temple Guardian Wizard -->
 			<npc id="24322" x="180808" y="254728" z="-3471" heading="44928" respawnTime="60sec" /> <!-- Temple Knight Recruit -->
 			<npc id="24324" x="180616" y="255112" z="-3479" heading="2036" respawnTime="60sec" /> <!-- Temple Guardian Warrior -->
+			<npc id="24317" x="170168" y="242968" z="-3243" heading="60607" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24329" x="170344" y="243080" z="-3229" heading="61882" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="170424" y="242872" z="-3238" heading="60540" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24323" x="170360" y="243176" z="-3245" heading="20285" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24321" x="170424" y="242936" z="-3239" heading="60509" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24327" x="170472" y="242968" z="-3243" heading="5069" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="170520" y="242824" z="-3243" heading="57680" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24317" x="171032" y="244696" z="-3285" heading="49705" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24329" x="171048" y="244568" z="-3284" heading="35386" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24327" x="170712" y="244648" z="-3255" heading="45970" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="170792" y="244504" z="-3274" heading="47746" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24323" x="170808" y="244440" z="-3270" heading="51432" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24323" x="171368" y="244808" z="-3302" heading="49433" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24321" x="171000" y="245032" z="-3267" heading="25636" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24317" x="169064" y="244232" z="-3265" heading="47009" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24321" x="168696" y="244200" z="-3258" heading="41438" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24323" x="169160" y="244056" z="-3263" heading="2011" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24327" x="169336" y="244200" z="-3254" heading="14994" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="169416" y="244536" z="-3254" heading="46249" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24329" x="169288" y="244376" z="-3260" heading="53152" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="168936" y="244024" z="-3264" heading="37958" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24317" x="169128" y="246584" z="-3192" heading="44373" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24323" x="168888" y="246600" z="-3203" heading="41819" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24321" x="168888" y="246472" z="-3182" heading="49543" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24329" x="169224" y="246408" z="-3165" heading="140" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="169128" y="246264" z="-3200" heading="46843" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24327" x="169288" y="246888" z="-3217" heading="8733" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="169368" y="246728" z="-3210" heading="55040" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24317" x="171368" y="246200" z="-3284" heading="37604" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24323" x="171176" y="246088" z="-3279" heading="32571" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24321" x="171592" y="246024" z="-3285" heading="62260" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24327" x="171640" y="246456" z="-3274" heading="39714" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="171272" y="246488" z="-3254" heading="30929" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24317" x="173672" y="244952" z="-3266" heading="23708" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24329" x="173672" y="245128" z="-3279" heading="11305" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="173352" y="244968" z="-3282" heading="39288" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24327" x="173608" y="244680" z="-3263" heading="28153" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="173816" y="245112" z="-3274" heading="13606" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24323" x="173480" y="245160" z="-3284" heading="34580" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24321" x="173624" y="245336" z="-3301" heading="11388" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24317" x="174888" y="246808" z="-3392" heading="2425" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24321" x="174952" y="246488" z="-3385" heading="40384" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24323" x="174664" y="246472" z="-3369" heading="33970" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24327" x="174568" y="246664" z="-3356" heading="19574" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="174936" y="247096" z="-3390" heading="4178" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24329" x="175176" y="246808" z="-3384" heading="50819" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="175048" y="246840" z="-3387" heading="25124" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24323" x="176264" y="247832" z="-3325" heading="42977" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24321" x="176168" y="248008" z="-3313" heading="13245" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24317" x="176040" y="247912" z="-3320" heading="45140" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24329" x="176168" y="247688" z="-3327" heading="54544" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="175816" y="247992" z="-3306" heading="24154" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24327" x="175832" y="247800" z="-3315" heading="59219" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="176040" y="247656" z="-3322" heading="12712" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24317" x="174328" y="248216" z="-3344" heading="5508" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24323" x="174362" y="248045" z="-3337" heading="12415" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24321" x="174536" y="248056" z="-3359" heading="1315" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24325" x="174312" y="247880" z="-3326" heading="40111" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24327" x="174120" y="248264" z="-3333" heading="17301" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24329" x="174408" y="248424" z="-3372" heading="57817" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="174568" y="248216" z="-3387" heading="3113" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24317" x="175064" y="249512" z="-3359" heading="38026" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24323" x="175192" y="249416" z="-3370" heading="58449" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24321" x="174952" y="249320" z="-3375" heading="36524" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24329" x="174808" y="249480" z="-3352" heading="17554" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="174856" y="249304" z="-3376" heading="50571" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24325" x="174984" y="249704" z="-3309" heading="13502" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24327" x="175240" y="249704" z="-3326" heading="70" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24317" x="174712" y="251496" z="-3293" heading="31900" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24321" x="174936" y="251704" z="-3282" heading="9643" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24323" x="174568" y="251784" z="-3281" heading="29963" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24327" x="174760" y="252008" z="-3277" heading="10495" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="174888" y="251880" z="-3282" heading="57548" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24329" x="174728" y="251656" z="-3293" heading="42760" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="174408" y="251480" z="-3297" heading="38600" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24317" x="175800" y="250872" z="-3295" heading="51707" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24321" x="175832" y="251032" z="-3289" heading="13869" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24323" x="176024" y="250824" z="-3287" heading="57754" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24329" x="175736" y="250632" z="-3302" heading="34499" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="175816" y="250728" z="-3301" heading="63678" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24327" x="175512" y="250824" z="-3309" heading="24163" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="175704" y="251128" z="-3288" heading="9000" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24317" x="174280" y="253368" z="-3246" heading="15369" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24321" x="174600" y="253144" z="-3259" heading="48132" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24323" x="174488" y="253368" z="-3250" heading="55052" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24327" x="174680" y="253416" z="-3248" heading="6074" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="174616" y="253656" z="-3262" heading="15483" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24329" x="174088" y="253560" z="-3224" heading="37123" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="174104" y="253096" z="-3236" heading="50119" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24317" x="173032" y="253896" z="-3206" heading="55936" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24323" x="172968" y="254104" z="-3195" heading="21270" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24321" x="172808" y="253992" z="-3210" heading="38494" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24329" x="172680" y="253928" z="-3221" heading="45888" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24327" x="172632" y="254296" z="-3206" heading="17415" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="173112" y="254264" z="-3233" heading="65062" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24317" x="173976" y="255320" z="-3143" heading="34020" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24321" x="173688" y="255416" z="-3102" heading="31110" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24323" x="173912" y="255160" z="-3160" heading="53921" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24325" x="173736" y="255224" z="-3138" heading="61772" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24327" x="173768" y="255224" z="-3138" heading="29383" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24329" x="173704" y="255112" z="-3157" heading="44249" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="173624" y="255240" z="-3126" heading="22032" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24317" x="172152" y="255560" z="-3118" heading="24390" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24321" x="172232" y="255800" z="-3106" heading="10589" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24323" x="172472" y="255656" z="-3117" heading="60461" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24329" x="172312" y="255160" z="-3136" heading="39540" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="172360" y="255528" z="-3139" heading="496" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24327" x="172008" y="255320" z="-3107" heading="38142" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="171848" y="255560" z="-3085" heading="22374" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24317" x="170152" y="255736" z="-3073" heading="12096" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24321" x="170328" y="255720" z="-3077" heading="50078" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24323" x="170280" y="256072" z="-3045" heading="24405" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24327" x="170552" y="255896" z="-3068" heading="53682" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="170248" y="255912" z="-3070" heading="32470" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24329" x="170088" y="255912" z="-3069" heading="32446" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="170232" y="255528" z="-3086" heading="53041" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24317" x="171656" y="256904" z="-3041" heading="28626" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24321" x="171768" y="256792" z="-3036" heading="58766" respawnTime="60sec" /> <!-- Temple Patrol Guard -->
+			<npc id="24323" x="171496" y="256760" z="-3038" heading="28963" respawnTime="60sec" /> <!-- Temple Guard -->
+			<npc id="24327" x="171384" y="256984" z="-3046" heading="12130" respawnTime="60sec" /> <!-- Temple Priest -->
+			<npc id="24325" x="171320" y="256728" z="-3046" heading="44622" respawnTime="60sec" /> <!-- Temple Wizard -->
+			<npc id="24329" x="171544" y="256984" z="-3045" heading="8912" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24329" x="171416" y="256584" z="-3046" heading="45983" respawnTime="60sec" /> <!-- Starving Water Dragon -->
+			<npc id="24328" x="179096" y="250408" z="-3195" heading="64640" respawnTime="60sec" /> <!-- Temple Guardian Priest -->
+			<npc id="24326" x="179288" y="250344" z="-3209" heading="59524" respawnTime="60sec" /> <!-- Temple Guardian Wizard -->
+			<npc id="24324" x="179240" y="250264" z="-3218" heading="43652" respawnTime="60sec" /> <!-- Temple Guardian Warrior -->
+			<npc id="24324" x="179096" y="250184" z="-3221" heading="38679" respawnTime="60sec" /> <!-- Temple Guardian Warrior -->
+			<npc id="24318" x="179256" y="250088" z="-3245" heading="59253" respawnTime="60sec" /> <!-- Temple Guard Captain -->
+			<npc id="24322" x="178984" y="250152" z="-3221" heading="22245" respawnTime="60sec" /> <!-- Temple Knight Recruit -->
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/armorsets/Sets.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/armorsets/Sets.xml
index 13a6c96712..b8e715f899 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/armorsets/Sets.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/armorsets/Sets.xml
@@ -6559,6 +6559,11 @@
 			<item id="19590" /> <!-- Bound Immortal Boots -->
 			<item id="19654" /> <!-- Blessed Immortal Boots -->
 			<item id="33955" /> <!-- Immortal Boots -->
+			<item id="37207" /> <!-- Steel Immortal Breastplate (30-day) -->
+			<item id="37208" /> <!-- Steel Immortal Gaiters (30-day) -->
+			<item id="37209" /> <!-- Steel Immortal Helmet (30-day) -->
+			<item id="37210" /> <!-- Steel Immortal Gauntlets (30-day) -->
+			<item id="37211" /> <!-- Steel Immortal Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13065" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Heavy Armor 2 Piece (Attack Type) -->
@@ -6595,6 +6600,11 @@
 			<item id="19596" /> <!-- Bound Immortal Leather Boots -->
 			<item id="19660" /> <!-- Blessed Immortal Leather Boots -->
 			<item id="33961" /> <!-- Immortal Leather Boots -->
+			<item id="37213" /> <!-- Steel Immortal Leather Armor (30-day) -->
+			<item id="37214" /> <!-- Steel Immortal Leather Leggings (30-day) -->
+			<item id="37215" /> <!-- Steel Immortal Leather Helmet (30-day) -->
+			<item id="37216" /> <!-- Steel Immortal Leather Gloves (30-day) -->
+			<item id="37217" /> <!-- Steel Immortal Leather Boots (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13074" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Light Armor 2 Piece (Assassin Type) -->
@@ -6630,6 +6640,11 @@
 			<item id="19601" /> <!-- Bound Immortal Shoes -->
 			<item id="19665" /> <!-- Blessed Immortal Shoes -->
 			<item id="33966" /> <!-- Immortal Shoes -->
+			<item id="37218" /> <!-- Steel Immortal Tunic (30-day) -->
+			<item id="37219" /> <!-- Steel Immortal Stockings (30-day) -->
+			<item id="37220" /> <!-- Steel Immortal Circlet (30-day) -->
+			<item id="37221" /> <!-- Steel Immortal Gloves (30-day) -->
+			<item id="37222" /> <!-- Steel Immortal Shoes (30-day) -->
 		</requiredItems>
 		<skills>
 			<skill id="13084" level="1" minimumPieces="2" /> <!-- Set Effect - Immortal Robe 2 Piece (Magic Type) -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/32300-32399.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/32300-32399.xml
index 0b991aa96d..7713d06238 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/32300-32399.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/32300-32399.xml
@@ -187,10 +187,8 @@
 		<set name="immediate_effect" val="true" />
 		<set name="commissionItemType" val="POTION" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
 			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/33800-33899.xml
index 70f5a2afe7..a6ae64762f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/33800-33899.xml
@@ -1116,11 +1116,10 @@
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
 		<skills>
-			<skill id="9200" level="1" /> <!-- Elixir: Lute Melody -->
 			<skill id="9201" level="1" /> <!-- Elixir: Pipe Organ Melody -->
 			<skill id="9202" level="1" /> <!-- Elixir: Guitar Melody -->
-			<skill id="9203" level="1" /> <!-- Elixir: Harp Melody -->
 			<skill id="9198" level="1" /> <!-- Elixir: Horn Melody -->
+			<skill id="9199" level="1" /> <!-- Elixir: Drum Melody -->
 		</skills>
 	</item>
 	<item id="33863" name="Fire Stone (+ 60)" additionalName="Event" type="EtcItem">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/34000-34099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/34000-34099.xml
index eaa46ee32d..7acc64d364 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/34000-34099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/34000-34099.xml
@@ -1508,10 +1508,8 @@
 		<set name="is_stackable" val="true" />
 		<skills>
 			<skill id="9281" level="2" /> <!-- Drum Melody - Heavenly Cocktail -->
-			<skill id="9282" level="2" /> <!-- Lute Melody - Heavenly Cocktail -->
 			<skill id="9283" level="2" /> <!-- Pipe Organ Melody - Heavenly Cocktail -->
 			<skill id="9284" level="2" /> <!-- Guitar Melody - Heavenly Cocktail -->
-			<skill id="9285" level="2" /> <!-- Harp Melody - Heavenly Cocktail -->
 			<skill id="9280" level="2" /> <!-- Horn Melody - Heavenly Cocktail -->
 		</skills>
 	</item>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/46000-46099.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/46000-46099.xml
index 997f78daa7..dcc7c52819 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/46000-46099.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/46000-46099.xml
@@ -452,7 +452,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18380" level="1" /> <!-- Player Commendation - Talisman - STR -->
+		</skills>
 	</item>
 	<item id="46040" name="Player Commendation Talisman - INT" additionalName="PC-exclusive" type="Armor">
 		<!-- INT +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -465,7 +472,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18381" level="1" /> <!-- Player Commendation - Talisman - INT -->
+		</skills>
 	</item>
 	<item id="46041" name="Player Commendation Talisman - DEX" additionalName="PC-exclusive" type="Armor">
 		<!-- DEX +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -478,7 +492,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18382" level="1" /> <!-- Player Commendation - Talisman - DEX -->
+		</skills>
 	</item>
 	<item id="46042" name="Player Commendation Talisman - WIT" additionalName="PC-exclusive" type="Armor">
 		<!-- WIT +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -491,7 +512,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18383" level="1" /> <!-- Player Commendation - Talisman - WIT -->
+		</skills>
 	</item>
 	<item id="46043" name="Player Commendation Talisman - CON" additionalName="PC-exclusive" type="Armor">
 		<!-- CON +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -504,7 +532,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18384" level="1" /> <!-- Player Commendation - Talisman - CON -->
+		</skills>
 	</item>
 	<item id="46044" name="Player Commendation Talisman - MEN" additionalName="PC-exclusive" type="Armor">
 		<!-- MEN +5 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -517,7 +552,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18385" level="1" /> <!-- Player Commendation - Talisman - MEN -->
+		</skills>
 	</item>
 	<item id="46045" name="Player Commendation Talisman - Atk. Attribute Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Attack Attribute Bonus +50 when wearing the Talisman. Effect does not stack with identical ones. -->
@@ -530,7 +572,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18386" level="1" /> <!-- Player Commendation - Talisman - Attack Attribute -->
+		</skills>
 	</item>
 	<item id="46046" name="Player Commendation Talisman - Fire Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Fire Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -543,7 +592,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18387" level="1" /> <!-- Player Commendation - Talisman - Fire Resistance -->
+		</skills>
 	</item>
 	<item id="46047" name="Player Commendation Talisman - Water Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Water Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -556,7 +612,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18388" level="1" /> <!-- Player Commendation - Talisman - Water Resistance -->
+		</skills>
 	</item>
 	<item id="46048" name="Player Commendation Talisman - Wind Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Wind Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -569,7 +632,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18389" level="1" /> <!-- Player Commendation - Talisman - Wind Resistance -->
+		</skills>
 	</item>
 	<item id="46049" name="Player Commendation Talisman - Earth Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Earth Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -582,7 +652,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18390" level="1" /> <!-- Player Commendation - Talisman - Earth Resistance -->
+		</skills>
 	</item>
 	<item id="46050" name="Player Commendation Talisman - Holy Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Holy Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -595,7 +672,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18391" level="1" /> <!-- Player Commendation - Talisman - Holy Resistance -->
+		</skills>
 	</item>
 	<item id="46051" name="Player Commendation Talisman - Dark Resistance Boost" additionalName="PC-exclusive" type="Armor">
 		<!-- Dark Resistance +50 when equipped. Only one effect is applied even when wearing two talismans with the same effect. -->
@@ -608,7 +692,14 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
+		<set name="bodypart" val="deco1" />
+		<set name="useSkillDisTime" val="6" />
+		<set name="equip_reuse_delay" val="30" />
+		<set name="immediate_effect" val="true" />
 		<set name="weight" val="150" />
+		<skills>
+			<skill id="18392" level="1" /> <!-- Player Commendation - Talisman - Dark Resistance -->
+		</skills>
 	</item>
 	<item id="46052" name="Veridan's Soul Stone" type="EtcItem">
 		<!-- Soul Stone obtained from defeating Armed Veridan. When combined with Kechi's Soul Stone and Michaela's Soul Stone, it will be turned into a Dark Soul Stone. Take it to Head Priest of the Earth Daichir to be recognized for defeating Earth Wyrm Trasken. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/47900-47999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/47900-47999.xml
index 9016e66b67..e5911b9808 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/47900-47999.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/47900-47999.xml
@@ -1320,7 +1320,7 @@
 		<!-- When equipped, activates six Jewel Slots. Inventory Slots +12. -->
 		<set name="icon" val="icon.etc_bm_brooch_lavianrose_i04" />
 		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="gloves" />
+		<set name="bodypart" val="brooch" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="5" />
@@ -1328,6 +1328,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="13976" level="1" /> <!-- La Vie En Rose's Glorious Brooch -->
+		</skills>
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
@@ -1336,7 +1339,7 @@
 		<!-- When equipped, activates six Jewel Slots. Inventory Slots +12. CHA +1. Can be augmented. -->
 		<set name="icon" val="icon.etc_bm_brooch_lavianrose_i05" />
 		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="gloves" />
+		<set name="bodypart" val="brooch" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="5" />
@@ -1344,6 +1347,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="13976" level="2" /> <!-- La Vie En Rose's Glorious Brooch -->
+		</skills>
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
@@ -1391,7 +1397,7 @@
 		<!-- When equipped, activates six Jewel Slots. Inventory Slots +12. All stats +1. Can be augmented. -->
 		<set name="icon" val="icon.etc_bm_brooch_lavianrose_i06" />
 		<set name="default_action" val="EQUIP" />
-		<set name="bodypart" val="gloves" />
+		<set name="bodypart" val="brooch" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="SILVER" />
 		<set name="weight" val="5" />
@@ -1399,6 +1405,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<skills>
+			<skill id="13976" level="3" /> <!-- La Vie En Rose's Glorious Brooch -->
+		</skills>
 		<stats>
 			<stat type="mDef">114</stat>
 		</stats>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48100-48199.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48100-48199.xml
index 33b70fb754..b91947d0dc 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48100-48199.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48100-48199.xml
@@ -453,6 +453,19 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_commissionable" val="false" />
+		<set name="is_private_storeable" val="false" />
+		<set name="weight" val="150" />
+		<set name="bodypart" val="lbracelet" />
+		<set name="immediate_effect" val="true" />
+		<set name="time" val="43200" />
+		<skills>
+			<skill id="3267" level="1" /> <!-- Seal Agathion -->
+			<skill id="18172" level="1" /> <!-- Joon's Magic -->
+			<skill id="18173" level="1" /> <!-- Joon's Ressurection -->
+			<skill id="18174" level="1" /> <!-- Agathion - Joon -->
+			<skill id="18175" level="1" /> <!-- Joon's Cute Trick -->
+		</skills>
 	</item>
 	<item id="48134" name="Agathion - Shiny Charm" type="Armor">
 		<!-- Can summon an Agathion - Shiny when equipped. <Active Skill>. 1. Agathion Teleport: Enables teleportation to Town of Aden/ Town of Rune/ Talking Island Village/ Town of Giran/ Town of Goddard/ Town of Schuttgart. (Cooldown 30 min). <Item Skill>. 1. Chase Down: For 15 sec, Movement Speed +66. <Item Skill>. 2. Sneak: Monsters do not attack first. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
index 851e1509b2..2024e46d07 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/11500-11599.xml
@@ -1928,8 +1928,10 @@
 				<slot>DANCE_OF_BLADESTORM;SONG_OF_CHAMPION;SONG_OF_EARTH;SONG_OF_HUNTER;SONG_OF_LIFE;SONG_OF_MEDITATION;SONG_OF_RENEWAL;SONG_OF_VENGEANCE;SONG_OF_VITALITY;SONG_OF_WARDING;SONG_OF_WATER;SONG_OF_WIND;DANCE_OF_BERSERKER;DANCE_OF_CONCENTRATION;DANCE_OF_FIRE;DANCE_OF_FURY;DANCE_OF_INSPIRATION;DANCE_OF_MYSTIC;DANCE_OF_SIREN;DANCE_OF_VAMPIRE;DANCE_OF_WARRIOR;SONG_OF_PURIFICATION;WISPERING_OF_BATTLE;SONG_OF_WINDSTORM;MOTION_OF_DEFENCE;INSTINCT;BERSERKER;PA_PD_UP;IMPROVE_SHIELD_RATE_DEFENCE_UP;SHIELD_PROB_UP;SHIELD_DEFENCE_UP;CANCEL_PROB_DOWN;MA_UP_SPECIAL</slot>
 			</effect>
 			<effect name="MAtk">
-				<value level="1">40</value>
-				<value level="2">45</value>
+				<amount>
+					<value level="1">40</value>
+					<value level="2">45</value>
+				</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalAttackSpeed">
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13900-13999.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13900-13999.xml
index 6b83f7b1a2..deddf320ec 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13900-13999.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13900-13999.xml
@@ -2688,6 +2688,95 @@
 			<value level="2">icon.etc_bm_brooch_lavianrose_i05</value>
 			<value level="3">icon.etc_bm_brooch_lavianrose_i06</value>
 		</icon>
-		<operateType>A1</operateType>
+		<operateType>P</operateType>
+		<effects>
+			<effect name="JewelSlot">
+				<amount>
+					<value level="1">6</value>
+					<value level="2">6</value>
+					<value level="3">6</value>
+				</amount>
+			</effect>
+			<effect name="EnlargeSlot">
+				<amount>
+					<value level="1">12</value>
+					<value level="2">12</value>
+					<value level="3">12</value>
+				</amount>
+				<type>INVENTORY_NORMAL</type>
+			</effect>
+			<effect name="StatUp">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">1</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>CHA</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>STR</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>DEX</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>CON</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>INT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>WIT</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>MEN</stat>
+			</effect>
+			<effect name="StatUp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<stat>LUC</stat>
+			</effect>
+			<effect name="MaxCp" fromLevel="3" toLevel="3">
+				<amount>
+					<value level="1">0</value>
+					<value level="2">0</value>
+					<value level="3">1</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>