diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009001.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009001.xml
index 39430eba1f..1d9ced18b0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009001.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009001.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="308" price="0" /> <!-- Buffalo's Horn -->
+	<item id="2369" price="0" /> <!-- Squire's Sword -->
 	<item id="1" price="0" /> <!-- Short Sword -->
-	<item id="2" price="0" /> <!-- Long Sword -->
 	<item id="3" price="0" /> <!-- Broadsword -->
+	<item id="738" price="0" /> <!-- Sword of Solidarity -->
+	<item id="1510" price="0" /> <!-- Butcher's Sword -->
+	<item id="975" price="0" /> <!-- Blood Saber -->
+	<item id="743" price="0" /> <!-- Sword of Sentinel -->
 	<item id="66" price="0" /> <!-- Gladius -->
+	<item id="122" price="0" /> <!-- Handmade Sword -->
 	<item id="67" price="0" /> <!-- Orcish Sword -->
-	<item id="68" price="0" /> <!-- Falchion -->
+	<item id="3029" price="0" /> <!-- Orcish Sword -->
+	<item id="1142" price="0" /> <!-- Rusted Bronze Sword -->
+	<item id="2" price="0" /> <!-- Long Sword -->
 	<item id="120" price="0" /> <!-- Sword of Reflection -->
 	<item id="121" price="0" /> <!-- Sword of Watershadow -->
-	<item id="122" price="0" /> <!-- Handmade Sword -->
-	<item id="738" price="0" /> <!-- Sword of Solidarity -->
-	<item id="743" price="0" /> <!-- Sword of Sentinel -->
-	<item id="975" price="0" /> <!-- Blood Saber -->
-	<item id="1142" price="0" /> <!-- Rusted Bronze Sword -->
-	<item id="1295" price="0" /> <!-- Long Sword -->
-	<item id="1296" price="0" /> <!-- Gladius -->
-	<item id="1297" price="0" /> <!-- Bastard Sword -->
-	<item id="1298" price="0" /> <!-- Caliburs -->
-	<item id="1510" price="0" /> <!-- Butcher's Sword -->
-	<item id="2369" price="0" /> <!-- Squire's Sword -->
-	<item id="3029" price="0" /> <!-- Sword of Binding -->
-	<item id="4027" price="0" /> <!-- Bouquet -->
-	<item id="4202" price="0" /> <!-- Chrono Cithara -->
-	<item id="4219" price="0" /> <!-- Dream Sword -->
+	<item id="68" price="0" /> <!-- Falchion -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009003.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009003.xml
index 8632803dae..c05cba8bc6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009003.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009003.xml
@@ -2,19 +2,16 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="10" price="0" /> <!-- Dagger -->
 	<item id="11" price="0" /> <!-- Bone Dagger -->
-	<item id="12" price="0" /> <!-- Knife -->
+	<item id="3471" price="0" /> <!-- Cybellin's Dagger -->
 	<item id="215" price="0" /> <!-- Doom Dagger -->
+	<item id="12" price="0" /> <!-- Knife -->
+	<item id="2372" price="0" /> <!-- Dagger of Adept -->
+	<item id="989" price="0" /> <!-- Eldritch Dagger -->
+	<item id="2374" price="0" /> <!-- Red Sunset Dagger -->
 	<item id="216" price="0" /> <!-- Dirk -->
+	<item id="946" price="0" /> <!-- Skeleton Dagger -->
+	<item id="1182" price="0" /> <!-- Neti's Dagger -->
 	<item id="217" price="0" /> <!-- Shining Knife -->
 	<item id="218" price="0" /> <!-- Throwing Knife -->
 	<item id="219" price="0" /> <!-- Sword Breaker -->
-	<item id="946" price="0" /> <!-- Skeleton Dagger -->
-	<item id="989" price="0" /> <!-- Eldritch Dagger -->
-	<item id="1182" price="0" /> <!-- Neti's Dagger -->
-	<item id="1305" price="0" /> <!-- Knife -->
-	<item id="1306" price="0" /> <!-- Crafted Dagger -->
-	<item id="2372" price="0" /> <!-- Dagger of Adept -->
-	<item id="2374" price="0" /> <!-- Red Sunset Dagger -->
-	<item id="3471" price="0" /> <!-- Cybellin's Dagger -->
-	<item id="4220" price="0" /> <!-- Dream Knife -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009004.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009004.xml
index 57c23094b3..c2917f6552 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009004.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009004.xml
@@ -2,12 +2,11 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="13" price="0" /> <!-- Short Bow -->
 	<item id="14" price="0" /> <!-- Bow -->
-	<item id="271" price="0" /> <!-- Hunting Bow -->
-	<item id="272" price="0" /> <!-- Forest Bow -->
-	<item id="273" price="0" /> <!-- Composite Bow -->
-	<item id="1181" price="0" /> <!-- Neti's Bow -->
-	<item id="1213" price="0" /> <!-- Guard's Bow -->
-	<item id="1307" price="0" /> <!-- Bow -->
 	<item id="3028" price="0" /> <!-- Crescent Moon Bow -->
+	<item id="271" price="0" /> <!-- Hunting Bow -->
+	<item id="1181" price="0" /> <!-- Neti's Bow -->
+	<item id="272" price="0" /> <!-- Forest Bow -->
+	<item id="1213" price="0" /> <!-- Guard's Bow -->
+	<item id="273" price="0" /> <!-- Composite Bow -->
 	<item id="17" price="0" /> <!-- Wooden Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009005.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009005.xml
index 36d9648e08..3c547578db 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009005.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009005.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="2368" price="0" /> <!-- Training Gloves -->
 	<item id="253" price="0" /> <!-- Spiked Gloves -->
 	<item id="254" price="0" /> <!-- Iron Gloves -->
+	<item id="2371" price="0" /> <!-- Fist of Butcher -->
 	<item id="255" price="0" /> <!-- Fox Claw Gloves -->
 	<item id="256" price="0" /> <!-- Cestus -->
 	<item id="257" price="0" /> <!-- Viper Fang -->
-	<item id="2368" price="0" /> <!-- Training Gloves -->
-	<item id="2371" price="0" /> <!-- Fist of Butcher -->
-	<item id="5133" price="0" /> <!-- Chrono Unitus -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009006.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009006.xml
index d7d715a2c4..6fc4e88700 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009006.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009006.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="15" price="0" /> <!-- Short Spear -->
-	<item id="16" price="0" /> <!-- Great Spear -->
-	<item id="1302" price="0" /> <!-- Bec de Corbin -->
-	<item id="1303" price="0" /> <!-- Lance -->
 	<item id="3026" price="0" /> <!-- Talins Spear -->
-	<item id="5817" price="0" /> <!-- Chrono Campana -->
+	<item id="16" price="0" /> <!-- Great Spear -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009007.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009007.xml
index 83ea0a60e0..f49e6f8628 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009007.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009007.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="4" price="0" /> <!-- Club -->
-	<item id="5" price="0" /> <!-- Mace -->
 	<item id="6" price="0" /> <!-- Apprentice's Wand -->
 	<item id="7" price="0" /> <!-- Apprentice's Rod -->
-	<item id="87" price="0" /> <!-- Iron Hammer -->
-	<item id="152" price="0" /> <!-- Heavy Chisel -->
-	<item id="153" price="0" /> <!-- Sigil -->
-	<item id="154" price="0" /> <!-- Dwarven Mace -->
-	<item id="155" price="0" /> <!-- Flanged Mace -->
-	<item id="747" price="0" /> <!-- Wand of Adept -->
-	<item id="748" price="0" /> <!-- Gallint's Oak Wand -->
-	<item id="1300" price="0" /> <!-- Apprentice's Rod -->
-	<item id="1301" price="0" /> <!-- Big Hammer -->
-	<item id="1511" price="0" /> <!-- Silversmith Hammer -->
 	<item id="2370" price="0" /> <!-- Guild Member's Club -->
+	<item id="4" price="0" /> <!-- Club -->
+	<item id="152" price="0" /> <!-- Heavy Chisel -->
+	<item id="5" price="0" /> <!-- Mace -->
+	<item id="747" price="0" /> <!-- Wand of Adept -->
+	<item id="153" price="0" /> <!-- Sickle -->
+	<item id="1511" price="0" /> <!-- Silversmith Hammer -->
+	<item id="154" price="0" /> <!-- Dwarven Mace -->
 	<item id="2501" price="0" /> <!-- Bone Club -->
-	<item id="4221" price="0" /> <!-- Ubiquitous Axe -->
+	<item id="155" price="0" /> <!-- Flanged Mace -->
+	<item id="87" price="0" /> <!-- Iron Hammer -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009008.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009008.xml
index 7334960d0c..2d76d487c4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009008.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009008.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="8" price="0" /> <!-- Willow Staff -->
+	<item id="2373" price="0" /> <!-- Eldritch Staff -->
+	<item id="754" price="0" /> <!-- Red Sunset Staff -->
+	<item id="744" price="0" /> <!-- Staff of Sentinel -->
 	<item id="9" price="0" /> <!-- Cedar Staff -->
 	<item id="176" price="0" /> <!-- Apprentice's Staff -->
 	<item id="177" price="0" /> <!-- Mage Staff -->
-	<item id="744" price="0" /> <!-- Staff of Sentinel -->
-	<item id="754" price="0" /> <!-- Red Sunset Staff -->
-	<item id="1304" price="0" /> <!-- Conjuror's Staff -->
-	<item id="2373" price="0" /> <!-- Eldritch Staff -->
-	<item id="7058" price="0" /> <!-- Chrono Darbuka -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009009.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009009.xml
index 464496df10..be0fbe4fbb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009009.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009009.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="69" price="0" /> <!-- Bastard Sword -->
-	<item id="83" price="0" /> <!-- Sword of Magic -->
+	<item id="7885" price="0" /> <!-- Priest Sword -->
 	<item id="123" price="0" /> <!-- Saber -->
-	<item id="125" price="0" /> <!-- Spinebone Sword -->
-	<item id="126" price="0" /> <!-- Artisan's Sword -->
-	<item id="127" price="0" /> <!-- Crimson Sword -->
-	<item id="128" price="0" /> <!-- Knight's Sword -->
-	<item id="129" price="0" /> <!-- Sword of Revolution -->
-	<item id="130" price="0" /> <!-- Elven Sword -->
+	<item id="83" price="0" /> <!-- Sword of Magic -->
 	<item id="143" price="0" /> <!-- Sword of Mystic -->
 	<item id="144" price="0" /> <!-- Sword of Occult -->
+	<item id="126" price="0" /> <!-- Artisan's Sword -->
+	<item id="69" price="0" /> <!-- Bastard Sword -->
+	<item id="128" price="0" /> <!-- Knight's Sword -->
+	<item id="125" price="0" /> <!-- Spinebone Sword -->
+	<item id="7886" price="0" /> <!-- Sword of Magic Fog -->
+	<item id="127" price="0" /> <!-- Crimson Sword -->
+	<item id="130" price="0" /> <!-- Elven Sword -->
+	<item id="129" price="0" /> <!-- Sword of Revolution -->
 	<item id="2499" price="0" /> <!-- Elven Long Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009010.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009010.xml
index 26102a4458..92316b3b48 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009010.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009010.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="70" price="0" /> <!-- Claymore -->
-	<item id="124" price="0" /> <!-- Two-Handed Sword -->
 	<item id="5285" price="0" /> <!-- Heavy Sword -->
-	<item id="5791" price="0" /> <!-- Tomb Guard A -->
-	<item id="5792" price="0" /> <!-- Tomb Guard B -->
-	<item id="5795" price="0" /> <!-- Tomb Guard A -->
-	<item id="5796" price="0" /> <!-- Tomb Guard B -->
+	<item id="7880" price="0" /> <!-- Steel Sword -->
+	<item id="124" price="0" /> <!-- Two-Handed Sword -->
+	<item id="7881" price="0" /> <!-- Lesser Giant's Sword -->
+	<item id="70" price="0" /> <!-- Claymore -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009011.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009011.xml
index 761914e5d2..916031dadc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009011.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009011.xml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="2516" price="0" /> <!-- Saber*Saber -->
-	<item id="2517" price="0" /> <!-- Saber*Bastard Sword -->
-	<item id="2518" price="0" /> <!-- Saber*Spinebone Sword -->
 	<item id="2519" price="0" /> <!-- Saber*Artisan's Sword -->
+	<item id="2517" price="0" /> <!-- Saber*Bastard Sword -->
 	<item id="2520" price="0" /> <!-- Saber*Knight's Sword -->
-	<item id="2521" price="0" /> <!-- Saber*Crimson Sword -->
-	<item id="2522" price="0" /> <!-- Saber*Elven Sword -->
+	<item id="2518" price="0" /> <!-- Saber*Spinebone Sword -->
+	<item id="2540" price="0" /> <!-- Artisan's Sword*Artisan's Sword -->
+	<item id="2541" price="0" /> <!-- Artisan's Sword*Knight's Sword -->
+	<item id="2527" price="0" /> <!-- Bastard Sword*Artisan's Sword -->
 	<item id="2525" price="0" /> <!-- Bastard Sword*Bastard Sword -->
 	<item id="2526" price="0" /> <!-- Bastard Sword*Spinebone Sword -->
-	<item id="2527" price="0" /> <!-- Bastard Sword*Artisan's Sword -->
 	<item id="2528" price="0" /> <!-- Bastard Sword*Knight's Sword -->
-	<item id="2529" price="0" /> <!-- Bastard Sword*Crimson Sword -->
-	<item id="2530" price="0" /> <!-- Bastard Sword*Elven Sword -->
+	<item id="2546" price="0" /> <!-- Knight's Sword*Knight's Sword -->
+	<item id="2521" price="0" /> <!-- Saber*Crimson Sword -->
+	<item id="2522" price="0" /> <!-- Saber*Elven Sword -->
 	<item id="2533" price="0" /> <!-- Spinebone Sword*Spinebone Sword -->
 	<item id="2534" price="0" /> <!-- Spinebone Sword*Artisan's Sword -->
 	<item id="2535" price="0" /> <!-- Spinebone Sword*Knight's Sword -->
-	<item id="2536" price="0" /> <!-- Spinebone Sword*Crimson Sword -->
-	<item id="2537" price="0" /> <!-- Spinebone Sword*Elven Sword -->
-	<item id="2540" price="0" /> <!-- Artisan's Sword*Artisan's Sword -->
-	<item id="2541" price="0" /> <!-- Artisan's Sword*Knight's Sword -->
 	<item id="2542" price="0" /> <!-- Artisan's Sword*Crimson Sword -->
 	<item id="2543" price="0" /> <!-- Artisan's Sword*Elven Sword -->
-	<item id="2546" price="0" /> <!-- Knight's Sword*Knight's Sword -->
+	<item id="2529" price="0" /> <!-- Bastard Sword*Crimson Sword -->
+	<item id="2530" price="0" /> <!-- Bastard Sword*Elven Sword -->
 	<item id="2547" price="0" /> <!-- Knight's Sword*Crimson Sword -->
 	<item id="2548" price="0" /> <!-- Knight's Sword*Elven Sword -->
-	<item id="5129" price="0" /> <!-- Doll Knife -->
+	<item id="2536" price="0" /> <!-- Spinebone Sword*Crimson Sword -->
+	<item id="2537" price="0" /> <!-- Spinebone Sword*Elven Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009012.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009012.xml
index 6c276a3d38..835d727d32 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009012.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009012.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="220" price="0" /> <!-- Crafted Dagger -->
 	<item id="221" price="0" /> <!-- Assassin Knife -->
-	<item id="222" price="0" /> <!-- Poniard Dagger -->
-	<item id="223" price="0" /> <!-- Kukuri -->
-	<item id="224" price="0" /> <!-- Maingauche -->
-	<item id="225" price="0" /> <!-- Mithril Dagger -->
+	<item id="220" price="0" /> <!-- Crafted Dagger -->
+	<item id="240" price="0" /> <!-- Conjurer's Knife -->
 	<item id="238" price="0" /> <!-- Dagger of Mana -->
 	<item id="239" price="0" /> <!-- Mystic Knife -->
-	<item id="240" price="0" /> <!-- Conjurer's Knife -->
+	<item id="222" price="0" /> <!-- Poniard Dagger -->
 	<item id="241" price="0" /> <!-- Shilen Knife -->
-	<item id="1471" price="0" /> <!-- Silenos Blowgun -->
+	<item id="223" price="0" /> <!-- Kukuri -->
 	<item id="1660" price="0" /> <!-- Cursed Maingauche -->
-	<item id="2507" price="0" /> <!-- Lizardspear -->
-	<item id="4028" price="0" /> <!-- Giant Cannon -->
-	<item id="5127" price="0" /> <!-- Dailaon Knife -->
-	<item id="5128" price="0" /> <!-- Crokian Blade -->
-	<item id="5130" price="0" /> <!-- Nos Sword -->
-	<item id="5131" price="0" /> <!-- Parhit Staff -->
-	<item id="5132" price="0" /> <!-- Giant Trident -->
+	<item id="224" price="0" /> <!-- Maingauche -->
+	<item id="225" price="0" /> <!-- Mithril Dagger -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009013.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009013.xml
index aa02831e23..f3f3c06790 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009013.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009013.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="274" price="0" /> <!-- Reinforced Bow -->
-	<item id="275" price="0" /> <!-- Long Bow -->
-	<item id="276" price="0" /> <!-- Elven Bow -->
 	<item id="277" price="0" /> <!-- Dark Elven Bow -->
+	<item id="276" price="0" /> <!-- Elven Bow -->
+	<item id="275" price="0" /> <!-- Long Bow -->
 	<item id="278" price="0" /> <!-- Gastraphetes -->
 	<item id="279" price="0" /> <!-- Reinforced Long Bow -->
 	<item id="280" price="0" /> <!-- Light Crossbow -->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009015.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009015.xml
index 0c8d284eaf..8d1d221e56 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009015.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009015.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="93" price="0" /> <!-- Winged Spear -->
 	<item id="291" price="0" /> <!-- Trident -->
+	<item id="295" price="0" /> <!-- Dwarven Trident -->
 	<item id="292" price="0" /> <!-- Pike -->
+	<item id="296" price="0" /> <!-- Dwarven Pike -->
 	<item id="293" price="0" /> <!-- War Hammer -->
 	<item id="294" price="0" /> <!-- War Pick -->
-	<item id="295" price="0" /> <!-- Dwarven Trident -->
-	<item id="296" price="0" /> <!-- Dwarven Pike -->
+	<item id="93" price="0" /> <!-- Winged Spear -->
 	<item id="297" price="0" /> <!-- Glaive -->
-	<item id="1376" price="0" /> <!-- Guard Spear -->
-	<item id="1472" price="0" /> <!-- Dreadbane -->
-	<item id="3937" price="0" /> <!-- Giant Bar -->
-	<item id="3938" price="0" /> <!-- Giant Rod -->
-	<item id="3939" price="0" /> <!-- Lady's Fan -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009016.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009016.xml
index 4504f2eca8..b40d300e9e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009016.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009016.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="86" price="0" /> <!-- Tomahawk -->
-	<item id="88" price="0" /> <!-- Morning Star -->
 	<item id="156" price="0" /> <!-- Hand Axe -->
-	<item id="157" price="0" /> <!-- Spiked Club -->
-	<item id="158" price="0" /> <!-- Tarbar -->
-	<item id="159" price="0" /> <!-- Bonebreaker -->
 	<item id="166" price="0" /> <!-- Heavy Mace -->
 	<item id="167" price="0" /> <!-- Scalpel -->
 	<item id="168" price="0" /> <!-- Work Hammer -->
-	<item id="169" price="0" /> <!-- Skull Breaker -->
-	<item id="172" price="0" /> <!-- Heavy Bone Club -->
-	<item id="179" price="0" /> <!-- Mace of Prayer -->
+	<item id="182" price="0" /> <!-- Doom Hammer -->
 	<item id="180" price="0" /> <!-- Mace of Judgment -->
 	<item id="181" price="0" /> <!-- Mace of Miracle -->
-	<item id="182" price="0" /> <!-- Doom Hammer -->
+	<item id="179" price="0" /> <!-- Mace of Prayer -->
+	<item id="86" price="0" /> <!-- Tomahawk -->
+	<item id="7890" price="0" /> <!-- Priest Mace -->
+	<item id="157" price="0" /> <!-- Spiked Club -->
 	<item id="189" price="0" /> <!-- Staff of Life -->
+	<item id="172" price="0" /> <!-- Heavy Bone Club -->
+	<item id="88" price="0" /> <!-- Morning Star -->
+	<item id="169" price="0" /> <!-- Skull Breaker -->
+	<item id="158" price="0" /> <!-- Tarbar -->
+	<item id="159" price="0" /> <!-- Bonebreaker -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009017.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009017.xml
index 9f1f9b8454..1e8b6aa064 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009017.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009017.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="90" price="0" /> <!-- Goat Head Staff -->
 	<item id="178" price="0" /> <!-- Bone Staff -->
-	<item id="183" price="0" /> <!-- Mystic Staff -->
 	<item id="184" price="0" /> <!-- Conjuror's Staff -->
+	<item id="183" price="0" /> <!-- Mystic Staff -->
 	<item id="185" price="0" /> <!-- Staff of Mana -->
 	<item id="186" price="0" /> <!-- Staff of Magic -->
+	<item id="90" price="0" /> <!-- Goat Head Staff -->
 	<item id="187" price="0" /> <!-- Atuba Hammer -->
-	<item id="188" price="0" /> <!-- Ghost Staff -->
 	<item id="190" price="0" /> <!-- Atuba Mace -->
+	<item id="188" price="0" /> <!-- Ghost Staff -->
+	<item id="7896" price="0" /> <!-- Lesser Giant's Hammer -->
+
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009018.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009018.xml
index dabde201a0..cd31996078 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009018.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009018.xml
@@ -1,61 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="72" price="0" /> <!-- Stormbringer -->
-	<item id="73" price="0" /> <!-- Shamshir -->
+	<item id="84" price="0" /> <!-- Homunkulus's Sword -->
+	<item id="145" price="0" /> <!-- Sword of Whispering Death -->
 	<item id="74" price="0" /> <!-- Katana -->
+	<item id="133" price="0" /> <!-- Raid Sword -->
+	<item id="73" price="0" /> <!-- Shamshir -->
+	<item id="131" price="0" /> <!-- Spirit Sword -->
 	<item id="75" price="0" /> <!-- Caliburs -->
 	<item id="76" price="0" /> <!-- Sword of Delusion -->
-	<item id="77" price="0" /> <!-- Tsurugi -->
-	<item id="84" price="0" /> <!-- Homunkulus's Sword -->
-	<item id="131" price="0" /> <!-- Spirit Sword -->
-	<item id="132" price="0" /> <!-- Sword of Limit -->
-	<item id="133" price="0" /> <!-- Raid Sword -->
 	<item id="134" price="0" /> <!-- Sword of Nightmare -->
+	<item id="77" price="0" /> <!-- Tsurugi -->
 	<item id="135" price="0" /> <!-- Samurai Longsword -->
-	<item id="145" price="0" /> <!-- Sword of Whispering Death -->
-	<item id="4681" price="0" /> <!-- Stormbringer - Critical Anger -->
-	<item id="4682" price="0" /> <!-- Stormbringer - Focus -->
-	<item id="4683" price="0" /> <!-- Stormbringer - Light -->
-	<item id="4684" price="0" /> <!-- Shamshir - Guidance -->
-	<item id="4685" price="0" /> <!-- Shamshir - Back Blow -->
-	<item id="4686" price="0" /> <!-- Shamshir - Rsk. Evasion -->
-	<item id="4687" price="0" /> <!-- Katana - Focus -->
-	<item id="4688" price="0" /> <!-- Katana - Critical Damage -->
-	<item id="4689" price="0" /> <!-- Katana - Haste -->
-	<item id="4690" price="0" /> <!-- Spirit Sword - Critical Damage -->
-	<item id="4691" price="0" /> <!-- Spirit Sword - Critical Poison -->
-	<item id="4692" price="0" /> <!-- Spirit Sword - Haste -->
-	<item id="4693" price="0" /> <!-- Raid Sword - Focus -->
-	<item id="4694" price="0" /> <!-- Raid Sword - Critical Drain -->
-	<item id="4695" price="0" /> <!-- Raid Sword - Critical Poison -->
-	<item id="4696" price="0" /> <!-- Caliburs - Guidance -->
-	<item id="4697" price="0" /> <!-- Caliburs - Focus -->
-	<item id="4698" price="0" /> <!-- Caliburs - Critical Damage -->
-	<item id="4699" price="0" /> <!-- Sword of Delusion - Focus -->
-	<item id="4700" price="0" /> <!-- Sword of Delusion - Health -->
-	<item id="4701" price="0" /> <!-- Sword of Delusion - Rsk. Haste -->
-	<item id="4702" price="0" /> <!-- Tsurugi - Focus -->
-	<item id="4703" price="0" /> <!-- Tsurugi - Critical Damage -->
-	<item id="4704" price="0" /> <!-- Tsurugi - Haste -->
-	<item id="4705" price="0" /> <!-- Sword of Nightmare - Health -->
-	<item id="4706" price="0" /> <!-- Sword of Nightmare - Focus -->
-	<item id="4707" price="0" /> <!-- Sword of Nightmare - Light -->
-	<item id="4708" price="0" /> <!-- Samurai Longsword - Focus -->
-	<item id="4709" price="0" /> <!-- Samurai Longsword - Critical Damage -->
-	<item id="4710" price="0" /> <!-- Samurai Longsword - Haste -->
-	<item id="5793" price="0" /> <!-- Tomb Savant A -->
-	<item id="5794" price="0" /> <!-- Tomb Savant B -->
-	<item id="5797" price="0" /> <!-- Tomb Savant A -->
-	<item id="5798" price="0" /> <!-- Tomb Savant B -->
-	<item id="5800" price="0" /> <!-- Nephilim Lord -->
-	<item id="5801" price="0" /> <!-- For NPC (Dusk) -->
-	<item id="6307" price="0" /> <!-- Sword of Limit - Guidance -->
-	<item id="6308" price="0" /> <!-- Sword of Limit - Critical Drain -->
-	<item id="6309" price="0" /> <!-- Sword of Limit - Health -->
-	<item id="6310" price="0" /> <!-- Sword of Whispering Death - Empower -->
-	<item id="6311" price="0" /> <!-- Sword of Whispering Death - M. Atk. -->
-	<item id="6312" price="0" /> <!-- Sword of Whispering Death - Magic Silence -->
-	<item id="6313" price="0" /> <!-- Homunkulus's Sword - Acumen -->
-	<item id="6314" price="0" /> <!-- Homunkulus's Sword - Conversion -->
-	<item id="6315" price="0" /> <!-- Homunkulus's Sword - Magic Paralyze -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009019.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009019.xml
index 84e753eb78..10c758d75d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009019.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009019.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="71" price="0" /> <!-- Flamberge -->
-	<item id="4711" price="0" /> <!-- Flamberge - Critical Damage -->
-	<item id="4712" price="0" /> <!-- Flamberge - Focus -->
-	<item id="4713" price="0" /> <!-- Flamberge - Light -->
+	<item id="7882" price="0" /> <!-- Pa'agrian Sword -->
 	<item id="5286" price="0" /> <!-- Berserker Blade -->
-	<item id="6347" price="0" /> <!-- Berserker Blade - Focus -->
-	<item id="6348" price="0" /> <!-- Berserker Blade - Critical Damage -->
-	<item id="6349" price="0" /> <!-- Berserker Blade - Haste -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009020.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009020.xml
index 2eaeec49f5..8db83494df 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009020.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009020.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="2523" price="0" /> <!-- Saber*Sword of Revolution -->
-	<item id="2524" price="0" /> <!-- Saber*Elven Long Sword -->
-	<item id="2531" price="0" /> <!-- Bastard Sword*Sword of Revolution -->
-	<item id="2532" price="0" /> <!-- Bastard Sword*Elven Long Sword -->
-	<item id="2538" price="0" /> <!-- Spinebone Sword*Sword of Revolution -->
-	<item id="2539" price="0" /> <!-- Spinebone Sword*Elven Long Sword -->
-	<item id="2544" price="0" /> <!-- Artisan's Sword*Sword of Revolution -->
-	<item id="2545" price="0" /> <!-- Artisan's Sword*Elven Long Sword -->
-	<item id="2549" price="0" /> <!-- Knight's Sword*Sword of Revolution -->
-	<item id="2550" price="0" /> <!-- Knight's Sword*Elven Long Sword -->
 	<item id="2551" price="0" /> <!-- Crimson Sword*Crimson Sword -->
 	<item id="2552" price="0" /> <!-- Crimson Sword*Elven Sword -->
-	<item id="2553" price="0" /> <!-- Crimson Sword*Sword of Revolution -->
-	<item id="2554" price="0" /> <!-- Crimson Sword*Elven Long Sword -->
 	<item id="2555" price="0" /> <!-- Elven Sword*Elven Sword -->
+	<item id="2523" price="0" /> <!-- Saber*Sword of Revolution -->
+	<item id="2544" price="0" /> <!-- Artisan's Sword*Sword of Revolution -->
+	<item id="2531" price="0" /> <!-- Bastard Sword*Sword of Revolution -->
+	<item id="2549" price="0" /> <!-- Knight's Sword*Sword of Revolution -->
+	<item id="2538" price="0" /> <!-- Spinebone Sword*Sword of Revolution -->
+	<item id="2524" price="0" /> <!-- Saber*Elven Long Sword -->
+	<item id="2545" price="0" /> <!-- Artisan's Sword*Elven Long Sword -->
+	<item id="2532" price="0" /> <!-- Bastard Sword*Elven Long Sword -->
+	<item id="2553" price="0" /> <!-- Crimson Sword*Sword of Revolution -->
 	<item id="2556" price="0" /> <!-- Elven Sword*Sword of Revolution -->
+	<item id="2550" price="0" /> <!-- Knight's Sword*Elven Long Sword -->
+	<item id="2539" price="0" /> <!-- Spinebone Sword*Elven Long Sword -->
+	<item id="2554" price="0" /> <!-- Crimson Sword*Elven Long Sword -->
 	<item id="2557" price="0" /> <!-- Elven Sword*Elven Long Sword -->
 	<item id="2558" price="0" /> <!-- Sword of Revolution*Sword of Revolution -->
 	<item id="2559" price="0" /> <!-- Sword of Revolution*Elven Long Sword -->
 	<item id="2560" price="0" /> <!-- Elven Long Sword*Elven Long Sword -->
 	<item id="2561" price="0" /> <!-- Stormbringer*Stormbringer -->
-	<item id="2562" price="0" /> <!-- Stormbringer*Shamshir -->
 	<item id="2563" price="0" /> <!-- Stormbringer*Katana -->
-	<item id="2564" price="0" /> <!-- Stormbringer*Spirit Sword -->
 	<item id="2565" price="0" /> <!-- Stormbringer*Raid Sword -->
+	<item id="2562" price="0" /> <!-- Stormbringer*Shamshir -->
+	<item id="2564" price="0" /> <!-- Stormbringer*Spirit Sword -->
 	<item id="2572" price="0" /> <!-- Shamshir*Shamshir -->
 	<item id="2573" price="0" /> <!-- Shamshir*Katana -->
 	<item id="2574" price="0" /> <!-- Shamshir*Spirit Sword -->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009021.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009021.xml
index 54fec1a484..fb4e7715e2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009021.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009021.xml
@@ -1,35 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="226" price="0" /> <!-- Cursed Dagger -->
-	<item id="227" price="0" /> <!-- Stiletto -->
-	<item id="228" price="0" /> <!-- Crystal Dagger -->
-	<item id="230" price="0" /> <!-- Wolverine Needle -->
-	<item id="231" price="0" /> <!-- Grace Dagger -->
-	<item id="232" price="0" /> <!-- Dark Elven Dagger -->
-	<item id="233" price="0" /> <!-- Dark Screamer -->
 	<item id="242" price="0" /> <!-- Soulfire Dirk -->
-	<item id="4759" price="0" /> <!-- Cursed Dagger - Critical Bleed -->
-	<item id="4760" price="0" /> <!-- Cursed Dagger - Critical Poison -->
-	<item id="4761" price="0" /> <!-- Cursed Dagger - Rsk. Haste -->
-	<item id="4762" price="0" /> <!-- Dark Elven Dagger - Focus -->
-	<item id="4763" price="0" /> <!-- Dark Elven Dagger - Back Blow -->
-	<item id="4764" price="0" /> <!-- Dark Elven Dagger - Mortal Strike -->
-	<item id="4765" price="0" /> <!-- Stiletto - Critical Bleed -->
-	<item id="4766" price="0" /> <!-- Stiletto - Critical Poison -->
-	<item id="4767" price="0" /> <!-- Stiletto - Mortal Strike -->
-	<item id="4768" price="0" /> <!-- Grace Dagger - Evasion -->
-	<item id="4769" price="0" /> <!-- Grace Dagger - Focus -->
-	<item id="4770" price="0" /> <!-- Grace Dagger - Back Blow -->
-	<item id="4771" price="0" /> <!-- Dark Screamer - Evasion -->
-	<item id="4772" price="0" /> <!-- Dark Screamer - Focus -->
-	<item id="4773" price="0" /> <!-- Dark Screamer - Critical Bleed -->
-	<item id="4774" price="0" /> <!-- Crystal Dagger - Critical Bleed -->
-	<item id="4775" price="0" /> <!-- Crystal Dagger - Critical Poison -->
-	<item id="4776" price="0" /> <!-- Crystal Dagger - Mortal Strike -->
-	<item id="6356" price="0" /> <!-- Dark Elven Dagger - Rsk. Haste -->
-	<item id="6357" price="0" /> <!-- Stiletto - Rsk. Haste -->
-	<item id="6358" price="0" /> <!-- Crystal Dagger - Critical Damage -->
-	<item id="7810" price="0" /> <!-- Soulfire Dirk - Mana Up -->
-	<item id="7811" price="0" /> <!-- Soulfire Dirk - Magic Hold -->
-	<item id="7812" price="0" /> <!-- Soulfire Dirk - Magic Silence -->
+	<item id="226" price="0" /> <!-- Cursed Dagger -->
+	<item id="232" price="0" /> <!-- Dark Elven Dagger -->
+	<item id="230" price="0" /> <!-- Needle Wolverine -->
+	<item id="227" price="0" /> <!-- Stiletto -->
+	<item id="233" price="0" /> <!-- Dark Screamer -->
+	<item id="231" price="0" /> <!-- Grace Dagger -->
+	<item id="228" price="0" /> <!-- Crystal Dagger -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009022.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009022.xml
index 805b5d0ec0..bdb4a1c912 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009022.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009022.xml
@@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="281" price="0" /> <!-- Crystallized Ice Bow -->
+	<item id="285" price="0" /> <!-- Noble Elven Bow -->
 	<item id="282" price="0" /> <!-- Elemental Bow -->
 	<item id="283" price="0" /> <!-- Akat Long Bow -->
-	<item id="285" price="0" /> <!-- Noble Elven Bow -->
 	<item id="286" price="0" /> <!-- Eminence Bow -->
-	<item id="4810" price="0" /> <!-- Crystallized Ice Bow - Guidance -->
-	<item id="4811" price="0" /> <!-- Crystallized Ice Bow - Evasion -->
-	<item id="4812" price="0" /> <!-- Crystallized Ice Bow - Quick Recovery -->
-	<item id="4813" price="0" /> <!-- Elemental Bow - Guidance -->
-	<item id="4814" price="0" /> <!-- Elemental Bow - Miser -->
-	<item id="4815" price="0" /> <!-- Elemental Bow - Quick Recovery -->
-	<item id="4816" price="0" /> <!-- Noble Elven Bow - Evasion -->
-	<item id="4817" price="0" /> <!-- Noble Elven Bow - Miser -->
-	<item id="4818" price="0" /> <!-- Noble Elven Bow - Cheap Shot -->
-	<item id="4819" price="0" /> <!-- Akat Long Bow - Guidance -->
-	<item id="4820" price="0" /> <!-- Akat Long Bow - Evasion -->
-	<item id="4821" price="0" /> <!-- Akat Long Bow - Miser -->
-	<item id="4822" price="0" /> <!-- Eminence Bow - Guidance -->
-	<item id="4823" price="0" /> <!-- Eminence Bow - Miser -->
-	<item id="4824" price="0" /> <!-- Eminence Bow - Cheap Shot -->
 	<item id="1342" price="0" /> <!-- Steel Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009023.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009023.xml
index f42119d73d..284a32758e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009023.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009023.xml
@@ -1,19 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="263" price="0" /> <!-- Chakram -->
+	<item id="4233" price="0" /> <!-- Fist -->
 	<item id="265" price="0" /> <!-- Fisted Blade -->
 	<item id="266" price="0" /> <!-- Great Pata -->
-	<item id="4233" price="0" /> <!-- Knuckle Duster -->
-	<item id="4789" price="0" /> <!-- Chakram - Critical Drain -->
-	<item id="4790" price="0" /> <!-- Chakram - Critical Poison -->
-	<item id="4791" price="0" /> <!-- Chakram - Rsk. Haste -->
-	<item id="4792" price="0" /> <!-- Fisted Blade - Rsk. Evasion -->
-	<item id="4793" price="0" /> <!-- Fisted Blade - Rsk. Haste -->
-	<item id="4794" price="0" /> <!-- Fisted Blade - Haste -->
-	<item id="4795" price="0" /> <!-- Great Pata - Critical Drain -->
-	<item id="4796" price="0" /> <!-- Great Pata - Critical Poison -->
-	<item id="4797" price="0" /> <!-- Great Pata - Rsk. Haste -->
-	<item id="4798" price="0" /> <!-- Knuckle Duster - Rsk. Evasion -->
-	<item id="4799" price="0" /> <!-- Knuckle Duster - Rsk. Haste -->
-	<item id="4800" price="0" /> <!-- Knuckle Duster - Haste -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009024.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009024.xml
index f88c895bef..8331e91886 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009024.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009024.xml
@@ -1,35 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="302" price="0" /> <!-- Body Slasher -->
+	<item id="298" price="0" /> <!-- Orcish Glaive -->
+	<item id="96" price="0" /> <!-- Scythe -->
 	<item id="94" price="0" /> <!-- Bec de Corbin -->
 	<item id="95" price="0" /> <!-- Poleaxe -->
-	<item id="96" price="0" /> <!-- Scythe -->
-	<item id="298" price="0" /> <!-- Orcish Glaive -->
-	<item id="299" price="0" /> <!-- Orcish Poleaxe -->
 	<item id="301" price="0" /> <!-- Scorpion -->
-	<item id="302" price="0" /> <!-- Body Slasher -->
 	<item id="303" price="0" /> <!-- Widow Maker -->
-	<item id="4834" price="0" /> <!-- Scythe - Anger -->
-	<item id="4835" price="0" /> <!-- Scythe - Critical Stun -->
-	<item id="4836" price="0" /> <!-- Scythe - Light -->
-	<item id="4837" price="0" /> <!-- Orcish Glaive - Anger -->
-	<item id="4838" price="0" /> <!-- Orcish Glaive - Critical Stun -->
-	<item id="4839" price="0" /> <!-- Orcish Glaive - Towering Blow -->
-	<item id="4840" price="0" /> <!-- Body Slasher - Critical Stun -->
-	<item id="4841" price="0" /> <!-- Body Slasher - Towering Blow -->
-	<item id="4842" price="0" /> <!-- Body Slasher - Wide Blow -->
-	<item id="4843" price="0" /> <!-- Bec de Corbin - Critical Stun -->
-	<item id="4844" price="0" /> <!-- Bec de Corbin - Towering Blow -->
-	<item id="4845" price="0" /> <!-- Bec de Corbin - Light -->
-	<item id="4846" price="0" /> <!-- Scorpion - Anger -->
-	<item id="4847" price="0" /> <!-- Scorpion - Critical Stun -->
-	<item id="4848" price="0" /> <!-- Scorpion - Towering Blow -->
-	<item id="4849" price="0" /> <!-- Widow Maker - Critical Stun -->
-	<item id="4850" price="0" /> <!-- Widow Maker - Towering Blow -->
-	<item id="4851" price="0" /> <!-- Widow Maker - Wide Blow -->
-	<item id="4852" price="0" /> <!-- Orcish Poleaxe - Critical Stun -->
-	<item id="4853" price="0" /> <!-- Orcish Poleaxe - Towering Blow -->
-	<item id="4854" price="0" /> <!-- Orcish Poleaxe - Wide Blow -->
-	<item id="7719" price="0" /> <!-- Poleaxe - Critical Stun -->
-	<item id="7720" price="0" /> <!-- Poleaxe - Towering Blow -->
-	<item id="7721" price="0" /> <!-- Poleaxe - Wide Blow -->
+		<item id="299" price="0" /> <!-- Orcish Poleaxe -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009025.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009025.xml
index 16b8eb5eb4..1b7af43055 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009025.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009025.xml
@@ -1,42 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="4734" price="0" /> <!-- Silver Axe - Haste -->
-	<item id="4735" price="0" /> <!-- Skull Graver - Anger -->
-	<item id="4736" price="0" /> <!-- Skull Graver - Health -->
-	<item id="4737" price="0" /> <!-- Skull Graver - Rsk. Focus -->
-	<item id="4738" price="0" /> <!-- Dwarven War Hammer - Anger -->
-	<item id="4739" price="0" /> <!-- Dwarven War Hammer - Health -->
-	<item id="4740" price="0" /> <!-- Dwarven War Hammer - Haste -->
-	<item id="4741" price="0" /> <!-- War Axe - Anger -->
-	<item id="4742" price="0" /> <!-- War Axe - Health -->
-	<item id="4743" price="0" /> <!-- War Axe - Haste -->
-	<item id="4744" price="0" /> <!-- Yaksa Mace - Anger -->
-	<item id="4745" price="0" /> <!-- Yaksa Mace - Health -->
-	<item id="4746" price="0" /> <!-- Yaksa Mace - Rsk. Focus -->
-	<item id="7701" price="0" /> <!-- Stick of Faith - Mana Up -->
-	<item id="7702" price="0" /> <!-- Stick of Faith - Magic Hold -->
-	<item id="7703" price="0" /> <!-- Stick of Faith - Magic Shield -->
-	<item id="7704" price="0" /> <!-- Stick of Eternity - Empower -->
-	<item id="7705" price="0" /> <!-- Stick of Eternity - Rsk. Evasion -->
-	<item id="7706" price="0" /> <!-- Stick of Eternity - Blessed Body -->
-	<item id="7707" price="0" /> <!-- Nirvana Axe - M. Atk. -->
-	<item id="7708" price="0" /> <!-- Nirvana Axe - Magic Poison -->
-	<item id="7709" price="0" /> <!-- Nirvana Axe - Magic Weakness -->
-	<item id="7710" price="0" /> <!-- Club of Nature - Acumen -->
-	<item id="7711" price="0" /> <!-- Club of Nature - Mental Shield -->
-	<item id="7712" price="0" /> <!-- Club of Nature - Magic Hold -->
-	<item id="7713" price="0" /> <!-- Mace of Underworld - Mana Up -->
-	<item id="7714" price="0" /> <!-- Mace of Underworld - Magic Silence -->
-	<item id="7715" price="0" /> <!-- Mace of Underworld - Conversion -->
-	<item id="2503" price="0" /> <!-- Yaksa Mace -->
-	<item id="162" price="0" /> <!-- War Axe -->
-	<item id="202" price="0" /> <!-- Mace of Underworld -->
-	<item id="201" price="0" /> <!-- Club of Nature -->
-	<item id="196" price="0" /> <!-- Stick of Eternity -->
-	<item id="174" price="0" /> <!-- Nirvana Axe -->
-	<item id="2502" price="0" /> <!-- Dwarven War Hammer -->
-	<item id="173" price="0" /> <!-- Skull Graver -->
-	<item id="161" price="0" /> <!-- Silver Axe -->
-	<item id="160" price="0" /> <!-- Battle Axe -->
 	<item id="193" price="0" /> <!-- Stick of Faith -->
+	<item id="160" price="0" /> <!-- Battle Axe -->
+	<item id="89" price="0" /> <!-- Big Hammer -->
+	<item id="161" price="0" /> <!-- Silver Axe -->
+	<item id="173" price="0" /> <!-- Skull Graver -->
+	<item id="201" price="0" /> <!-- Club of Nature -->
+	<item id="202" price="0" /> <!-- Mace of Underworld -->
+	<item id="174" price="0" /> <!-- Nirvana Axe -->
+	<item id="196" price="0" /> <!-- Stick of Eternity -->
+	<item id="2502" price="0" /> <!-- Dwarven War Hammer -->
+	<item id="7891" price="0" /> <!-- Ecliptic Axe -->
+	<item id="162" price="0" /> <!-- War Axe -->
+	<item id="2503" price="0" /> <!-- Yaksa Mace -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009026.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009026.xml
index 92a29f78a2..7f2b66b29d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009026.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009026.xml
@@ -1,28 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="4888" price="0" /> <!-- Deadman's Staff - Magic Regeneration -->
-	<item id="4889" price="0" /> <!-- Deadman's Staff - Mental Shield -->
-	<item id="4890" price="0" /> <!-- Deadman's Staff - Magic Hold -->
-	<item id="4891" price="0" /> <!-- Ghoul's Staff - Rsk. Evasion -->
-	<item id="4892" price="0" /> <!-- Ghoul's Staff - Mana Up -->
-	<item id="4893" price="0" /> <!-- Ghoul's Staff - Blessed Body -->
-	<item id="4894" price="0" /> <!-- Demon's Staff - Magic Poison -->
-	<item id="4895" price="0" /> <!-- Demon's Staff - Magic Weakness -->
-	<item id="4896" price="0" /> <!-- Demon's Staff - Magic Chaos -->
-	<item id="6719" price="0" /> <!-- Monster Only(Ketra Orc Chieftain) -->
-	<item id="7716" price="0" /> <!-- Inferno Staff - Acumen -->
-	<item id="7717" price="0" /> <!-- Inferno Staff - Magic Silence -->
-	<item id="7718" price="0" /> <!-- Inferno Staff - Magic Paralyze -->
-	<item id="197" price="0" /> <!-- Paradia Staff -->
-	<item id="191" price="0" /> <!-- Heavy Doom Hammer -->
 	<item id="192" price="0" /> <!-- Crystal Staff -->
 	<item id="194" price="0" /> <!-- Heavy Doom Axe -->
+	<item id="191" price="0" /> <!-- Heavy Doom Hammer -->
 	<item id="195" price="0" /> <!-- Cursed Staff -->
 	<item id="198" price="0" /> <!-- Inferno Staff -->
-	<item id="199" price="0" /> <!-- Pa'agrian Hammer -->
+	<item id="199" price="0" /> <!-- Pa'agrio Hammer -->
+	<item id="197" price="0" /> <!-- Paradia Staff -->
 	<item id="200" price="0" /> <!-- Sage's Staff -->
-	<item id="203" price="0" /> <!-- Pa'agrian Axe -->
+	<item id="203" price="0" /> <!-- Pa'agrio Axe -->
 	<item id="204" price="0" /> <!-- Deadman's Staff -->
-	<item id="205" price="0" /> <!-- Ghoul's Staff -->
 	<item id="206" price="0" /> <!-- Demon's Staff -->
+	<item id="205" price="0" /> <!-- Ghoul's Staff -->
+	<item id="7898" price="0" /> <!-- Karik Horn -->
+	<item id="7897" price="0" /> <!-- Dwarven Hammer -->
+	
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009027.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009027.xml
index b91a5ce3e5..7baee77f51 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009027.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009027.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="79" price="0" /> <!-- Sword of Damascus -->
-	<item id="142" price="0" /> <!-- Keshanberk -->
-	<item id="146" price="0" /> <!-- Ghoulbane -->
 	<item id="148" price="0" /> <!-- Sword of Valhalla -->
-	<item id="4714" price="0" /> <!-- Keshanberk - Guidance -->
-	<item id="4715" price="0" /> <!-- Keshanberk - Focus -->
-	<item id="4716" price="0" /> <!-- Keshanberk - Back Blow -->
-	<item id="4717" price="0" /> <!-- Sword of Damascus - Focus -->
-	<item id="4718" price="0" /> <!-- Sword of Damascus - Critical Damage -->
-	<item id="4719" price="0" /> <!-- Sword of Damascus - Haste -->
-	<item id="7722" price="0" /> <!-- Sword of Valhalla - Acumen -->
-	<item id="7723" price="0" /> <!-- Sword of Valhalla - Magic Weakness -->
-	<item id="7724" price="0" /> <!-- Sword of Valhalla - Magic Regeneration -->
+	<item id="7889" price="0" /> <!-- Wizard's Tear -->
+	<item id="142" price="0" /> <!-- Keshanberk -->
+	<item id="79" price="0" /> <!-- Damascus -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009028.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009028.xml
index beb50cb0cf..d3590e55aa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009028.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009028.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="78" price="0" /> <!-- Great Sword -->
-	<item id="4723" price="0" /> <!-- Great Sword - Health -->
-	<item id="4724" price="0" /> <!-- Great Sword - Critical Damage -->
-	<item id="4725" price="0" /> <!-- Great Sword - Focus -->
+	<item id="7883" price="0" /> <!-- Guardian's Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009029.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009029.xml
index 2a1130d2ba..9a359fde6d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009029.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009029.xml
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="2566" price="0" /> <!-- Stormbringer*Caliburs -->
-	<item id="2567" price="0" /> <!-- Stormbringer*Sword of Limit -->
 	<item id="2568" price="0" /> <!-- Stormbringer*Sword of Delusion -->
 	<item id="2569" price="0" /> <!-- Stormbringer*Sword of Nightmare -->
 	<item id="2570" price="0" /> <!-- Stormbringer*Tsurugi -->
-	<item id="2571" price="0" /> <!-- Stormbringer*Samurai Long sword -->
-	<item id="2576" price="0" /> <!-- Shamshir*Caliburs -->
-	<item id="2577" price="0" /> <!-- Shamshir*Sword of Limit -->
-	<item id="2578" price="0" /> <!-- Shamshir*Sword of Delusion -->
-	<item id="2579" price="0" /> <!-- Shamshir*Sword of Nightmare -->
-	<item id="2580" price="0" /> <!-- Shamshir*Tsurugi -->
-	<item id="2581" price="0" /> <!-- Shamshir*Samurai Long Sword -->
+	<item id="2567" price="0" /> <!-- Stormbringer*Ultimate Sword -->
 	<item id="2585" price="0" /> <!-- Katana*Caliburs -->
-	<item id="2586" price="0" /> <!-- Katana*Sword of Limit -->
 	<item id="2587" price="0" /> <!-- Katana*Sword of Delusion -->
 	<item id="2588" price="0" /> <!-- Katana*Sword of Nightmare -->
 	<item id="2589" price="0" /> <!-- Katana*Tsurugi -->
-	<item id="2590" price="0" /> <!-- Katana*Samurai Long Sword -->
-	<item id="2593" price="0" /> <!-- Spirit Sword*Caliburs -->
-	<item id="2594" price="0" /> <!-- Spirit Sword*Sword of Limit -->
-	<item id="2595" price="0" /> <!-- Spirit Sword*Sword of Delusion -->
-	<item id="2596" price="0" /> <!-- Spirit Sword*Sword of Nightmare -->
-	<item id="2597" price="0" /> <!-- Spirit Sword*Tsurugi -->
-	<item id="2598" price="0" /> <!-- Spirit Sword*Samurai Long Sword -->
+	<item id="2586" price="0" /> <!-- Katana*Ultimate Sword -->
 	<item id="2600" price="0" /> <!-- Raid Sword*Caliburs -->
-	<item id="2601" price="0" /> <!-- Raid Sword*Sword of Limit -->
 	<item id="2602" price="0" /> <!-- Raid Sword*Sword of Delusion -->
 	<item id="2603" price="0" /> <!-- Raid Sword*Sword of Nightmare -->
 	<item id="2604" price="0" /> <!-- Raid Sword*Tsurugi -->
-	<item id="2605" price="0" /> <!-- Raid Sword*Samurai Long Sword -->
+	<item id="2601" price="0" /> <!-- Raid Sword*Ultimate Sword -->
+	<item id="2576" price="0" /> <!-- Shamshir*Caliburs -->
+	<item id="2578" price="0" /> <!-- Shamshir*Sword of Delusion -->
+	<item id="2579" price="0" /> <!-- Shamshir*Sword of Nightmare -->
+	<item id="2580" price="0" /> <!-- Shamshir*Tsurugi -->
+	<item id="2577" price="0" /> <!-- Shamshir*Ultimate Sword -->
+	<item id="2593" price="0" /> <!-- Spirit Sword*Caliburs -->
+	<item id="2595" price="0" /> <!-- Spirit Sword*Sword of Delusion -->
+	<item id="2596" price="0" /> <!-- Spirit Sword*Sword of Nightmare -->
+	<item id="2597" price="0" /> <!-- Spirit Sword*Tsurugi -->
+	<item id="2594" price="0" /> <!-- Spirit Sword*Ultimate Sword -->
 	<item id="2606" price="0" /> <!-- Caliburs*Caliburs -->
-	<item id="2607" price="0" /> <!-- Caliburs*Sword of Limit -->
 	<item id="2608" price="0" /> <!-- Caliburs*Sword of Delusion -->
 	<item id="2609" price="0" /> <!-- Caliburs*Sword of Nightmare -->
 	<item id="2610" price="0" /> <!-- Caliburs*Tsurugi -->
-	<item id="2611" price="0" /> <!-- Caliburs*Samurai Long Sword -->
-	<item id="2612" price="0" /> <!-- Sword of Limit*Sword of Limit -->
-	<item id="2613" price="0" /> <!-- Sword of Limit*Sword of Delusion -->
-	<item id="2614" price="0" /> <!-- Sword of Limit*Sword of Nightmare -->
-	<item id="2615" price="0" /> <!-- Sword of Limit*Tsurugi -->
-	<item id="2616" price="0" /> <!-- Sword of Limit*Samurai Long Sword -->
+	<item id="2607" price="0" /> <!-- Caliburs*Ultimate Sword -->
+	<item id="2571" price="0" /> <!-- Stormbringer*Samurai Long sword -->
 	<item id="2617" price="0" /> <!-- Sword of Delusion*Sword of Delusion -->
 	<item id="2618" price="0" /> <!-- Sword of Delusion*Sword of Nightmare -->
 	<item id="2619" price="0" /> <!-- Sword of Delusion*Tsurugi -->
-	<item id="2620" price="0" /> <!-- Sword of Delusion*Samurai Long Sword -->
 	<item id="2621" price="0" /> <!-- Sword of Nightmare*Sword of Nightmare -->
 	<item id="2622" price="0" /> <!-- Sword of Nightmare*Tsurugi -->
-	<item id="2623" price="0" /> <!-- Sword of Nightmare*Samurai Long Sword -->
 	<item id="2624" price="0" /> <!-- Tsurugi*Tsurugi -->
+	<item id="2613" price="0" /> <!-- Ultimate Sword*Sword of Delusion -->
+	<item id="2614" price="0" /> <!-- Ultimate Sword*Sword of Nightmare -->
+	<item id="2615" price="0" /> <!-- Ultimate Sword*Tsurugi -->
+	<item id="2612" price="0" /> <!-- Ultimate Sword*Ultimate Sword -->
+	<item id="2590" price="0" /> <!-- Katana*Samurai Long Sword -->
+	<item id="2605" price="0" /> <!-- Raid Sword*Samurai Long Sword -->
+	<item id="2581" price="0" /> <!-- Shamshir*Samurai Long Sword -->
+	<item id="2598" price="0" /> <!-- Spirit Sword*Samurai Long Sword -->
+	<item id="2611" price="0" /> <!-- Caliburs*Samurai Long Sword -->
+	<item id="2620" price="0" /> <!-- Sword of Delusion*Samurai Long Sword -->
+	<item id="2623" price="0" /> <!-- Sword of Nightmare*Samurai Long Sword -->
 	<item id="2625" price="0" /> <!-- Tsurugi*Samurai Long Sword -->
+	<item id="2616" price="0" /> <!-- Ultimate Sword*Samurai Long Sword -->
 	<item id="2626" price="0" /> <!-- Samurai Long Sword*Samurai Long Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009030.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009030.xml
index 7091db8fe2..5cb950a512 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009030.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009030.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="243" price="0" /> <!-- Twilight Knife -->
 	<item id="229" price="0" /> <!-- Kris -->
 	<item id="234" price="0" /> <!-- Demon's Dagger -->
-	<item id="243" price="0" /> <!-- Hell Knife -->
-	<item id="4777" price="0" /> <!-- Kris - Evasion -->
-	<item id="4778" price="0" /> <!-- Kris - Focus -->
-	<item id="4779" price="0" /> <!-- Kris - Back Blow -->
-	<item id="4780" price="0" /> <!-- Demon's Dagger - Critical Bleed -->
-	<item id="4781" price="0" /> <!-- Demon's Dagger - Critical Poison -->
-	<item id="4782" price="0" /> <!-- Demon's Dagger - Mortal Strike -->
-	<item id="6359" price="0" /> <!-- Demon's Dagger - Critical Damage -->
-	<item id="7813" price="0" /> <!-- Hell Knife - Magic Regeneration -->
-	<item id="7814" price="0" /> <!-- Hell Knife - Mental Shield -->
-	<item id="7815" price="0" /> <!-- Hell Knife - Magic Weakness -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009031.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009031.xml
index 59b2b47721..b8396f074d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009031.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009031.xml
@@ -2,11 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="284" price="0" /> <!-- Dark Elven Long Bow -->
 	<item id="287" price="0" /> <!-- Bow of Peril -->
-	<item id="4825" price="0" /> <!-- Dark Elven Long Bow - Evasion -->
-	<item id="4826" price="0" /> <!-- Dark Elven Long Bow - Critical Bleed -->
-	<item id="4827" price="0" /> <!-- Dark Elven Long Bow - Miser -->
-	<item id="4828" price="0" /> <!-- Bow of Peril - Guidance -->
-	<item id="4829" price="0" /> <!-- Bow of Peril - Quick Recovery -->
-	<item id="4830" price="0" /> <!-- Bow of Peril - Cheap Shot -->
 	<item id="1343" price="0" /> <!-- Silver Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009032.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009032.xml
index 21f0642b74..54e6fcccb0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009032.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009032.xml
@@ -3,10 +3,4 @@
 	<item id="264" price="0" /> <!-- Pata -->
 	<item id="267" price="0" /> <!-- Arthro Nail -->
 	<item id="268" price="0" /> <!-- Bellion Cestus -->
-	<item id="4801" price="0" /> <!-- Arthro Nail - Critical Poison -->
-	<item id="4802" price="0" /> <!-- Arthro Nail - Rsk. Evasion -->
-	<item id="4803" price="0" /> <!-- Arthro Nail - Rsk. Haste -->
-	<item id="4804" price="0" /> <!-- Bellion Cestus - Critical Drain -->
-	<item id="4805" price="0" /> <!-- Bellion Cestus - Critical Poison -->
-	<item id="4806" price="0" /> <!-- Bellion Cestus - Rsk. Haste -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009033.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009033.xml
index 4436abf60d..28396bb47c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009033.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009033.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="97" price="0" /> <!-- Lance -->
 	<item id="300" price="0" /> <!-- Great Axe -->
-	<item id="4855" price="0" /> <!-- Great Axe - Anger -->
-	<item id="4856" price="0" /> <!-- Great Axe - Critical Stun -->
-	<item id="4857" price="0" /> <!-- Great Axe - Light -->
-	<item id="4858" price="0" /> <!-- Lance - Anger -->
-	<item id="4859" price="0" /> <!-- Lance - Critical Stun -->
-	<item id="4860" price="0" /> <!-- Lance - Towering Blow -->
+	<item id="97" price="0" /> <!-- Lance -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009034.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009034.xml
index af7e439f8f..a796f66e26 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009034.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009034.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="7892" price="0" /> <!-- Spell Breaker -->
+	<item id="7893" price="0" /> <!-- Heavy War Axe -->
 	<item id="91" price="0" /> <!-- Heavy War Axe -->
-	<item id="171" price="0" /> <!-- Deadman's Glory -->
 	<item id="175" price="0" /> <!-- Art of Battle Axe -->
-	<item id="4747" price="0" /> <!-- Heavy War Axe - Anger -->
-	<item id="4748" price="0" /> <!-- Heavy War Axe - Health -->
-	<item id="4749" price="0" /> <!-- Heavy War Axe - Rsk. Focus -->
-	<item id="4750" price="0" /> <!-- Deadman's Glory - Anger -->
-	<item id="4751" price="0" /> <!-- Deadman's Glory - Health -->
-	<item id="4752" price="0" /> <!-- Deadman's Glory - Haste -->
-	<item id="4753" price="0" /> <!-- Art of Battle Axe - Health -->
-	<item id="4754" price="0" /> <!-- Art of Battle Axe - Rsk. Focus -->
-	<item id="4755" price="0" /> <!-- Art of Battle Axe - Haste -->
+	<item id="171" price="0" /> <!-- Deadman's Glory -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009035.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009035.xml
index 9a3a663a08..a944156b69 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009035.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009035.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="92" price="0" /> <!-- Sprite's Staff -->
-	<item id="207" price="0" /> <!-- Staff of Phantom -->
-	<item id="208" price="0" /> <!-- Staff of Seal -->
-	<item id="209" price="0" /> <!-- Divine Staff -->
+	<item id="92" price="0" /> <!-- Spirit's Staff -->
 	<item id="210" price="0" /> <!-- Staff of Evil Spirits -->
-	<item id="211" price="0" /> <!-- Staff of Nobility -->
-	<item id="4897" price="0" /> <!-- Sprite's Staff - Magic Regeneration -->
-	<item id="4898" price="0" /> <!-- Sprite's Staff - Mental Shield -->
-	<item id="4899" price="0" /> <!-- Sprite's Staff - Magic Hold -->
-	<item id="4900" price="0" /> <!-- Staff of Evil Spirits - Magic Focus -->
-	<item id="4901" price="0" /> <!-- Staff of Evil Spirits - Blessed Body -->
-	<item id="4902" price="0" /> <!-- Staff of Evil Spirits - Magic Poison -->
+	<item id="7900" price="0" /> <!-- Ice Storm Hammer -->
+	<item id="7901" price="0" /> <!-- Star Buster -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009036.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009036.xml
index 16780d3c54..afaf036a1b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009036.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009036.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="80" price="0" /> <!-- Tallum Blade -->
 	<item id="150" price="0" /> <!-- Elemental Sword -->
 	<item id="151" price="0" /> <!-- Sword of Miracles -->
+	<item id="8686" price="0" /> <!-- Themis' Tongue -->
+	<item id="80" price="0" /> <!-- Tallum Blade -->
 	<item id="2500" price="0" /> <!-- Dark Legion's Edge -->
-	<item id="5635" price="0" /> <!-- Tallum Blade - Critical Poison -->
-	<item id="5636" price="0" /> <!-- Tallum Blade - Haste -->
-	<item id="5637" price="0" /> <!-- Tallum Blade - Anger -->
-	<item id="5638" price="0" /> <!-- Elemental Sword - M. Atk. -->
-	<item id="5639" price="0" /> <!-- Elemental Sword - Magic Paralyze -->
-	<item id="5640" price="0" /> <!-- Elemental Sword - Empower -->
-	<item id="5641" price="0" /> <!-- Sword of Miracles - M. Atk. -->
-	<item id="5642" price="0" /> <!-- Sword of Miracles - Magic Silence -->
-	<item id="5643" price="0" /> <!-- Sword of Miracles - Acumen -->
-	<item id="5647" price="0" /> <!-- Dark Legion's Edge - Critical Damage -->
-	<item id="5648" price="0" /> <!-- Dark Legion's Edge - Health -->
-	<item id="5649" price="0" /> <!-- Dark Legion's Edge - Rsk. Focus -->
+	<item id="8678" price="0" /> <!-- Sirra's Blade -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009037.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009037.xml
index 976bc711b4..251a892ef6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009037.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009037.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="7884" price="0" /> <!-- Infernal Master -->
 	<item id="81" price="0" /> <!-- Dragon Slayer -->
-	<item id="5644" price="0" /> <!-- Dragon Slayer - Health -->
-	<item id="5645" price="0" /> <!-- Dragon Slayer - Critical Bleed -->
-	<item id="5646" price="0" /> <!-- Dragon Slayer - Critical Drain -->
+	<item id="8679" price="0" /> <!-- Sword of Ipos -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009038.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009038.xml
index 61016de041..d506a12075 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009038.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009038.xml
@@ -3,4 +3,5 @@
 	<item id="5233" price="0" /> <!-- Keshanberk*Keshanberk -->
 	<item id="5705" price="0" /> <!-- Keshanberk*Damascus -->
 	<item id="5706" price="0" /> <!-- Damascus*Damascus -->
+	<item id="8938" price="0" /> <!-- Tallum Blade*Damascus -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009039.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009039.xml
index 936abc1f93..cff29e0e50 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009039.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009039.xml
@@ -2,10 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="235" price="0" /> <!-- Bloody Orchid -->
 	<item id="236" price="0" /> <!-- Soul Separator -->
-	<item id="5614" price="0" /> <!-- Bloody Orchid - Focus -->
-	<item id="5615" price="0" /> <!-- Bloody Orchid - Back Blow -->
-	<item id="5616" price="0" /> <!-- Bloody Orchid - Critical Bleed -->
-	<item id="5617" price="0" /> <!-- Soul Separator - Guidance -->
-	<item id="5618" price="0" /> <!-- Soul Separator - Critical Damage -->
-	<item id="5619" price="0" /> <!-- Soul Separator - Rsk. Haste -->
+	<item id="8682" price="0" /> <!-- Naga Storm -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009040.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009040.xml
index 9afb32b628..9e31151cb3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009040.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009040.xml
@@ -2,11 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="288" price="0" /> <!-- Carnage Bow -->
 	<item id="289" price="0" /> <!-- Soul Bow -->
-	<item id="5608" price="0" /> <!-- Carnage Bow - Light -->
-	<item id="5609" price="0" /> <!-- Carnage Bow - Critical Bleed -->
-	<item id="5610" price="0" /> <!-- Carnage Bow - Mana Up -->
-	<item id="5611" price="0" /> <!-- Soul Bow - Cheap Shot -->
-	<item id="5612" price="0" /> <!-- Soul Bow - Quick Recovery -->
-	<item id="5613" price="0" /> <!-- Soul Bow - Critical Poison -->
+	<item id="8684" price="0" /> <!-- Shyeed's Bow -->
 	<item id="1344" price="0" /> <!-- Mithril Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009041.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009041.xml
index 212c87c360..bffdcb5bad 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009041.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009041.xml
@@ -2,10 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="269" price="0" /> <!-- Blood Tornado -->
 	<item id="270" price="0" /> <!-- Dragon Grinder -->
-	<item id="5620" price="0" /> <!-- Blood Tornado - Haste -->
-	<item id="5621" price="0" /> <!-- Blood Tornado - Focus -->
-	<item id="5622" price="0" /> <!-- Blood Tornado - Anger -->
-	<item id="5623" price="0" /> <!-- Dragon Grinder - Rsk. Evasion -->
-	<item id="5624" price="0" /> <!-- Dragon Grinder - Guidance -->
-	<item id="5625" price="0" /> <!-- Dragon Grinder - Health -->
+	<item id="8685" price="0" /> <!-- Sobekk's Hurricane -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009042.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009042.xml
index 00cd3c9b01..e2c6094470 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009042.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009042.xml
@@ -2,10 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="98" price="0" /> <!-- Halberd -->
 	<item id="305" price="0" /> <!-- Tallum Glaive -->
-	<item id="5626" price="0" /> <!-- Halberd - Haste -->
-	<item id="5627" price="0" /> <!-- Halberd - Critical Stun -->
-	<item id="5628" price="0" /> <!-- Halberd - Wide Blow -->
-	<item id="5632" price="0" /> <!-- Tallum Glaive - Guidance -->
-	<item id="5633" price="0" /> <!-- Tallum Glaive - Health -->
-	<item id="5634" price="0" /> <!-- Tallum Glaive - Wide Blow -->
+	<item id="8683" price="0" /> <!-- Tiphon's Spear -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009043.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009043.xml
index cd682a1050..4e6e460fa4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009043.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009043.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="164" price="0" /> <!-- Elysian -->
+	<item id="7894" price="0" /> <!-- Spiritual Eye -->
+	<item id="7895" price="0" /> <!-- Flaming Dragon Skull -->
+	<item id="8687" price="0" /> <!-- Cabrio's Hand -->
 	<item id="2504" price="0" /> <!-- Meteor Shower -->
-	<item id="5599" price="0" /> <!-- Meteor Shower - Focus -->
-	<item id="5600" price="0" /> <!-- Meteor Shower - Critical Bleed -->
-	<item id="5601" price="0" /> <!-- Meteor Shower - Rsk. Haste -->
-	<item id="5602" price="0" /> <!-- Elysian - Health -->
-	<item id="5603" price="0" /> <!-- Elysian - Anger -->
-	<item id="5604" price="0" /> <!-- Elysian - Critical Drain -->
+	<item id="164" price="0" /> <!-- Elysian -->
+	<item id="8680" price="0" /> <!-- Barakiel's Axe -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009044.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009044.xml
index cc016bc43f..db90303038 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009044.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009044.xml
@@ -2,10 +2,8 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="212" price="0" /> <!-- Dasparion's Staff -->
 	<item id="213" price="0" /> <!-- Branch of the Mother Tree -->
-	<item id="5596" price="0" /> <!-- Dasparion's Staff - Mana Up -->
-	<item id="5597" price="0" /> <!-- Dasparion's Staff - Conversion -->
-	<item id="5598" price="0" /> <!-- Dasparion's Staff - Acumen -->
-	<item id="5605" price="0" /> <!-- Branch of the Mother Tree - Conversion -->
-	<item id="5606" price="0" /> <!-- Branch of the Mother Tree - Magic Damage -->
-	<item id="5607" price="0" /> <!-- Branch of the Mother Tree - Acumen -->
+	<item id="8688" price="0" /> <!-- Daimon Crystal -->
+	<item id="7899" price="0" /> <!-- Destroyer Hammer -->
+	<item id="7902" price="0" /> <!-- Doom Crusher -->
+	<item id="8681" price="0" /> <!-- Behemoth' Tuning Fork -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009952.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009952.xml
index 6808fcb188..6e9272f38b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009952.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009952.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="47" price="0" /> <!-- Helmet -->
 	<item id="58" price="0" /> <!-- Mithril Breastplate -->
 	<item id="59" price="0" /> <!-- Mithril Gaiters -->
-	<item id="47" price="0" /> <!-- Helmet -->
 	<item id="628" price="0" /> <!-- Hoplon -->
+	<item id="2411" price="0" /> <!-- Brigandine Helmet -->
 	<item id="352" price="0" /> <!-- Brigandine Tunic -->
 	<item id="2378" price="0" /> <!-- Brigandine Gaiters -->
-	<item id="2411" price="0" /> <!-- Brigandine Helmet -->
 	<item id="2493" price="0" /> <!-- Brigandine Shield -->
 	<item id="394" price="0" /> <!-- Reinforced Leather Shirt -->
 	<item id="416" price="0" /> <!-- Reinforced Leather Gaiters -->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009953.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009953.xml
index ae5cd7af7a..5f710ac332 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009953.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009953.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="60" price="0" /> <!-- Composite Armor -->
 	<item id="517" price="0" /> <!-- Composite Helmet -->
+	<item id="60" price="0" /> <!-- Composite Armor -->
 	<item id="64" price="0" /> <!-- Composite Boots -->
 	<item id="107" price="0" /> <!-- Composite Shield -->
 	<item id="354" price="0" /> <!-- Chain Mail Shirt -->
@@ -10,8 +10,8 @@
 	<item id="2453" price="0" /> <!-- Chain Gloves -->
 	<item id="2429" price="0" /> <!-- Chain Boots -->
 	<item id="2495" price="0" /> <!-- Chain Shield -->
-	<item id="356" price="0" /> <!-- Full Plate Armor -->
 	<item id="2414" price="0" /> <!-- Full Plate Helmet -->
+	<item id="356" price="0" /> <!-- Full Plate Armor -->
 	<item id="2462" price="0" /> <!-- Full Plate Gauntlets -->
 	<item id="2438" price="0" /> <!-- Full Plate Boots -->
 	<item id="2497" price="0" /> <!-- Full Plate Shield -->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009954.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009954.xml
index 1e75b92bfa..ad4d8e754a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009954.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009954.xml
@@ -1,61 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="357" price="0" /> <!-- Zubei's Breastplate -->
-	<item id="383" price="0" /> <!-- Zubei's Gaiters -->
 	<item id="503" price="0" /> <!-- Zubei's Helmet -->
+	<item id="357" price="0" /> <!-- Zubei's Breastplate - Heavy Armor -->
+	<item id="383" price="0" /> <!-- Zubei's Gaiters - Heavy Armor -->
 	<item id="5710" price="0" /> <!-- Zubei's Gauntlets - Heavy Armor -->
 	<item id="5726" price="0" /> <!-- Zubei's Boots - Heavy Armor -->
-	<item id="633" price="0" /> <!-- Zubei's Shield -->
-	<item id="358" price="0" /> <!-- Blue Wolf Breastplate -->
-	<item id="2380" price="0" /> <!-- Blue Wolf Gaiters -->
-	<item id="2416" price="0" /> <!-- Blue Wolf Helmet -->
-	<item id="5718" price="0" /> <!-- Blue Wolf Gloves - Heavy Armor -->
-	<item id="5734" price="0" /> <!-- Blue Wolf Boots - Heavy Armor -->
-	<item id="2376" price="0" /> <!-- Avadon Breastplate -->
-	<item id="2379" price="0" /> <!-- Avadon Gaiters -->
-	<item id="2415" price="0" /> <!-- Avadon Circlet -->
-	<item id="5714" price="0" /> <!-- Avadon Gloves - Heavy Armor -->
-	<item id="5730" price="0" /> <!-- Avadon Boots - Heavy Armor -->
-	<item id="673" price="0" /> <!-- Avadon Shield -->
-	<item id="2381" price="0" /> <!-- Doom Plate Armor -->
-	<item id="2417" price="0" /> <!-- Doom Helmet -->
-	<item id="5722" price="0" /> <!-- Doom Gloves - Heavy Armor -->
-	<item id="5738" price="0" /> <!-- Doom Boots - Heavy Armor -->
-	<item id="110" price="0" /> <!-- Doom Shield -->
-	<item id="2384" price="0" /> <!-- Zubei's Leather Shirt -->
-	<item id="2388" price="0" /> <!-- Zubei's Leather Gaiters -->
+	<item id="633" price="0" /> <!-- Zubei's Shield - Heavy Armor -->
+	<item id="2384" price="0" /> <!-- Zubei's Leather Shirt - Light Armor -->
+	<item id="2388" price="0" /> <!-- Zubei's Leather Gaiters - Light Armor -->
 	<item id="5711" price="0" /> <!-- Zubei's Gauntlets - Light Armor -->
 	<item id="5727" price="0" /> <!-- Zubei's Boots - Light Armor -->
-	<item id="2390" price="0" /> <!-- Avadon Leather Armor -->
-	<item id="5715" price="0" /> <!-- Avadon Gloves - Light Armor -->
-	<item id="5731" price="0" /> <!-- Avadon Boots - Light Armor -->
-	<item id="2391" price="0" /> <!-- Blue Wolf Leather Armor -->
+	<item id="2397" price="0" /> <!-- Tunic of Zubei - Robe Armor -->
+	<item id="2402" price="0" /> <!-- Stockings of Zubei - Robe Armor -->
+	<item id="5712" price="0" /> <!-- Zubei's Gauntlets - Robe Armor -->
+	<item id="5728" price="0" /> <!-- Zubei's Boots - Robe Armor -->
+	<item id="2416" price="0" /> <!-- Blue Wolf Helmet -->
+	<item id="358" price="0" /> <!-- Blue Wolf Breastplate - Heavy Armor -->
+	<item id="2380" price="0" /> <!-- Blue Wolf Gaiters - Heavy Armor -->
+	<item id="5718" price="0" /> <!-- Blue Wolf Gloves - Heavy Armor -->
+	<item id="5734" price="0" /> <!-- Blue Wolf Boots - Heavy Armor -->
+	<item id="2391" price="0" /> <!-- Blue Wolf Leather Armor - Light Armor -->
 	<item id="5719" price="0" /> <!-- Blue Wolf Gloves - Light Armor -->
 	<item id="5735" price="0" /> <!-- Blue Wolf Boots - Light Armor -->
-	<item id="2392" price="0" /> <!-- Leather Armor of Doom -->
+	<item id="2398" price="0" /> <!-- Blue Wolf Tunic - Robe Armor -->
+	<item id="2403" price="0" /> <!-- Blue Wolf Stockings - Robe Armor -->
+	<item id="5720" price="0" /> <!-- Blue Wolf Gloves - Robe Armor -->
+	<item id="5736" price="0" /> <!-- Blue Wolf Boots - Robe Armor -->
+	<item id="2415" price="0" /> <!-- Avadon Circlet -->
+	<item id="2376" price="0" /> <!-- Avadon Breastplate - Heavy Armor -->
+	<item id="2379" price="0" /> <!-- Avadon Gaiters - Heavy Armor -->
+	<item id="5714" price="0" /> <!-- Avadon Gloves - Heavy Armor -->
+	<item id="5730" price="0" /> <!-- Avadon Boots - Heavy Armor -->
+	<item id="673" price="0" /> <!-- Avadon Shield - Heavy Armor -->
+	<item id="2390" price="0" /> <!-- Avadon Leather Armor - Light Armor -->
+	<item id="5715" price="0" /> <!-- Avadon Gloves - Light Armor -->
+	<item id="5731" price="0" /> <!-- Avadon Boots - Light Armor -->
+	<item id="2406" price="0" /> <!-- Avadon Robe Armor - Robe Armor -->
+	<item id="5716" price="0" /> <!-- Avadon Gloves - Robe Armor -->
+	<item id="5732" price="0" /> <!-- Avadon Boots - Robe Armor -->
+	<item id="2381" price="0" /> <!-- Doom Plate Armor -->
+	<item id="2381" price="0" /> <!-- Doom Plate Armor - Heavy Armor -->
+	<item id="5722" price="0" /> <!-- Doom Gloves - Heavy Armor -->
+	<item id="5738" price="0" /> <!-- Doom Boots - Heavy Armor -->
+	<item id="110" price="0" /> <!-- Doom Shield - Heavy Armor -->
+	<item id="2392" price="0" /> <!-- Leather Armor of Doom - Light Armor -->
 	<item id="5723" price="0" /> <!-- Doom Gloves - Light Armor -->
 	<item id="5739" price="0" /> <!-- Doom Boots - Light Armor -->
-	<item id="2397" price="0" /> <!-- Tunic of Zubei -->
-	<item id="2402" price="0" /> <!-- Stockings of Zubei -->
-	<item id="5712" price="0" /> <!-- Zubei's Gauntlets - Robe -->
-	<item id="5728" price="0" /> <!-- Zubei's Boots - Robe -->
-	<item id="2398" price="0" /> <!-- Blue Wolf Tunic -->
-	<item id="2403" price="0" /> <!-- Blue Wolf Stockings -->
-	<item id="5720" price="0" /> <!-- Blue Wolf Gloves - Robe -->
-	<item id="5736" price="0" /> <!-- Blue Wolf Boots - Robe -->
-	<item id="2399" price="0" /> <!-- Tunic of Doom -->
-	<item id="2404" price="0" /> <!-- Stockings of Doom -->
-	<item id="5724" price="0" /> <!-- Doom Gloves - Robe -->
-	<item id="5740" price="0" /> <!-- Doom Boots - Robe -->
-	<item id="2406" price="0" /> <!-- Avadon Robe -->
-	<item id="5716" price="0" /> <!-- Avadon Gloves - Robe -->
-	<item id="5732" price="0" /> <!-- Avadon Boots - Robe -->
-	<item id="554" price="0" /> <!-- Sealed Zubei's Boots -->
-	<item id="612" price="0" /> <!-- Sealed Zubei's Gauntlets -->
-	<item id="2439" price="0" /> <!-- Sealed Blue Wolf Boots -->
-	<item id="2487" price="0" /> <!-- Sealed Blue Wolf Gloves -->
-	<item id="600" price="0" /> <!-- Sealed Avadon Boots -->
-	<item id="2464" price="0" /> <!-- Sealed Avadon Gloves -->
-	<item id="601" price="0" /> <!-- Sealed Doom Boots -->
-	<item id="2475" price="0" /> <!-- Sealed Doom Gloves -->
+	<item id="2399" price="0" /> <!-- Tunic of Doom - Robe Armor -->
+	<item id="2404" price="0" /> <!-- Stockings of Doom - Robe Armor -->
+	<item id="5724" price="0" /> <!-- Doom Gloves - Robe Armor -->
+	<item id="5740" price="0" /> <!-- Doom Boots - Robe Armor -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009955.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009955.xml
index 32c33c4339..48b014aacf 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009955.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009955.xml
@@ -1,77 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="365" price="0" /> <!-- Dark Crystal Breastplate -->
-	<item id="388" price="0" /> <!-- Dark Crystal Gaiters -->
 	<item id="512" price="0" /> <!-- Dark Crystal Helmet -->
+	<item id="365" price="0" /> <!-- Dark Crystal Breastplate - Heavy Armor -->
+	<item id="388" price="0" /> <!-- Dark Crystal Gaiters - Heavy Armor -->
 	<item id="5765" price="0" /> <!-- Dark Crystal Gloves - Heavy Armor -->
 	<item id="5777" price="0" /> <!-- Dark Crystal Boots - Heavy Armor -->
-	<item id="641" price="0" /> <!-- Dark Crystal Shield -->
-	<item id="2382" price="0" /> <!-- Tallum Plate Armor -->
-	<item id="547" price="0" /> <!-- Tallum Helm -->
-	<item id="5768" price="0" /> <!-- Tallum Gloves - Heavy Armor -->
-	<item id="5780" price="0" /> <!-- Tallum Boots - Heavy Armor -->
-	<item id="2385" price="0" /> <!-- Dark Crystal Leather Armor -->
-	<item id="2389" price="0" /> <!-- Dark Crystal Leggings -->
+	<item id="641" price="0" /> <!-- Dark Crystal Shield - Heavy Armor -->
+	<item id="2385" price="0" /> <!-- Dark Crystal Leather Armor - Light Armor -->
+	<item id="2389" price="0" /> <!-- Dark Crystal Leggings - Light Armor -->
 	<item id="5766" price="0" /> <!-- Dark Crystal Gloves - Light Armor -->
 	<item id="5778" price="0" /> <!-- Dark Crystal Boots - Light Armor -->
-	<item id="2393" price="0" /> <!-- Tallum Leather Armor -->
+	<item id="2407" price="0" /> <!-- Dark Crystal Robe Armor - Robe Armor -->
+	<item id="5767" price="0" /> <!-- Dark Crystal Gloves - Robe Armor -->
+	<item id="5779" price="0" /> <!-- Dark Crystal Boots - Robe Armor -->
+	<item id="547" price="0" /> <!-- Tallum Helm -->
+	<item id="2382" price="0" /> <!-- Tallum Plate Armor - Heavy Armor -->
+	<item id="5768" price="0" /> <!-- Tallum Gloves - Heavy Armor -->
+	<item id="5780" price="0" /> <!-- Tallum Boots - Heavy Armor -->
+	<item id="2393" price="0" /> <!-- Tallum Leather Armor - Light Armor -->
 	<item id="5769" price="0" /> <!-- Tallum Gloves - Light Armor -->
 	<item id="5781" price="0" /> <!-- Tallum Boots - Light Armor -->
-	<item id="2400" price="0" /> <!-- Tallum Tunic -->
-	<item id="2405" price="0" /> <!-- Tallum Stockings -->
-	<item id="5770" price="0" /> <!-- Tallum Gloves - Robe -->
-	<item id="5782" price="0" /> <!-- Tallum Boots - Robe -->
-	<item id="2407" price="0" /> <!-- Dark Crystal Robe -->
-	<item id="5767" price="0" /> <!-- Dark Crystal Gloves - Robe -->
-	<item id="5779" price="0" /> <!-- Dark Crystal Boots - Robe -->
-	<item id="374" price="0" /> <!-- Armor of Nightmare -->
+	<item id="2400" price="0" /> <!-- Tallum Tunic - Robe Armor -->
+	<item id="2405" price="0" /> <!-- Tallum Stockings - Robe Armor -->
+	<item id="5770" price="0" /> <!-- Tallum Gloves - Robe Armor -->
+	<item id="5782" price="0" /> <!-- Tallum Boots - Robe Armor -->
 	<item id="2418" price="0" /> <!-- Helm of Nightmare -->
+	<item id="374" price="0" /> <!-- Armor of Nightmare - Heavy Armor -->
 	<item id="5771" price="0" /> <!-- Gauntlets of Nightmare - Heavy Armor -->
 	<item id="5783" price="0" /> <!-- Boots of Nightmare - Heavy Armor -->
-	<item id="2498" price="0" /> <!-- Shield of Nightmare -->
-	<item id="2383" price="0" /> <!-- Majestic Plate Armor -->
-	<item id="2419" price="0" /> <!-- Majestic Circlet -->
-	<item id="5774" price="0" /> <!-- Majestic Gauntlets - Heavy Armor -->
-	<item id="5786" price="0" /> <!-- Majestic Boots - Heavy Armor -->
-	<item id="2394" price="0" /> <!-- Leather Armor of Nightmare -->
+	<item id="2498" price="0" /> <!-- Shield of Nightmare - Heavy Armor -->
+	<item id="2394" price="0" /> <!-- Leather Armor of Nightmare - Light Armor -->
 	<item id="5772" price="0" /> <!-- Gauntlets of Nightmare - Light Armor -->
 	<item id="5784" price="0" /> <!-- Boots of Nightmare - Light Armor -->
-	<item id="2395" price="0" /> <!-- Majestic Leather Armor -->
+	<item id="2408" price="0" /> <!-- Robe Armor of Nightmare - Robe Armor -->
+	<item id="5773" price="0" /> <!-- Gauntlets of Nightmare - Robe Armor -->
+	<item id="5785" price="0" /> <!-- Boots of Nightmare - Robe Armor -->
+	<item id="2419" price="0" /> <!-- Majestic Circlet -->
+	<item id="2383" price="0" /> <!-- Majestic Plate Armor - Heavy Armor -->
+	<item id="5774" price="0" /> <!-- Majestic Gauntlets - Heavy Armor -->
+	<item id="5786" price="0" /> <!-- Majestic Boots - Heavy Armor -->
+	<item id="2395" price="0" /> <!-- Majestic Leather Armor - Light Armor -->
 	<item id="5775" price="0" /> <!-- Majestic Gauntlets - Light Armor -->
 	<item id="5787" price="0" /> <!-- Majestic Boots - Light Armor -->
-	<item id="2408" price="0" /> <!-- Robe of Nightmare -->
-	<item id="5773" price="0" /> <!-- Gauntlets of Nightmare - Robe -->
-	<item id="5785" price="0" /> <!-- Boots of Nightmare - Robe -->
-	<item id="2409" price="0" /> <!-- Majestic Robe -->
-	<item id="5776" price="0" /> <!-- Majestic Gauntlets - Robe -->
-	<item id="5788" price="0" /> <!-- Majestic Boots - Robe -->
-	<item id="5287" price="0" /> <!-- Sealed Dark Crystal breastplate -->
-	<item id="5288" price="0" /> <!-- Sealed Dark Crystal Gaiters -->
-	<item id="5289" price="0" /> <!-- Sealed Dark Crystal Helmet -->
-	<item id="5290" price="0" /> <!-- Sealed Dark Crystal Gloves -->
-	<item id="5291" price="0" /> <!-- Sealed Dark Crystal Boots -->
-	<item id="5292" price="0" /> <!-- Sealed Dark Crystal Shield -->
-	<item id="5297" price="0" /> <!-- Sealed Dark Crystal Leather Armor -->
-	<item id="5298" price="0" /> <!-- Sealed Dark Crystal Leggings -->
-	<item id="5308" price="0" /> <!-- Sealed Dark Crystal Robe -->
-	<item id="5293" price="0" /> <!-- Sealed Tallum Plate Armor -->
-	<item id="5294" price="0" /> <!-- Sealed Tallum Helmet -->
-	<item id="5295" price="0" /> <!-- Sealed Tallum Gloves -->
-	<item id="5296" price="0" /> <!-- Sealed Tallum Boots -->
-	<item id="5301" price="0" /> <!-- Sealed Tallum Leather Armor -->
-	<item id="5304" price="0" /> <!-- Sealed Tallum Tunic -->
-	<item id="5305" price="0" /> <!-- Sealed Tallum Stockings -->
-	<item id="5311" price="0" /> <!-- Sealed Armor of Nightmare -->
-	<item id="5312" price="0" /> <!-- Sealed Helm of Nightmare -->
-	<item id="5313" price="0" /> <!-- Sealed Gauntlets of Nightmare -->
-	<item id="5314" price="0" /> <!-- Sealed Boots of Nightmare -->
-	<item id="5315" price="0" /> <!-- Sealed Shield of Nightmare -->
-	<item id="5320" price="0" /> <!-- Sealed Leather Armor of Nightmare -->
-	<item id="5326" price="0" /> <!-- Sealed Robe of Nightmare -->
-	<item id="5316" price="0" /> <!-- Sealed Majestic Plate Armor -->
-	<item id="5317" price="0" /> <!-- Sealed Majestic Circlet -->
-	<item id="5318" price="0" /> <!-- Sealed Majestic Gauntlets -->
-	<item id="5319" price="0" /> <!-- Sealed Majestic Boots -->
-	<item id="5323" price="0" /> <!-- Sealed Majestic Leather Armor -->
-	<item id="5329" price="0" /> <!-- Sealed Majestic Robe -->
+	<item id="2409" price="0" /> <!-- Majestic Robe Armor - Robe Armor -->
+	<item id="5776" price="0" /> <!-- Majestic Gauntlets - Robe Armor -->
+	<item id="5788" price="0" /> <!-- Majestic Boots - Robe Armor -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009959.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009959.xml
index 8b396c5b43..ccbc509050 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009959.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/buylists/custom/0009959.xml
@@ -9,5 +9,5 @@
 	<item id="7856" price="0" /> <!-- Clan Oath Boots - Light Armor -->
 	<item id="7857" price="0" /> <!-- Clan Oath Aketon -->
 	<item id="7858" price="0" /> <!-- Clan Oath Padded Gloves - Robe -->
-	<item id="7859" price="0" /> <!-- Clan Oath Sandals - Robe -->
+	<item id="7859" price="0" /> <!-- Clan Oath Sandals - Robe --> <!-- Kamen -->
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/gmstore/gear/weapons.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/gmstore/gear/weapons.htm
index 65fe04f4c9..803e9daac3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/gmstore/gear/weapons.htm
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/gmstore/gear/weapons.htm
@@ -39,7 +39,7 @@
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9997" value="A Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/weapons/a.htm" value="A Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009001.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009001.xml
index 39430eba1f..1d9ced18b0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009001.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009001.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="308" price="0" /> <!-- Buffalo's Horn -->
+	<item id="2369" price="0" /> <!-- Squire's Sword -->
 	<item id="1" price="0" /> <!-- Short Sword -->
-	<item id="2" price="0" /> <!-- Long Sword -->
 	<item id="3" price="0" /> <!-- Broadsword -->
+	<item id="738" price="0" /> <!-- Sword of Solidarity -->
+	<item id="1510" price="0" /> <!-- Butcher's Sword -->
+	<item id="975" price="0" /> <!-- Blood Saber -->
+	<item id="743" price="0" /> <!-- Sword of Sentinel -->
 	<item id="66" price="0" /> <!-- Gladius -->
+	<item id="122" price="0" /> <!-- Handmade Sword -->
 	<item id="67" price="0" /> <!-- Orcish Sword -->
-	<item id="68" price="0" /> <!-- Falchion -->
+	<item id="3029" price="0" /> <!-- Orcish Sword -->
+	<item id="1142" price="0" /> <!-- Rusted Bronze Sword -->
+	<item id="2" price="0" /> <!-- Long Sword -->
 	<item id="120" price="0" /> <!-- Sword of Reflection -->
 	<item id="121" price="0" /> <!-- Sword of Watershadow -->
-	<item id="122" price="0" /> <!-- Handmade Sword -->
-	<item id="738" price="0" /> <!-- Sword of Solidarity -->
-	<item id="743" price="0" /> <!-- Sword of Sentinel -->
-	<item id="975" price="0" /> <!-- Blood Saber -->
-	<item id="1142" price="0" /> <!-- Rusted Bronze Sword -->
-	<item id="1295" price="0" /> <!-- Long Sword -->
-	<item id="1296" price="0" /> <!-- Gladius -->
-	<item id="1297" price="0" /> <!-- Bastard Sword -->
-	<item id="1298" price="0" /> <!-- Caliburs -->
-	<item id="1510" price="0" /> <!-- Butcher's Sword -->
-	<item id="2369" price="0" /> <!-- Squire's Sword -->
-	<item id="3029" price="0" /> <!-- Sword of Binding -->
-	<item id="4027" price="0" /> <!-- Bouquet -->
-	<item id="4202" price="0" /> <!-- Chrono Cithara -->
-	<item id="4219" price="0" /> <!-- Dream Sword -->
+	<item id="68" price="0" /> <!-- Falchion -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009003.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009003.xml
index 8632803dae..c05cba8bc6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009003.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009003.xml
@@ -2,19 +2,16 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="10" price="0" /> <!-- Dagger -->
 	<item id="11" price="0" /> <!-- Bone Dagger -->
-	<item id="12" price="0" /> <!-- Knife -->
+	<item id="3471" price="0" /> <!-- Cybellin's Dagger -->
 	<item id="215" price="0" /> <!-- Doom Dagger -->
+	<item id="12" price="0" /> <!-- Knife -->
+	<item id="2372" price="0" /> <!-- Dagger of Adept -->
+	<item id="989" price="0" /> <!-- Eldritch Dagger -->
+	<item id="2374" price="0" /> <!-- Red Sunset Dagger -->
 	<item id="216" price="0" /> <!-- Dirk -->
+	<item id="946" price="0" /> <!-- Skeleton Dagger -->
+	<item id="1182" price="0" /> <!-- Neti's Dagger -->
 	<item id="217" price="0" /> <!-- Shining Knife -->
 	<item id="218" price="0" /> <!-- Throwing Knife -->
 	<item id="219" price="0" /> <!-- Sword Breaker -->
-	<item id="946" price="0" /> <!-- Skeleton Dagger -->
-	<item id="989" price="0" /> <!-- Eldritch Dagger -->
-	<item id="1182" price="0" /> <!-- Neti's Dagger -->
-	<item id="1305" price="0" /> <!-- Knife -->
-	<item id="1306" price="0" /> <!-- Crafted Dagger -->
-	<item id="2372" price="0" /> <!-- Dagger of Adept -->
-	<item id="2374" price="0" /> <!-- Red Sunset Dagger -->
-	<item id="3471" price="0" /> <!-- Cybellin's Dagger -->
-	<item id="4220" price="0" /> <!-- Dream Knife -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009004.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009004.xml
index 57c23094b3..c2917f6552 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009004.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009004.xml
@@ -2,12 +2,11 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="13" price="0" /> <!-- Short Bow -->
 	<item id="14" price="0" /> <!-- Bow -->
-	<item id="271" price="0" /> <!-- Hunting Bow -->
-	<item id="272" price="0" /> <!-- Forest Bow -->
-	<item id="273" price="0" /> <!-- Composite Bow -->
-	<item id="1181" price="0" /> <!-- Neti's Bow -->
-	<item id="1213" price="0" /> <!-- Guard's Bow -->
-	<item id="1307" price="0" /> <!-- Bow -->
 	<item id="3028" price="0" /> <!-- Crescent Moon Bow -->
+	<item id="271" price="0" /> <!-- Hunting Bow -->
+	<item id="1181" price="0" /> <!-- Neti's Bow -->
+	<item id="272" price="0" /> <!-- Forest Bow -->
+	<item id="1213" price="0" /> <!-- Guard's Bow -->
+	<item id="273" price="0" /> <!-- Composite Bow -->
 	<item id="17" price="0" /> <!-- Wooden Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009005.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009005.xml
index 36d9648e08..3c547578db 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009005.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009005.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="2368" price="0" /> <!-- Training Gloves -->
 	<item id="253" price="0" /> <!-- Spiked Gloves -->
 	<item id="254" price="0" /> <!-- Iron Gloves -->
+	<item id="2371" price="0" /> <!-- Fist of Butcher -->
 	<item id="255" price="0" /> <!-- Fox Claw Gloves -->
 	<item id="256" price="0" /> <!-- Cestus -->
 	<item id="257" price="0" /> <!-- Viper Fang -->
-	<item id="2368" price="0" /> <!-- Training Gloves -->
-	<item id="2371" price="0" /> <!-- Fist of Butcher -->
-	<item id="5133" price="0" /> <!-- Chrono Unitus -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009006.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009006.xml
index d7d715a2c4..6fc4e88700 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009006.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009006.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="15" price="0" /> <!-- Short Spear -->
-	<item id="16" price="0" /> <!-- Great Spear -->
-	<item id="1302" price="0" /> <!-- Bec de Corbin -->
-	<item id="1303" price="0" /> <!-- Lance -->
 	<item id="3026" price="0" /> <!-- Talins Spear -->
-	<item id="5817" price="0" /> <!-- Chrono Campana -->
+	<item id="16" price="0" /> <!-- Great Spear -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009007.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009007.xml
index 83ea0a60e0..f49e6f8628 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009007.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009007.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="4" price="0" /> <!-- Club -->
-	<item id="5" price="0" /> <!-- Mace -->
 	<item id="6" price="0" /> <!-- Apprentice's Wand -->
 	<item id="7" price="0" /> <!-- Apprentice's Rod -->
-	<item id="87" price="0" /> <!-- Iron Hammer -->
-	<item id="152" price="0" /> <!-- Heavy Chisel -->
-	<item id="153" price="0" /> <!-- Sigil -->
-	<item id="154" price="0" /> <!-- Dwarven Mace -->
-	<item id="155" price="0" /> <!-- Flanged Mace -->
-	<item id="747" price="0" /> <!-- Wand of Adept -->
-	<item id="748" price="0" /> <!-- Gallint's Oak Wand -->
-	<item id="1300" price="0" /> <!-- Apprentice's Rod -->
-	<item id="1301" price="0" /> <!-- Big Hammer -->
-	<item id="1511" price="0" /> <!-- Silversmith Hammer -->
 	<item id="2370" price="0" /> <!-- Guild Member's Club -->
+	<item id="4" price="0" /> <!-- Club -->
+	<item id="152" price="0" /> <!-- Heavy Chisel -->
+	<item id="5" price="0" /> <!-- Mace -->
+	<item id="747" price="0" /> <!-- Wand of Adept -->
+	<item id="153" price="0" /> <!-- Sickle -->
+	<item id="1511" price="0" /> <!-- Silversmith Hammer -->
+	<item id="154" price="0" /> <!-- Dwarven Mace -->
 	<item id="2501" price="0" /> <!-- Bone Club -->
-	<item id="4221" price="0" /> <!-- Ubiquitous Axe -->
+	<item id="155" price="0" /> <!-- Flanged Mace -->
+	<item id="87" price="0" /> <!-- Iron Hammer -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009008.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009008.xml
index 7334960d0c..2d76d487c4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009008.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009008.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="8" price="0" /> <!-- Willow Staff -->
+	<item id="2373" price="0" /> <!-- Eldritch Staff -->
+	<item id="754" price="0" /> <!-- Red Sunset Staff -->
+	<item id="744" price="0" /> <!-- Staff of Sentinel -->
 	<item id="9" price="0" /> <!-- Cedar Staff -->
 	<item id="176" price="0" /> <!-- Apprentice's Staff -->
 	<item id="177" price="0" /> <!-- Mage Staff -->
-	<item id="744" price="0" /> <!-- Staff of Sentinel -->
-	<item id="754" price="0" /> <!-- Red Sunset Staff -->
-	<item id="1304" price="0" /> <!-- Conjuror's Staff -->
-	<item id="2373" price="0" /> <!-- Eldritch Staff -->
-	<item id="7058" price="0" /> <!-- Chrono Darbuka -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009009.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009009.xml
index 464496df10..be0fbe4fbb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009009.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009009.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="69" price="0" /> <!-- Bastard Sword -->
-	<item id="83" price="0" /> <!-- Sword of Magic -->
+	<item id="7885" price="0" /> <!-- Priest Sword -->
 	<item id="123" price="0" /> <!-- Saber -->
-	<item id="125" price="0" /> <!-- Spinebone Sword -->
-	<item id="126" price="0" /> <!-- Artisan's Sword -->
-	<item id="127" price="0" /> <!-- Crimson Sword -->
-	<item id="128" price="0" /> <!-- Knight's Sword -->
-	<item id="129" price="0" /> <!-- Sword of Revolution -->
-	<item id="130" price="0" /> <!-- Elven Sword -->
+	<item id="83" price="0" /> <!-- Sword of Magic -->
 	<item id="143" price="0" /> <!-- Sword of Mystic -->
 	<item id="144" price="0" /> <!-- Sword of Occult -->
+	<item id="126" price="0" /> <!-- Artisan's Sword -->
+	<item id="69" price="0" /> <!-- Bastard Sword -->
+	<item id="128" price="0" /> <!-- Knight's Sword -->
+	<item id="125" price="0" /> <!-- Spinebone Sword -->
+	<item id="7886" price="0" /> <!-- Sword of Magic Fog -->
+	<item id="127" price="0" /> <!-- Crimson Sword -->
+	<item id="130" price="0" /> <!-- Elven Sword -->
+	<item id="129" price="0" /> <!-- Sword of Revolution -->
 	<item id="2499" price="0" /> <!-- Elven Long Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009010.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009010.xml
index 26102a4458..92316b3b48 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009010.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009010.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="70" price="0" /> <!-- Claymore -->
-	<item id="124" price="0" /> <!-- Two-Handed Sword -->
 	<item id="5285" price="0" /> <!-- Heavy Sword -->
-	<item id="5791" price="0" /> <!-- Tomb Guard A -->
-	<item id="5792" price="0" /> <!-- Tomb Guard B -->
-	<item id="5795" price="0" /> <!-- Tomb Guard A -->
-	<item id="5796" price="0" /> <!-- Tomb Guard B -->
+	<item id="7880" price="0" /> <!-- Steel Sword -->
+	<item id="124" price="0" /> <!-- Two-Handed Sword -->
+	<item id="7881" price="0" /> <!-- Lesser Giant's Sword -->
+	<item id="70" price="0" /> <!-- Claymore -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009011.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009011.xml
index 761914e5d2..916031dadc 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009011.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009011.xml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="2516" price="0" /> <!-- Saber*Saber -->
-	<item id="2517" price="0" /> <!-- Saber*Bastard Sword -->
-	<item id="2518" price="0" /> <!-- Saber*Spinebone Sword -->
 	<item id="2519" price="0" /> <!-- Saber*Artisan's Sword -->
+	<item id="2517" price="0" /> <!-- Saber*Bastard Sword -->
 	<item id="2520" price="0" /> <!-- Saber*Knight's Sword -->
-	<item id="2521" price="0" /> <!-- Saber*Crimson Sword -->
-	<item id="2522" price="0" /> <!-- Saber*Elven Sword -->
+	<item id="2518" price="0" /> <!-- Saber*Spinebone Sword -->
+	<item id="2540" price="0" /> <!-- Artisan's Sword*Artisan's Sword -->
+	<item id="2541" price="0" /> <!-- Artisan's Sword*Knight's Sword -->
+	<item id="2527" price="0" /> <!-- Bastard Sword*Artisan's Sword -->
 	<item id="2525" price="0" /> <!-- Bastard Sword*Bastard Sword -->
 	<item id="2526" price="0" /> <!-- Bastard Sword*Spinebone Sword -->
-	<item id="2527" price="0" /> <!-- Bastard Sword*Artisan's Sword -->
 	<item id="2528" price="0" /> <!-- Bastard Sword*Knight's Sword -->
-	<item id="2529" price="0" /> <!-- Bastard Sword*Crimson Sword -->
-	<item id="2530" price="0" /> <!-- Bastard Sword*Elven Sword -->
+	<item id="2546" price="0" /> <!-- Knight's Sword*Knight's Sword -->
+	<item id="2521" price="0" /> <!-- Saber*Crimson Sword -->
+	<item id="2522" price="0" /> <!-- Saber*Elven Sword -->
 	<item id="2533" price="0" /> <!-- Spinebone Sword*Spinebone Sword -->
 	<item id="2534" price="0" /> <!-- Spinebone Sword*Artisan's Sword -->
 	<item id="2535" price="0" /> <!-- Spinebone Sword*Knight's Sword -->
-	<item id="2536" price="0" /> <!-- Spinebone Sword*Crimson Sword -->
-	<item id="2537" price="0" /> <!-- Spinebone Sword*Elven Sword -->
-	<item id="2540" price="0" /> <!-- Artisan's Sword*Artisan's Sword -->
-	<item id="2541" price="0" /> <!-- Artisan's Sword*Knight's Sword -->
 	<item id="2542" price="0" /> <!-- Artisan's Sword*Crimson Sword -->
 	<item id="2543" price="0" /> <!-- Artisan's Sword*Elven Sword -->
-	<item id="2546" price="0" /> <!-- Knight's Sword*Knight's Sword -->
+	<item id="2529" price="0" /> <!-- Bastard Sword*Crimson Sword -->
+	<item id="2530" price="0" /> <!-- Bastard Sword*Elven Sword -->
 	<item id="2547" price="0" /> <!-- Knight's Sword*Crimson Sword -->
 	<item id="2548" price="0" /> <!-- Knight's Sword*Elven Sword -->
-	<item id="5129" price="0" /> <!-- Doll Knife -->
+	<item id="2536" price="0" /> <!-- Spinebone Sword*Crimson Sword -->
+	<item id="2537" price="0" /> <!-- Spinebone Sword*Elven Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009012.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009012.xml
index 6c276a3d38..835d727d32 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009012.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009012.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="220" price="0" /> <!-- Crafted Dagger -->
 	<item id="221" price="0" /> <!-- Assassin Knife -->
-	<item id="222" price="0" /> <!-- Poniard Dagger -->
-	<item id="223" price="0" /> <!-- Kukuri -->
-	<item id="224" price="0" /> <!-- Maingauche -->
-	<item id="225" price="0" /> <!-- Mithril Dagger -->
+	<item id="220" price="0" /> <!-- Crafted Dagger -->
+	<item id="240" price="0" /> <!-- Conjurer's Knife -->
 	<item id="238" price="0" /> <!-- Dagger of Mana -->
 	<item id="239" price="0" /> <!-- Mystic Knife -->
-	<item id="240" price="0" /> <!-- Conjurer's Knife -->
+	<item id="222" price="0" /> <!-- Poniard Dagger -->
 	<item id="241" price="0" /> <!-- Shilen Knife -->
-	<item id="1471" price="0" /> <!-- Silenos Blowgun -->
+	<item id="223" price="0" /> <!-- Kukuri -->
 	<item id="1660" price="0" /> <!-- Cursed Maingauche -->
-	<item id="2507" price="0" /> <!-- Lizardspear -->
-	<item id="4028" price="0" /> <!-- Giant Cannon -->
-	<item id="5127" price="0" /> <!-- Dailaon Knife -->
-	<item id="5128" price="0" /> <!-- Crokian Blade -->
-	<item id="5130" price="0" /> <!-- Nos Sword -->
-	<item id="5131" price="0" /> <!-- Parhit Staff -->
-	<item id="5132" price="0" /> <!-- Giant Trident -->
+	<item id="224" price="0" /> <!-- Maingauche -->
+	<item id="225" price="0" /> <!-- Mithril Dagger -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009013.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009013.xml
index aa02831e23..f3f3c06790 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009013.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009013.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="274" price="0" /> <!-- Reinforced Bow -->
-	<item id="275" price="0" /> <!-- Long Bow -->
-	<item id="276" price="0" /> <!-- Elven Bow -->
 	<item id="277" price="0" /> <!-- Dark Elven Bow -->
+	<item id="276" price="0" /> <!-- Elven Bow -->
+	<item id="275" price="0" /> <!-- Long Bow -->
 	<item id="278" price="0" /> <!-- Gastraphetes -->
 	<item id="279" price="0" /> <!-- Reinforced Long Bow -->
 	<item id="280" price="0" /> <!-- Light Crossbow -->
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009015.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009015.xml
index 0c8d284eaf..8d1d221e56 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009015.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009015.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="93" price="0" /> <!-- Winged Spear -->
 	<item id="291" price="0" /> <!-- Trident -->
+	<item id="295" price="0" /> <!-- Dwarven Trident -->
 	<item id="292" price="0" /> <!-- Pike -->
+	<item id="296" price="0" /> <!-- Dwarven Pike -->
 	<item id="293" price="0" /> <!-- War Hammer -->
 	<item id="294" price="0" /> <!-- War Pick -->
-	<item id="295" price="0" /> <!-- Dwarven Trident -->
-	<item id="296" price="0" /> <!-- Dwarven Pike -->
+	<item id="93" price="0" /> <!-- Winged Spear -->
 	<item id="297" price="0" /> <!-- Glaive -->
-	<item id="1376" price="0" /> <!-- Guard Spear -->
-	<item id="1472" price="0" /> <!-- Dreadbane -->
-	<item id="3937" price="0" /> <!-- Giant Bar -->
-	<item id="3938" price="0" /> <!-- Giant Rod -->
-	<item id="3939" price="0" /> <!-- Lady's Fan -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009016.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009016.xml
index 4504f2eca8..b40d300e9e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009016.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009016.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="86" price="0" /> <!-- Tomahawk -->
-	<item id="88" price="0" /> <!-- Morning Star -->
 	<item id="156" price="0" /> <!-- Hand Axe -->
-	<item id="157" price="0" /> <!-- Spiked Club -->
-	<item id="158" price="0" /> <!-- Tarbar -->
-	<item id="159" price="0" /> <!-- Bonebreaker -->
 	<item id="166" price="0" /> <!-- Heavy Mace -->
 	<item id="167" price="0" /> <!-- Scalpel -->
 	<item id="168" price="0" /> <!-- Work Hammer -->
-	<item id="169" price="0" /> <!-- Skull Breaker -->
-	<item id="172" price="0" /> <!-- Heavy Bone Club -->
-	<item id="179" price="0" /> <!-- Mace of Prayer -->
+	<item id="182" price="0" /> <!-- Doom Hammer -->
 	<item id="180" price="0" /> <!-- Mace of Judgment -->
 	<item id="181" price="0" /> <!-- Mace of Miracle -->
-	<item id="182" price="0" /> <!-- Doom Hammer -->
+	<item id="179" price="0" /> <!-- Mace of Prayer -->
+	<item id="86" price="0" /> <!-- Tomahawk -->
+	<item id="7890" price="0" /> <!-- Priest Mace -->
+	<item id="157" price="0" /> <!-- Spiked Club -->
 	<item id="189" price="0" /> <!-- Staff of Life -->
+	<item id="172" price="0" /> <!-- Heavy Bone Club -->
+	<item id="88" price="0" /> <!-- Morning Star -->
+	<item id="169" price="0" /> <!-- Skull Breaker -->
+	<item id="158" price="0" /> <!-- Tarbar -->
+	<item id="159" price="0" /> <!-- Bonebreaker -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009017.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009017.xml
index 9f1f9b8454..1e8b6aa064 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009017.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009017.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="90" price="0" /> <!-- Goat Head Staff -->
 	<item id="178" price="0" /> <!-- Bone Staff -->
-	<item id="183" price="0" /> <!-- Mystic Staff -->
 	<item id="184" price="0" /> <!-- Conjuror's Staff -->
+	<item id="183" price="0" /> <!-- Mystic Staff -->
 	<item id="185" price="0" /> <!-- Staff of Mana -->
 	<item id="186" price="0" /> <!-- Staff of Magic -->
+	<item id="90" price="0" /> <!-- Goat Head Staff -->
 	<item id="187" price="0" /> <!-- Atuba Hammer -->
-	<item id="188" price="0" /> <!-- Ghost Staff -->
 	<item id="190" price="0" /> <!-- Atuba Mace -->
+	<item id="188" price="0" /> <!-- Ghost Staff -->
+	<item id="7896" price="0" /> <!-- Lesser Giant's Hammer -->
+
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009018.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009018.xml
index dabde201a0..cd31996078 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009018.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009018.xml
@@ -1,61 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="72" price="0" /> <!-- Stormbringer -->
-	<item id="73" price="0" /> <!-- Shamshir -->
+	<item id="84" price="0" /> <!-- Homunkulus's Sword -->
+	<item id="145" price="0" /> <!-- Sword of Whispering Death -->
 	<item id="74" price="0" /> <!-- Katana -->
+	<item id="133" price="0" /> <!-- Raid Sword -->
+	<item id="73" price="0" /> <!-- Shamshir -->
+	<item id="131" price="0" /> <!-- Spirit Sword -->
 	<item id="75" price="0" /> <!-- Caliburs -->
 	<item id="76" price="0" /> <!-- Sword of Delusion -->
-	<item id="77" price="0" /> <!-- Tsurugi -->
-	<item id="84" price="0" /> <!-- Homunkulus's Sword -->
-	<item id="131" price="0" /> <!-- Spirit Sword -->
-	<item id="132" price="0" /> <!-- Sword of Limit -->
-	<item id="133" price="0" /> <!-- Raid Sword -->
 	<item id="134" price="0" /> <!-- Sword of Nightmare -->
+	<item id="77" price="0" /> <!-- Tsurugi -->
 	<item id="135" price="0" /> <!-- Samurai Longsword -->
-	<item id="145" price="0" /> <!-- Sword of Whispering Death -->
-	<item id="4681" price="0" /> <!-- Stormbringer - Critical Anger -->
-	<item id="4682" price="0" /> <!-- Stormbringer - Focus -->
-	<item id="4683" price="0" /> <!-- Stormbringer - Light -->
-	<item id="4684" price="0" /> <!-- Shamshir - Guidance -->
-	<item id="4685" price="0" /> <!-- Shamshir - Back Blow -->
-	<item id="4686" price="0" /> <!-- Shamshir - Rsk. Evasion -->
-	<item id="4687" price="0" /> <!-- Katana - Focus -->
-	<item id="4688" price="0" /> <!-- Katana - Critical Damage -->
-	<item id="4689" price="0" /> <!-- Katana - Haste -->
-	<item id="4690" price="0" /> <!-- Spirit Sword - Critical Damage -->
-	<item id="4691" price="0" /> <!-- Spirit Sword - Critical Poison -->
-	<item id="4692" price="0" /> <!-- Spirit Sword - Haste -->
-	<item id="4693" price="0" /> <!-- Raid Sword - Focus -->
-	<item id="4694" price="0" /> <!-- Raid Sword - Critical Drain -->
-	<item id="4695" price="0" /> <!-- Raid Sword - Critical Poison -->
-	<item id="4696" price="0" /> <!-- Caliburs - Guidance -->
-	<item id="4697" price="0" /> <!-- Caliburs - Focus -->
-	<item id="4698" price="0" /> <!-- Caliburs - Critical Damage -->
-	<item id="4699" price="0" /> <!-- Sword of Delusion - Focus -->
-	<item id="4700" price="0" /> <!-- Sword of Delusion - Health -->
-	<item id="4701" price="0" /> <!-- Sword of Delusion - Rsk. Haste -->
-	<item id="4702" price="0" /> <!-- Tsurugi - Focus -->
-	<item id="4703" price="0" /> <!-- Tsurugi - Critical Damage -->
-	<item id="4704" price="0" /> <!-- Tsurugi - Haste -->
-	<item id="4705" price="0" /> <!-- Sword of Nightmare - Health -->
-	<item id="4706" price="0" /> <!-- Sword of Nightmare - Focus -->
-	<item id="4707" price="0" /> <!-- Sword of Nightmare - Light -->
-	<item id="4708" price="0" /> <!-- Samurai Longsword - Focus -->
-	<item id="4709" price="0" /> <!-- Samurai Longsword - Critical Damage -->
-	<item id="4710" price="0" /> <!-- Samurai Longsword - Haste -->
-	<item id="5793" price="0" /> <!-- Tomb Savant A -->
-	<item id="5794" price="0" /> <!-- Tomb Savant B -->
-	<item id="5797" price="0" /> <!-- Tomb Savant A -->
-	<item id="5798" price="0" /> <!-- Tomb Savant B -->
-	<item id="5800" price="0" /> <!-- Nephilim Lord -->
-	<item id="5801" price="0" /> <!-- For NPC (Dusk) -->
-	<item id="6307" price="0" /> <!-- Sword of Limit - Guidance -->
-	<item id="6308" price="0" /> <!-- Sword of Limit - Critical Drain -->
-	<item id="6309" price="0" /> <!-- Sword of Limit - Health -->
-	<item id="6310" price="0" /> <!-- Sword of Whispering Death - Empower -->
-	<item id="6311" price="0" /> <!-- Sword of Whispering Death - M. Atk. -->
-	<item id="6312" price="0" /> <!-- Sword of Whispering Death - Magic Silence -->
-	<item id="6313" price="0" /> <!-- Homunkulus's Sword - Acumen -->
-	<item id="6314" price="0" /> <!-- Homunkulus's Sword - Conversion -->
-	<item id="6315" price="0" /> <!-- Homunkulus's Sword - Magic Paralyze -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009019.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009019.xml
index 84e753eb78..10c758d75d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009019.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009019.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="71" price="0" /> <!-- Flamberge -->
-	<item id="4711" price="0" /> <!-- Flamberge - Critical Damage -->
-	<item id="4712" price="0" /> <!-- Flamberge - Focus -->
-	<item id="4713" price="0" /> <!-- Flamberge - Light -->
+	<item id="7882" price="0" /> <!-- Pa'agrian Sword -->
 	<item id="5286" price="0" /> <!-- Berserker Blade -->
-	<item id="6347" price="0" /> <!-- Berserker Blade - Focus -->
-	<item id="6348" price="0" /> <!-- Berserker Blade - Critical Damage -->
-	<item id="6349" price="0" /> <!-- Berserker Blade - Haste -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009020.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009020.xml
index 2eaeec49f5..8db83494df 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009020.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009020.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="2523" price="0" /> <!-- Saber*Sword of Revolution -->
-	<item id="2524" price="0" /> <!-- Saber*Elven Long Sword -->
-	<item id="2531" price="0" /> <!-- Bastard Sword*Sword of Revolution -->
-	<item id="2532" price="0" /> <!-- Bastard Sword*Elven Long Sword -->
-	<item id="2538" price="0" /> <!-- Spinebone Sword*Sword of Revolution -->
-	<item id="2539" price="0" /> <!-- Spinebone Sword*Elven Long Sword -->
-	<item id="2544" price="0" /> <!-- Artisan's Sword*Sword of Revolution -->
-	<item id="2545" price="0" /> <!-- Artisan's Sword*Elven Long Sword -->
-	<item id="2549" price="0" /> <!-- Knight's Sword*Sword of Revolution -->
-	<item id="2550" price="0" /> <!-- Knight's Sword*Elven Long Sword -->
 	<item id="2551" price="0" /> <!-- Crimson Sword*Crimson Sword -->
 	<item id="2552" price="0" /> <!-- Crimson Sword*Elven Sword -->
-	<item id="2553" price="0" /> <!-- Crimson Sword*Sword of Revolution -->
-	<item id="2554" price="0" /> <!-- Crimson Sword*Elven Long Sword -->
 	<item id="2555" price="0" /> <!-- Elven Sword*Elven Sword -->
+	<item id="2523" price="0" /> <!-- Saber*Sword of Revolution -->
+	<item id="2544" price="0" /> <!-- Artisan's Sword*Sword of Revolution -->
+	<item id="2531" price="0" /> <!-- Bastard Sword*Sword of Revolution -->
+	<item id="2549" price="0" /> <!-- Knight's Sword*Sword of Revolution -->
+	<item id="2538" price="0" /> <!-- Spinebone Sword*Sword of Revolution -->
+	<item id="2524" price="0" /> <!-- Saber*Elven Long Sword -->
+	<item id="2545" price="0" /> <!-- Artisan's Sword*Elven Long Sword -->
+	<item id="2532" price="0" /> <!-- Bastard Sword*Elven Long Sword -->
+	<item id="2553" price="0" /> <!-- Crimson Sword*Sword of Revolution -->
 	<item id="2556" price="0" /> <!-- Elven Sword*Sword of Revolution -->
+	<item id="2550" price="0" /> <!-- Knight's Sword*Elven Long Sword -->
+	<item id="2539" price="0" /> <!-- Spinebone Sword*Elven Long Sword -->
+	<item id="2554" price="0" /> <!-- Crimson Sword*Elven Long Sword -->
 	<item id="2557" price="0" /> <!-- Elven Sword*Elven Long Sword -->
 	<item id="2558" price="0" /> <!-- Sword of Revolution*Sword of Revolution -->
 	<item id="2559" price="0" /> <!-- Sword of Revolution*Elven Long Sword -->
 	<item id="2560" price="0" /> <!-- Elven Long Sword*Elven Long Sword -->
 	<item id="2561" price="0" /> <!-- Stormbringer*Stormbringer -->
-	<item id="2562" price="0" /> <!-- Stormbringer*Shamshir -->
 	<item id="2563" price="0" /> <!-- Stormbringer*Katana -->
-	<item id="2564" price="0" /> <!-- Stormbringer*Spirit Sword -->
 	<item id="2565" price="0" /> <!-- Stormbringer*Raid Sword -->
+	<item id="2562" price="0" /> <!-- Stormbringer*Shamshir -->
+	<item id="2564" price="0" /> <!-- Stormbringer*Spirit Sword -->
 	<item id="2572" price="0" /> <!-- Shamshir*Shamshir -->
 	<item id="2573" price="0" /> <!-- Shamshir*Katana -->
 	<item id="2574" price="0" /> <!-- Shamshir*Spirit Sword -->
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009021.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009021.xml
index 54fec1a484..fb4e7715e2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009021.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009021.xml
@@ -1,35 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="226" price="0" /> <!-- Cursed Dagger -->
-	<item id="227" price="0" /> <!-- Stiletto -->
-	<item id="228" price="0" /> <!-- Crystal Dagger -->
-	<item id="230" price="0" /> <!-- Wolverine Needle -->
-	<item id="231" price="0" /> <!-- Grace Dagger -->
-	<item id="232" price="0" /> <!-- Dark Elven Dagger -->
-	<item id="233" price="0" /> <!-- Dark Screamer -->
 	<item id="242" price="0" /> <!-- Soulfire Dirk -->
-	<item id="4759" price="0" /> <!-- Cursed Dagger - Critical Bleed -->
-	<item id="4760" price="0" /> <!-- Cursed Dagger - Critical Poison -->
-	<item id="4761" price="0" /> <!-- Cursed Dagger - Rsk. Haste -->
-	<item id="4762" price="0" /> <!-- Dark Elven Dagger - Focus -->
-	<item id="4763" price="0" /> <!-- Dark Elven Dagger - Back Blow -->
-	<item id="4764" price="0" /> <!-- Dark Elven Dagger - Mortal Strike -->
-	<item id="4765" price="0" /> <!-- Stiletto - Critical Bleed -->
-	<item id="4766" price="0" /> <!-- Stiletto - Critical Poison -->
-	<item id="4767" price="0" /> <!-- Stiletto - Mortal Strike -->
-	<item id="4768" price="0" /> <!-- Grace Dagger - Evasion -->
-	<item id="4769" price="0" /> <!-- Grace Dagger - Focus -->
-	<item id="4770" price="0" /> <!-- Grace Dagger - Back Blow -->
-	<item id="4771" price="0" /> <!-- Dark Screamer - Evasion -->
-	<item id="4772" price="0" /> <!-- Dark Screamer - Focus -->
-	<item id="4773" price="0" /> <!-- Dark Screamer - Critical Bleed -->
-	<item id="4774" price="0" /> <!-- Crystal Dagger - Critical Bleed -->
-	<item id="4775" price="0" /> <!-- Crystal Dagger - Critical Poison -->
-	<item id="4776" price="0" /> <!-- Crystal Dagger - Mortal Strike -->
-	<item id="6356" price="0" /> <!-- Dark Elven Dagger - Rsk. Haste -->
-	<item id="6357" price="0" /> <!-- Stiletto - Rsk. Haste -->
-	<item id="6358" price="0" /> <!-- Crystal Dagger - Critical Damage -->
-	<item id="7810" price="0" /> <!-- Soulfire Dirk - Mana Up -->
-	<item id="7811" price="0" /> <!-- Soulfire Dirk - Magic Hold -->
-	<item id="7812" price="0" /> <!-- Soulfire Dirk - Magic Silence -->
+	<item id="226" price="0" /> <!-- Cursed Dagger -->
+	<item id="232" price="0" /> <!-- Dark Elven Dagger -->
+	<item id="230" price="0" /> <!-- Needle Wolverine -->
+	<item id="227" price="0" /> <!-- Stiletto -->
+	<item id="233" price="0" /> <!-- Dark Screamer -->
+	<item id="231" price="0" /> <!-- Grace Dagger -->
+	<item id="228" price="0" /> <!-- Crystal Dagger -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009022.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009022.xml
index 805b5d0ec0..bdb4a1c912 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009022.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009022.xml
@@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="281" price="0" /> <!-- Crystallized Ice Bow -->
+	<item id="285" price="0" /> <!-- Noble Elven Bow -->
 	<item id="282" price="0" /> <!-- Elemental Bow -->
 	<item id="283" price="0" /> <!-- Akat Long Bow -->
-	<item id="285" price="0" /> <!-- Noble Elven Bow -->
 	<item id="286" price="0" /> <!-- Eminence Bow -->
-	<item id="4810" price="0" /> <!-- Crystallized Ice Bow - Guidance -->
-	<item id="4811" price="0" /> <!-- Crystallized Ice Bow - Evasion -->
-	<item id="4812" price="0" /> <!-- Crystallized Ice Bow - Quick Recovery -->
-	<item id="4813" price="0" /> <!-- Elemental Bow - Guidance -->
-	<item id="4814" price="0" /> <!-- Elemental Bow - Miser -->
-	<item id="4815" price="0" /> <!-- Elemental Bow - Quick Recovery -->
-	<item id="4816" price="0" /> <!-- Noble Elven Bow - Evasion -->
-	<item id="4817" price="0" /> <!-- Noble Elven Bow - Miser -->
-	<item id="4818" price="0" /> <!-- Noble Elven Bow - Cheap Shot -->
-	<item id="4819" price="0" /> <!-- Akat Long Bow - Guidance -->
-	<item id="4820" price="0" /> <!-- Akat Long Bow - Evasion -->
-	<item id="4821" price="0" /> <!-- Akat Long Bow - Miser -->
-	<item id="4822" price="0" /> <!-- Eminence Bow - Guidance -->
-	<item id="4823" price="0" /> <!-- Eminence Bow - Miser -->
-	<item id="4824" price="0" /> <!-- Eminence Bow - Cheap Shot -->
 	<item id="1342" price="0" /> <!-- Steel Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009023.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009023.xml
index f42119d73d..284a32758e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009023.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009023.xml
@@ -1,19 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="263" price="0" /> <!-- Chakram -->
+	<item id="4233" price="0" /> <!-- Fist -->
 	<item id="265" price="0" /> <!-- Fisted Blade -->
 	<item id="266" price="0" /> <!-- Great Pata -->
-	<item id="4233" price="0" /> <!-- Knuckle Duster -->
-	<item id="4789" price="0" /> <!-- Chakram - Critical Drain -->
-	<item id="4790" price="0" /> <!-- Chakram - Critical Poison -->
-	<item id="4791" price="0" /> <!-- Chakram - Rsk. Haste -->
-	<item id="4792" price="0" /> <!-- Fisted Blade - Rsk. Evasion -->
-	<item id="4793" price="0" /> <!-- Fisted Blade - Rsk. Haste -->
-	<item id="4794" price="0" /> <!-- Fisted Blade - Haste -->
-	<item id="4795" price="0" /> <!-- Great Pata - Critical Drain -->
-	<item id="4796" price="0" /> <!-- Great Pata - Critical Poison -->
-	<item id="4797" price="0" /> <!-- Great Pata - Rsk. Haste -->
-	<item id="4798" price="0" /> <!-- Knuckle Duster - Rsk. Evasion -->
-	<item id="4799" price="0" /> <!-- Knuckle Duster - Rsk. Haste -->
-	<item id="4800" price="0" /> <!-- Knuckle Duster - Haste -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009024.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009024.xml
index f88c895bef..8331e91886 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009024.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009024.xml
@@ -1,35 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="302" price="0" /> <!-- Body Slasher -->
+	<item id="298" price="0" /> <!-- Orcish Glaive -->
+	<item id="96" price="0" /> <!-- Scythe -->
 	<item id="94" price="0" /> <!-- Bec de Corbin -->
 	<item id="95" price="0" /> <!-- Poleaxe -->
-	<item id="96" price="0" /> <!-- Scythe -->
-	<item id="298" price="0" /> <!-- Orcish Glaive -->
-	<item id="299" price="0" /> <!-- Orcish Poleaxe -->
 	<item id="301" price="0" /> <!-- Scorpion -->
-	<item id="302" price="0" /> <!-- Body Slasher -->
 	<item id="303" price="0" /> <!-- Widow Maker -->
-	<item id="4834" price="0" /> <!-- Scythe - Anger -->
-	<item id="4835" price="0" /> <!-- Scythe - Critical Stun -->
-	<item id="4836" price="0" /> <!-- Scythe - Light -->
-	<item id="4837" price="0" /> <!-- Orcish Glaive - Anger -->
-	<item id="4838" price="0" /> <!-- Orcish Glaive - Critical Stun -->
-	<item id="4839" price="0" /> <!-- Orcish Glaive - Towering Blow -->
-	<item id="4840" price="0" /> <!-- Body Slasher - Critical Stun -->
-	<item id="4841" price="0" /> <!-- Body Slasher - Towering Blow -->
-	<item id="4842" price="0" /> <!-- Body Slasher - Wide Blow -->
-	<item id="4843" price="0" /> <!-- Bec de Corbin - Critical Stun -->
-	<item id="4844" price="0" /> <!-- Bec de Corbin - Towering Blow -->
-	<item id="4845" price="0" /> <!-- Bec de Corbin - Light -->
-	<item id="4846" price="0" /> <!-- Scorpion - Anger -->
-	<item id="4847" price="0" /> <!-- Scorpion - Critical Stun -->
-	<item id="4848" price="0" /> <!-- Scorpion - Towering Blow -->
-	<item id="4849" price="0" /> <!-- Widow Maker - Critical Stun -->
-	<item id="4850" price="0" /> <!-- Widow Maker - Towering Blow -->
-	<item id="4851" price="0" /> <!-- Widow Maker - Wide Blow -->
-	<item id="4852" price="0" /> <!-- Orcish Poleaxe - Critical Stun -->
-	<item id="4853" price="0" /> <!-- Orcish Poleaxe - Towering Blow -->
-	<item id="4854" price="0" /> <!-- Orcish Poleaxe - Wide Blow -->
-	<item id="7719" price="0" /> <!-- Poleaxe - Critical Stun -->
-	<item id="7720" price="0" /> <!-- Poleaxe - Towering Blow -->
-	<item id="7721" price="0" /> <!-- Poleaxe - Wide Blow -->
+		<item id="299" price="0" /> <!-- Orcish Poleaxe -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009025.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009025.xml
index 16b8eb5eb4..1b7af43055 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009025.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009025.xml
@@ -1,42 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="4734" price="0" /> <!-- Silver Axe - Haste -->
-	<item id="4735" price="0" /> <!-- Skull Graver - Anger -->
-	<item id="4736" price="0" /> <!-- Skull Graver - Health -->
-	<item id="4737" price="0" /> <!-- Skull Graver - Rsk. Focus -->
-	<item id="4738" price="0" /> <!-- Dwarven War Hammer - Anger -->
-	<item id="4739" price="0" /> <!-- Dwarven War Hammer - Health -->
-	<item id="4740" price="0" /> <!-- Dwarven War Hammer - Haste -->
-	<item id="4741" price="0" /> <!-- War Axe - Anger -->
-	<item id="4742" price="0" /> <!-- War Axe - Health -->
-	<item id="4743" price="0" /> <!-- War Axe - Haste -->
-	<item id="4744" price="0" /> <!-- Yaksa Mace - Anger -->
-	<item id="4745" price="0" /> <!-- Yaksa Mace - Health -->
-	<item id="4746" price="0" /> <!-- Yaksa Mace - Rsk. Focus -->
-	<item id="7701" price="0" /> <!-- Stick of Faith - Mana Up -->
-	<item id="7702" price="0" /> <!-- Stick of Faith - Magic Hold -->
-	<item id="7703" price="0" /> <!-- Stick of Faith - Magic Shield -->
-	<item id="7704" price="0" /> <!-- Stick of Eternity - Empower -->
-	<item id="7705" price="0" /> <!-- Stick of Eternity - Rsk. Evasion -->
-	<item id="7706" price="0" /> <!-- Stick of Eternity - Blessed Body -->
-	<item id="7707" price="0" /> <!-- Nirvana Axe - M. Atk. -->
-	<item id="7708" price="0" /> <!-- Nirvana Axe - Magic Poison -->
-	<item id="7709" price="0" /> <!-- Nirvana Axe - Magic Weakness -->
-	<item id="7710" price="0" /> <!-- Club of Nature - Acumen -->
-	<item id="7711" price="0" /> <!-- Club of Nature - Mental Shield -->
-	<item id="7712" price="0" /> <!-- Club of Nature - Magic Hold -->
-	<item id="7713" price="0" /> <!-- Mace of Underworld - Mana Up -->
-	<item id="7714" price="0" /> <!-- Mace of Underworld - Magic Silence -->
-	<item id="7715" price="0" /> <!-- Mace of Underworld - Conversion -->
-	<item id="2503" price="0" /> <!-- Yaksa Mace -->
-	<item id="162" price="0" /> <!-- War Axe -->
-	<item id="202" price="0" /> <!-- Mace of Underworld -->
-	<item id="201" price="0" /> <!-- Club of Nature -->
-	<item id="196" price="0" /> <!-- Stick of Eternity -->
-	<item id="174" price="0" /> <!-- Nirvana Axe -->
-	<item id="2502" price="0" /> <!-- Dwarven War Hammer -->
-	<item id="173" price="0" /> <!-- Skull Graver -->
-	<item id="161" price="0" /> <!-- Silver Axe -->
-	<item id="160" price="0" /> <!-- Battle Axe -->
 	<item id="193" price="0" /> <!-- Stick of Faith -->
+	<item id="160" price="0" /> <!-- Battle Axe -->
+	<item id="89" price="0" /> <!-- Big Hammer -->
+	<item id="161" price="0" /> <!-- Silver Axe -->
+	<item id="173" price="0" /> <!-- Skull Graver -->
+	<item id="201" price="0" /> <!-- Club of Nature -->
+	<item id="202" price="0" /> <!-- Mace of Underworld -->
+	<item id="174" price="0" /> <!-- Nirvana Axe -->
+	<item id="196" price="0" /> <!-- Stick of Eternity -->
+	<item id="2502" price="0" /> <!-- Dwarven War Hammer -->
+	<item id="7891" price="0" /> <!-- Ecliptic Axe -->
+	<item id="162" price="0" /> <!-- War Axe -->
+	<item id="2503" price="0" /> <!-- Yaksa Mace -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009026.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009026.xml
index 92a29f78a2..7f2b66b29d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009026.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009026.xml
@@ -1,28 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="4888" price="0" /> <!-- Deadman's Staff - Magic Regeneration -->
-	<item id="4889" price="0" /> <!-- Deadman's Staff - Mental Shield -->
-	<item id="4890" price="0" /> <!-- Deadman's Staff - Magic Hold -->
-	<item id="4891" price="0" /> <!-- Ghoul's Staff - Rsk. Evasion -->
-	<item id="4892" price="0" /> <!-- Ghoul's Staff - Mana Up -->
-	<item id="4893" price="0" /> <!-- Ghoul's Staff - Blessed Body -->
-	<item id="4894" price="0" /> <!-- Demon's Staff - Magic Poison -->
-	<item id="4895" price="0" /> <!-- Demon's Staff - Magic Weakness -->
-	<item id="4896" price="0" /> <!-- Demon's Staff - Magic Chaos -->
-	<item id="6719" price="0" /> <!-- Monster Only(Ketra Orc Chieftain) -->
-	<item id="7716" price="0" /> <!-- Inferno Staff - Acumen -->
-	<item id="7717" price="0" /> <!-- Inferno Staff - Magic Silence -->
-	<item id="7718" price="0" /> <!-- Inferno Staff - Magic Paralyze -->
-	<item id="197" price="0" /> <!-- Paradia Staff -->
-	<item id="191" price="0" /> <!-- Heavy Doom Hammer -->
 	<item id="192" price="0" /> <!-- Crystal Staff -->
 	<item id="194" price="0" /> <!-- Heavy Doom Axe -->
+	<item id="191" price="0" /> <!-- Heavy Doom Hammer -->
 	<item id="195" price="0" /> <!-- Cursed Staff -->
 	<item id="198" price="0" /> <!-- Inferno Staff -->
-	<item id="199" price="0" /> <!-- Pa'agrian Hammer -->
+	<item id="199" price="0" /> <!-- Pa'agrio Hammer -->
+	<item id="197" price="0" /> <!-- Paradia Staff -->
 	<item id="200" price="0" /> <!-- Sage's Staff -->
-	<item id="203" price="0" /> <!-- Pa'agrian Axe -->
+	<item id="203" price="0" /> <!-- Pa'agrio Axe -->
 	<item id="204" price="0" /> <!-- Deadman's Staff -->
-	<item id="205" price="0" /> <!-- Ghoul's Staff -->
 	<item id="206" price="0" /> <!-- Demon's Staff -->
+	<item id="205" price="0" /> <!-- Ghoul's Staff -->
+	<item id="7898" price="0" /> <!-- Karik Horn -->
+	<item id="7897" price="0" /> <!-- Dwarven Hammer -->
+	
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009027.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009027.xml
index b91a5ce3e5..7baee77f51 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009027.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009027.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="79" price="0" /> <!-- Sword of Damascus -->
-	<item id="142" price="0" /> <!-- Keshanberk -->
-	<item id="146" price="0" /> <!-- Ghoulbane -->
 	<item id="148" price="0" /> <!-- Sword of Valhalla -->
-	<item id="4714" price="0" /> <!-- Keshanberk - Guidance -->
-	<item id="4715" price="0" /> <!-- Keshanberk - Focus -->
-	<item id="4716" price="0" /> <!-- Keshanberk - Back Blow -->
-	<item id="4717" price="0" /> <!-- Sword of Damascus - Focus -->
-	<item id="4718" price="0" /> <!-- Sword of Damascus - Critical Damage -->
-	<item id="4719" price="0" /> <!-- Sword of Damascus - Haste -->
-	<item id="7722" price="0" /> <!-- Sword of Valhalla - Acumen -->
-	<item id="7723" price="0" /> <!-- Sword of Valhalla - Magic Weakness -->
-	<item id="7724" price="0" /> <!-- Sword of Valhalla - Magic Regeneration -->
+	<item id="7889" price="0" /> <!-- Wizard's Tear -->
+	<item id="142" price="0" /> <!-- Keshanberk -->
+	<item id="79" price="0" /> <!-- Damascus -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009028.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009028.xml
index beb50cb0cf..d3590e55aa 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009028.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009028.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="78" price="0" /> <!-- Great Sword -->
-	<item id="4723" price="0" /> <!-- Great Sword - Health -->
-	<item id="4724" price="0" /> <!-- Great Sword - Critical Damage -->
-	<item id="4725" price="0" /> <!-- Great Sword - Focus -->
+	<item id="7883" price="0" /> <!-- Guardian's Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009029.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009029.xml
index 2a1130d2ba..9a359fde6d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009029.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009029.xml
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="2566" price="0" /> <!-- Stormbringer*Caliburs -->
-	<item id="2567" price="0" /> <!-- Stormbringer*Sword of Limit -->
 	<item id="2568" price="0" /> <!-- Stormbringer*Sword of Delusion -->
 	<item id="2569" price="0" /> <!-- Stormbringer*Sword of Nightmare -->
 	<item id="2570" price="0" /> <!-- Stormbringer*Tsurugi -->
-	<item id="2571" price="0" /> <!-- Stormbringer*Samurai Long sword -->
-	<item id="2576" price="0" /> <!-- Shamshir*Caliburs -->
-	<item id="2577" price="0" /> <!-- Shamshir*Sword of Limit -->
-	<item id="2578" price="0" /> <!-- Shamshir*Sword of Delusion -->
-	<item id="2579" price="0" /> <!-- Shamshir*Sword of Nightmare -->
-	<item id="2580" price="0" /> <!-- Shamshir*Tsurugi -->
-	<item id="2581" price="0" /> <!-- Shamshir*Samurai Long Sword -->
+	<item id="2567" price="0" /> <!-- Stormbringer*Ultimate Sword -->
 	<item id="2585" price="0" /> <!-- Katana*Caliburs -->
-	<item id="2586" price="0" /> <!-- Katana*Sword of Limit -->
 	<item id="2587" price="0" /> <!-- Katana*Sword of Delusion -->
 	<item id="2588" price="0" /> <!-- Katana*Sword of Nightmare -->
 	<item id="2589" price="0" /> <!-- Katana*Tsurugi -->
-	<item id="2590" price="0" /> <!-- Katana*Samurai Long Sword -->
-	<item id="2593" price="0" /> <!-- Spirit Sword*Caliburs -->
-	<item id="2594" price="0" /> <!-- Spirit Sword*Sword of Limit -->
-	<item id="2595" price="0" /> <!-- Spirit Sword*Sword of Delusion -->
-	<item id="2596" price="0" /> <!-- Spirit Sword*Sword of Nightmare -->
-	<item id="2597" price="0" /> <!-- Spirit Sword*Tsurugi -->
-	<item id="2598" price="0" /> <!-- Spirit Sword*Samurai Long Sword -->
+	<item id="2586" price="0" /> <!-- Katana*Ultimate Sword -->
 	<item id="2600" price="0" /> <!-- Raid Sword*Caliburs -->
-	<item id="2601" price="0" /> <!-- Raid Sword*Sword of Limit -->
 	<item id="2602" price="0" /> <!-- Raid Sword*Sword of Delusion -->
 	<item id="2603" price="0" /> <!-- Raid Sword*Sword of Nightmare -->
 	<item id="2604" price="0" /> <!-- Raid Sword*Tsurugi -->
-	<item id="2605" price="0" /> <!-- Raid Sword*Samurai Long Sword -->
+	<item id="2601" price="0" /> <!-- Raid Sword*Ultimate Sword -->
+	<item id="2576" price="0" /> <!-- Shamshir*Caliburs -->
+	<item id="2578" price="0" /> <!-- Shamshir*Sword of Delusion -->
+	<item id="2579" price="0" /> <!-- Shamshir*Sword of Nightmare -->
+	<item id="2580" price="0" /> <!-- Shamshir*Tsurugi -->
+	<item id="2577" price="0" /> <!-- Shamshir*Ultimate Sword -->
+	<item id="2593" price="0" /> <!-- Spirit Sword*Caliburs -->
+	<item id="2595" price="0" /> <!-- Spirit Sword*Sword of Delusion -->
+	<item id="2596" price="0" /> <!-- Spirit Sword*Sword of Nightmare -->
+	<item id="2597" price="0" /> <!-- Spirit Sword*Tsurugi -->
+	<item id="2594" price="0" /> <!-- Spirit Sword*Ultimate Sword -->
 	<item id="2606" price="0" /> <!-- Caliburs*Caliburs -->
-	<item id="2607" price="0" /> <!-- Caliburs*Sword of Limit -->
 	<item id="2608" price="0" /> <!-- Caliburs*Sword of Delusion -->
 	<item id="2609" price="0" /> <!-- Caliburs*Sword of Nightmare -->
 	<item id="2610" price="0" /> <!-- Caliburs*Tsurugi -->
-	<item id="2611" price="0" /> <!-- Caliburs*Samurai Long Sword -->
-	<item id="2612" price="0" /> <!-- Sword of Limit*Sword of Limit -->
-	<item id="2613" price="0" /> <!-- Sword of Limit*Sword of Delusion -->
-	<item id="2614" price="0" /> <!-- Sword of Limit*Sword of Nightmare -->
-	<item id="2615" price="0" /> <!-- Sword of Limit*Tsurugi -->
-	<item id="2616" price="0" /> <!-- Sword of Limit*Samurai Long Sword -->
+	<item id="2607" price="0" /> <!-- Caliburs*Ultimate Sword -->
+	<item id="2571" price="0" /> <!-- Stormbringer*Samurai Long sword -->
 	<item id="2617" price="0" /> <!-- Sword of Delusion*Sword of Delusion -->
 	<item id="2618" price="0" /> <!-- Sword of Delusion*Sword of Nightmare -->
 	<item id="2619" price="0" /> <!-- Sword of Delusion*Tsurugi -->
-	<item id="2620" price="0" /> <!-- Sword of Delusion*Samurai Long Sword -->
 	<item id="2621" price="0" /> <!-- Sword of Nightmare*Sword of Nightmare -->
 	<item id="2622" price="0" /> <!-- Sword of Nightmare*Tsurugi -->
-	<item id="2623" price="0" /> <!-- Sword of Nightmare*Samurai Long Sword -->
 	<item id="2624" price="0" /> <!-- Tsurugi*Tsurugi -->
+	<item id="2613" price="0" /> <!-- Ultimate Sword*Sword of Delusion -->
+	<item id="2614" price="0" /> <!-- Ultimate Sword*Sword of Nightmare -->
+	<item id="2615" price="0" /> <!-- Ultimate Sword*Tsurugi -->
+	<item id="2612" price="0" /> <!-- Ultimate Sword*Ultimate Sword -->
+	<item id="2590" price="0" /> <!-- Katana*Samurai Long Sword -->
+	<item id="2605" price="0" /> <!-- Raid Sword*Samurai Long Sword -->
+	<item id="2581" price="0" /> <!-- Shamshir*Samurai Long Sword -->
+	<item id="2598" price="0" /> <!-- Spirit Sword*Samurai Long Sword -->
+	<item id="2611" price="0" /> <!-- Caliburs*Samurai Long Sword -->
+	<item id="2620" price="0" /> <!-- Sword of Delusion*Samurai Long Sword -->
+	<item id="2623" price="0" /> <!-- Sword of Nightmare*Samurai Long Sword -->
 	<item id="2625" price="0" /> <!-- Tsurugi*Samurai Long Sword -->
+	<item id="2616" price="0" /> <!-- Ultimate Sword*Samurai Long Sword -->
 	<item id="2626" price="0" /> <!-- Samurai Long Sword*Samurai Long Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009030.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009030.xml
index 7091db8fe2..5cb950a512 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009030.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009030.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="243" price="0" /> <!-- Twilight Knife -->
 	<item id="229" price="0" /> <!-- Kris -->
 	<item id="234" price="0" /> <!-- Demon's Dagger -->
-	<item id="243" price="0" /> <!-- Hell Knife -->
-	<item id="4777" price="0" /> <!-- Kris - Evasion -->
-	<item id="4778" price="0" /> <!-- Kris - Focus -->
-	<item id="4779" price="0" /> <!-- Kris - Back Blow -->
-	<item id="4780" price="0" /> <!-- Demon's Dagger - Critical Bleed -->
-	<item id="4781" price="0" /> <!-- Demon's Dagger - Critical Poison -->
-	<item id="4782" price="0" /> <!-- Demon's Dagger - Mortal Strike -->
-	<item id="6359" price="0" /> <!-- Demon's Dagger - Critical Damage -->
-	<item id="7813" price="0" /> <!-- Hell Knife - Magic Regeneration -->
-	<item id="7814" price="0" /> <!-- Hell Knife - Mental Shield -->
-	<item id="7815" price="0" /> <!-- Hell Knife - Magic Weakness -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009031.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009031.xml
index 59b2b47721..b8396f074d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009031.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009031.xml
@@ -2,11 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="284" price="0" /> <!-- Dark Elven Long Bow -->
 	<item id="287" price="0" /> <!-- Bow of Peril -->
-	<item id="4825" price="0" /> <!-- Dark Elven Long Bow - Evasion -->
-	<item id="4826" price="0" /> <!-- Dark Elven Long Bow - Critical Bleed -->
-	<item id="4827" price="0" /> <!-- Dark Elven Long Bow - Miser -->
-	<item id="4828" price="0" /> <!-- Bow of Peril - Guidance -->
-	<item id="4829" price="0" /> <!-- Bow of Peril - Quick Recovery -->
-	<item id="4830" price="0" /> <!-- Bow of Peril - Cheap Shot -->
 	<item id="1343" price="0" /> <!-- Silver Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009032.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009032.xml
index 21f0642b74..54e6fcccb0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009032.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009032.xml
@@ -3,10 +3,4 @@
 	<item id="264" price="0" /> <!-- Pata -->
 	<item id="267" price="0" /> <!-- Arthro Nail -->
 	<item id="268" price="0" /> <!-- Bellion Cestus -->
-	<item id="4801" price="0" /> <!-- Arthro Nail - Critical Poison -->
-	<item id="4802" price="0" /> <!-- Arthro Nail - Rsk. Evasion -->
-	<item id="4803" price="0" /> <!-- Arthro Nail - Rsk. Haste -->
-	<item id="4804" price="0" /> <!-- Bellion Cestus - Critical Drain -->
-	<item id="4805" price="0" /> <!-- Bellion Cestus - Critical Poison -->
-	<item id="4806" price="0" /> <!-- Bellion Cestus - Rsk. Haste -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009033.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009033.xml
index 4436abf60d..28396bb47c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009033.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009033.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="97" price="0" /> <!-- Lance -->
 	<item id="300" price="0" /> <!-- Great Axe -->
-	<item id="4855" price="0" /> <!-- Great Axe - Anger -->
-	<item id="4856" price="0" /> <!-- Great Axe - Critical Stun -->
-	<item id="4857" price="0" /> <!-- Great Axe - Light -->
-	<item id="4858" price="0" /> <!-- Lance - Anger -->
-	<item id="4859" price="0" /> <!-- Lance - Critical Stun -->
-	<item id="4860" price="0" /> <!-- Lance - Towering Blow -->
+	<item id="97" price="0" /> <!-- Lance -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009034.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009034.xml
index af7e439f8f..a796f66e26 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009034.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009034.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="7892" price="0" /> <!-- Spell Breaker -->
+	<item id="7893" price="0" /> <!-- Heavy War Axe -->
 	<item id="91" price="0" /> <!-- Heavy War Axe -->
-	<item id="171" price="0" /> <!-- Deadman's Glory -->
 	<item id="175" price="0" /> <!-- Art of Battle Axe -->
-	<item id="4747" price="0" /> <!-- Heavy War Axe - Anger -->
-	<item id="4748" price="0" /> <!-- Heavy War Axe - Health -->
-	<item id="4749" price="0" /> <!-- Heavy War Axe - Rsk. Focus -->
-	<item id="4750" price="0" /> <!-- Deadman's Glory - Anger -->
-	<item id="4751" price="0" /> <!-- Deadman's Glory - Health -->
-	<item id="4752" price="0" /> <!-- Deadman's Glory - Haste -->
-	<item id="4753" price="0" /> <!-- Art of Battle Axe - Health -->
-	<item id="4754" price="0" /> <!-- Art of Battle Axe - Rsk. Focus -->
-	<item id="4755" price="0" /> <!-- Art of Battle Axe - Haste -->
+	<item id="171" price="0" /> <!-- Deadman's Glory -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009035.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009035.xml
index 9a3a663a08..a944156b69 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009035.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009035.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="92" price="0" /> <!-- Sprite's Staff -->
-	<item id="207" price="0" /> <!-- Staff of Phantom -->
-	<item id="208" price="0" /> <!-- Staff of Seal -->
-	<item id="209" price="0" /> <!-- Divine Staff -->
+	<item id="92" price="0" /> <!-- Spirit's Staff -->
 	<item id="210" price="0" /> <!-- Staff of Evil Spirits -->
-	<item id="211" price="0" /> <!-- Staff of Nobility -->
-	<item id="4897" price="0" /> <!-- Sprite's Staff - Magic Regeneration -->
-	<item id="4898" price="0" /> <!-- Sprite's Staff - Mental Shield -->
-	<item id="4899" price="0" /> <!-- Sprite's Staff - Magic Hold -->
-	<item id="4900" price="0" /> <!-- Staff of Evil Spirits - Magic Focus -->
-	<item id="4901" price="0" /> <!-- Staff of Evil Spirits - Blessed Body -->
-	<item id="4902" price="0" /> <!-- Staff of Evil Spirits - Magic Poison -->
+	<item id="7900" price="0" /> <!-- Ice Storm Hammer -->
+	<item id="7901" price="0" /> <!-- Star Buster -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009036.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009036.xml
index 16780d3c54..afaf036a1b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009036.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009036.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="80" price="0" /> <!-- Tallum Blade -->
 	<item id="150" price="0" /> <!-- Elemental Sword -->
 	<item id="151" price="0" /> <!-- Sword of Miracles -->
+	<item id="8686" price="0" /> <!-- Themis' Tongue -->
+	<item id="80" price="0" /> <!-- Tallum Blade -->
 	<item id="2500" price="0" /> <!-- Dark Legion's Edge -->
-	<item id="5635" price="0" /> <!-- Tallum Blade - Critical Poison -->
-	<item id="5636" price="0" /> <!-- Tallum Blade - Haste -->
-	<item id="5637" price="0" /> <!-- Tallum Blade - Anger -->
-	<item id="5638" price="0" /> <!-- Elemental Sword - M. Atk. -->
-	<item id="5639" price="0" /> <!-- Elemental Sword - Magic Paralyze -->
-	<item id="5640" price="0" /> <!-- Elemental Sword - Empower -->
-	<item id="5641" price="0" /> <!-- Sword of Miracles - M. Atk. -->
-	<item id="5642" price="0" /> <!-- Sword of Miracles - Magic Silence -->
-	<item id="5643" price="0" /> <!-- Sword of Miracles - Acumen -->
-	<item id="5647" price="0" /> <!-- Dark Legion's Edge - Critical Damage -->
-	<item id="5648" price="0" /> <!-- Dark Legion's Edge - Health -->
-	<item id="5649" price="0" /> <!-- Dark Legion's Edge - Rsk. Focus -->
+	<item id="8678" price="0" /> <!-- Sirra's Blade -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009037.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009037.xml
index 976bc711b4..251a892ef6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009037.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009037.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="7884" price="0" /> <!-- Infernal Master -->
 	<item id="81" price="0" /> <!-- Dragon Slayer -->
-	<item id="5644" price="0" /> <!-- Dragon Slayer - Health -->
-	<item id="5645" price="0" /> <!-- Dragon Slayer - Critical Bleed -->
-	<item id="5646" price="0" /> <!-- Dragon Slayer - Critical Drain -->
+	<item id="8679" price="0" /> <!-- Sword of Ipos -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009038.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009038.xml
index 61016de041..d506a12075 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009038.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009038.xml
@@ -3,4 +3,5 @@
 	<item id="5233" price="0" /> <!-- Keshanberk*Keshanberk -->
 	<item id="5705" price="0" /> <!-- Keshanberk*Damascus -->
 	<item id="5706" price="0" /> <!-- Damascus*Damascus -->
+	<item id="8938" price="0" /> <!-- Tallum Blade*Damascus -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009039.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009039.xml
index 936abc1f93..cff29e0e50 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009039.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009039.xml
@@ -2,10 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="235" price="0" /> <!-- Bloody Orchid -->
 	<item id="236" price="0" /> <!-- Soul Separator -->
-	<item id="5614" price="0" /> <!-- Bloody Orchid - Focus -->
-	<item id="5615" price="0" /> <!-- Bloody Orchid - Back Blow -->
-	<item id="5616" price="0" /> <!-- Bloody Orchid - Critical Bleed -->
-	<item id="5617" price="0" /> <!-- Soul Separator - Guidance -->
-	<item id="5618" price="0" /> <!-- Soul Separator - Critical Damage -->
-	<item id="5619" price="0" /> <!-- Soul Separator - Rsk. Haste -->
+	<item id="8682" price="0" /> <!-- Naga Storm -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009040.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009040.xml
index 9afb32b628..9e31151cb3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009040.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009040.xml
@@ -2,11 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="288" price="0" /> <!-- Carnage Bow -->
 	<item id="289" price="0" /> <!-- Soul Bow -->
-	<item id="5608" price="0" /> <!-- Carnage Bow - Light -->
-	<item id="5609" price="0" /> <!-- Carnage Bow - Critical Bleed -->
-	<item id="5610" price="0" /> <!-- Carnage Bow - Mana Up -->
-	<item id="5611" price="0" /> <!-- Soul Bow - Cheap Shot -->
-	<item id="5612" price="0" /> <!-- Soul Bow - Quick Recovery -->
-	<item id="5613" price="0" /> <!-- Soul Bow - Critical Poison -->
+	<item id="8684" price="0" /> <!-- Shyeed's Bow -->
 	<item id="1344" price="0" /> <!-- Mithril Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009041.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009041.xml
index 212c87c360..bffdcb5bad 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009041.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009041.xml
@@ -2,10 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="269" price="0" /> <!-- Blood Tornado -->
 	<item id="270" price="0" /> <!-- Dragon Grinder -->
-	<item id="5620" price="0" /> <!-- Blood Tornado - Haste -->
-	<item id="5621" price="0" /> <!-- Blood Tornado - Focus -->
-	<item id="5622" price="0" /> <!-- Blood Tornado - Anger -->
-	<item id="5623" price="0" /> <!-- Dragon Grinder - Rsk. Evasion -->
-	<item id="5624" price="0" /> <!-- Dragon Grinder - Guidance -->
-	<item id="5625" price="0" /> <!-- Dragon Grinder - Health -->
+	<item id="8685" price="0" /> <!-- Sobekk's Hurricane -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009042.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009042.xml
index 00cd3c9b01..e2c6094470 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009042.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009042.xml
@@ -2,10 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="98" price="0" /> <!-- Halberd -->
 	<item id="305" price="0" /> <!-- Tallum Glaive -->
-	<item id="5626" price="0" /> <!-- Halberd - Haste -->
-	<item id="5627" price="0" /> <!-- Halberd - Critical Stun -->
-	<item id="5628" price="0" /> <!-- Halberd - Wide Blow -->
-	<item id="5632" price="0" /> <!-- Tallum Glaive - Guidance -->
-	<item id="5633" price="0" /> <!-- Tallum Glaive - Health -->
-	<item id="5634" price="0" /> <!-- Tallum Glaive - Wide Blow -->
+	<item id="8683" price="0" /> <!-- Tiphon's Spear -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009043.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009043.xml
index cd682a1050..4e6e460fa4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009043.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009043.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="164" price="0" /> <!-- Elysian -->
+	<item id="7894" price="0" /> <!-- Spiritual Eye -->
+	<item id="7895" price="0" /> <!-- Flaming Dragon Skull -->
+	<item id="8687" price="0" /> <!-- Cabrio's Hand -->
 	<item id="2504" price="0" /> <!-- Meteor Shower -->
-	<item id="5599" price="0" /> <!-- Meteor Shower - Focus -->
-	<item id="5600" price="0" /> <!-- Meteor Shower - Critical Bleed -->
-	<item id="5601" price="0" /> <!-- Meteor Shower - Rsk. Haste -->
-	<item id="5602" price="0" /> <!-- Elysian - Health -->
-	<item id="5603" price="0" /> <!-- Elysian - Anger -->
-	<item id="5604" price="0" /> <!-- Elysian - Critical Drain -->
+	<item id="164" price="0" /> <!-- Elysian -->
+	<item id="8680" price="0" /> <!-- Barakiel's Axe -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009044.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009044.xml
index cc016bc43f..db90303038 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009044.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009044.xml
@@ -2,10 +2,8 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="212" price="0" /> <!-- Dasparion's Staff -->
 	<item id="213" price="0" /> <!-- Branch of the Mother Tree -->
-	<item id="5596" price="0" /> <!-- Dasparion's Staff - Mana Up -->
-	<item id="5597" price="0" /> <!-- Dasparion's Staff - Conversion -->
-	<item id="5598" price="0" /> <!-- Dasparion's Staff - Acumen -->
-	<item id="5605" price="0" /> <!-- Branch of the Mother Tree - Conversion -->
-	<item id="5606" price="0" /> <!-- Branch of the Mother Tree - Magic Damage -->
-	<item id="5607" price="0" /> <!-- Branch of the Mother Tree - Acumen -->
+	<item id="8688" price="0" /> <!-- Daimon Crystal -->
+	<item id="7899" price="0" /> <!-- Destroyer Hammer -->
+	<item id="7902" price="0" /> <!-- Doom Crusher -->
+	<item id="8681" price="0" /> <!-- Behemoth' Tuning Fork -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009952.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009952.xml
index 6808fcb188..6e9272f38b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009952.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009952.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="47" price="0" /> <!-- Helmet -->
 	<item id="58" price="0" /> <!-- Mithril Breastplate -->
 	<item id="59" price="0" /> <!-- Mithril Gaiters -->
-	<item id="47" price="0" /> <!-- Helmet -->
 	<item id="628" price="0" /> <!-- Hoplon -->
+	<item id="2411" price="0" /> <!-- Brigandine Helmet -->
 	<item id="352" price="0" /> <!-- Brigandine Tunic -->
 	<item id="2378" price="0" /> <!-- Brigandine Gaiters -->
-	<item id="2411" price="0" /> <!-- Brigandine Helmet -->
 	<item id="2493" price="0" /> <!-- Brigandine Shield -->
 	<item id="394" price="0" /> <!-- Reinforced Leather Shirt -->
 	<item id="416" price="0" /> <!-- Reinforced Leather Gaiters -->
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009953.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009953.xml
index ae5cd7af7a..5f710ac332 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009953.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009953.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="60" price="0" /> <!-- Composite Armor -->
 	<item id="517" price="0" /> <!-- Composite Helmet -->
+	<item id="60" price="0" /> <!-- Composite Armor -->
 	<item id="64" price="0" /> <!-- Composite Boots -->
 	<item id="107" price="0" /> <!-- Composite Shield -->
 	<item id="354" price="0" /> <!-- Chain Mail Shirt -->
@@ -10,8 +10,8 @@
 	<item id="2453" price="0" /> <!-- Chain Gloves -->
 	<item id="2429" price="0" /> <!-- Chain Boots -->
 	<item id="2495" price="0" /> <!-- Chain Shield -->
-	<item id="356" price="0" /> <!-- Full Plate Armor -->
 	<item id="2414" price="0" /> <!-- Full Plate Helmet -->
+	<item id="356" price="0" /> <!-- Full Plate Armor -->
 	<item id="2462" price="0" /> <!-- Full Plate Gauntlets -->
 	<item id="2438" price="0" /> <!-- Full Plate Boots -->
 	<item id="2497" price="0" /> <!-- Full Plate Shield -->
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009954.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009954.xml
index 1e75b92bfa..584403d96b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009954.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009954.xml
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="357" price="0" /> <!-- Zubei's Breastplate -->
-	<item id="383" price="0" /> <!-- Zubei's Gaiters -->
-	<item id="503" price="0" /> <!-- Zubei's Helmet -->
+	<item id="90458" price="0" /> <!-- Zubei's Helmet - Heavy Armor -->
+	<item id="357" price="0" /> <!-- Zubei's Breastplate - Heavy Armor -->
+	<item id="383" price="0" /> <!-- Zubei's Gaiters - Heavy Armor -->
 	<item id="5710" price="0" /> <!-- Zubei's Gauntlets - Heavy Armor -->
 	<item id="5726" price="0" /> <!-- Zubei's Boots - Heavy Armor -->
-	<item id="633" price="0" /> <!-- Zubei's Shield -->
-	<item id="358" price="0" /> <!-- Blue Wolf Breastplate -->
-	<item id="2380" price="0" /> <!-- Blue Wolf Gaiters -->
-	<item id="2416" price="0" /> <!-- Blue Wolf Helmet -->
-	<item id="5718" price="0" /> <!-- Blue Wolf Gloves - Heavy Armor -->
-	<item id="5734" price="0" /> <!-- Blue Wolf Boots - Heavy Armor -->
-	<item id="2376" price="0" /> <!-- Avadon Breastplate -->
-	<item id="2379" price="0" /> <!-- Avadon Gaiters -->
-	<item id="2415" price="0" /> <!-- Avadon Circlet -->
-	<item id="5714" price="0" /> <!-- Avadon Gloves - Heavy Armor -->
-	<item id="5730" price="0" /> <!-- Avadon Boots - Heavy Armor -->
-	<item id="673" price="0" /> <!-- Avadon Shield -->
-	<item id="2381" price="0" /> <!-- Doom Plate Armor -->
-	<item id="2417" price="0" /> <!-- Doom Helmet -->
-	<item id="5722" price="0" /> <!-- Doom Gloves - Heavy Armor -->
-	<item id="5738" price="0" /> <!-- Doom Boots - Heavy Armor -->
-	<item id="110" price="0" /> <!-- Doom Shield -->
-	<item id="2384" price="0" /> <!-- Zubei's Leather Shirt -->
-	<item id="2388" price="0" /> <!-- Zubei's Leather Gaiters -->
+	<item id="633" price="0" /> <!-- Zubei's Shield - Heavy Armor -->
+	<item id="90459" price="0" /> <!-- Zubei's Helmet - Light Armor -->
+	<item id="2384" price="0" /> <!-- Zubei's Leather Shirt - Light Armor -->
+	<item id="2388" price="0" /> <!-- Zubei's Leather Gaiters - Light Armor -->
 	<item id="5711" price="0" /> <!-- Zubei's Gauntlets - Light Armor -->
 	<item id="5727" price="0" /> <!-- Zubei's Boots - Light Armor -->
-	<item id="2390" price="0" /> <!-- Avadon Leather Armor -->
-	<item id="5715" price="0" /> <!-- Avadon Gloves - Light Armor -->
-	<item id="5731" price="0" /> <!-- Avadon Boots - Light Armor -->
-	<item id="2391" price="0" /> <!-- Blue Wolf Leather Armor -->
+	<item id="90460" price="0" /> <!-- Zubei's Helmet - Robe Armor -->
+	<item id="2397" price="0" /> <!-- Tunic of Zubei - Robe Armor -->
+	<item id="2402" price="0" /> <!-- Stockings of Zubei - Robe Armor -->
+	<item id="5712" price="0" /> <!-- Zubei's Gauntlets - Robe Armor -->
+	<item id="5728" price="0" /> <!-- Zubei's Boots - Robe Armor -->
+	<item id="90461" price="0" /> <!-- Blue Wolf Helmet - Heavy Armor -->
+	<item id="358" price="0" /> <!-- Blue Wolf Breastplate - Heavy Armor -->
+	<item id="2380" price="0" /> <!-- Blue Wolf Gaiters - Heavy Armor -->
+	<item id="5718" price="0" /> <!-- Blue Wolf Gloves - Heavy Armor -->
+	<item id="5734" price="0" /> <!-- Blue Wolf Boots - Heavy Armor -->
+	<item id="90462" price="0" /> <!-- Blue Wolf Helmet - Light Armor -->
+	<item id="2391" price="0" /> <!-- Blue Wolf Leather Armor - Light Armor -->
 	<item id="5719" price="0" /> <!-- Blue Wolf Gloves - Light Armor -->
 	<item id="5735" price="0" /> <!-- Blue Wolf Boots - Light Armor -->
-	<item id="2392" price="0" /> <!-- Leather Armor of Doom -->
+	<item id="90463" price="0" /> <!-- Blue Wolf Helmet - Robe Armor -->
+	<item id="2398" price="0" /> <!-- Blue Wolf Tunic - Robe Armor -->
+	<item id="2403" price="0" /> <!-- Blue Wolf Stockings - Robe Armor -->
+	<item id="5720" price="0" /> <!-- Blue Wolf Gloves - Robe Armor -->
+	<item id="5736" price="0" /> <!-- Blue Wolf Boots - Robe Armor -->
+	<item id="90455" price="0" /> <!-- Avadon Circlet - Heavy Armor -->
+	<item id="2376" price="0" /> <!-- Avadon Breastplate - Heavy Armor -->
+	<item id="2379" price="0" /> <!-- Avadon Gaiters - Heavy Armor -->
+	<item id="5714" price="0" /> <!-- Avadon Gloves - Heavy Armor -->
+	<item id="5730" price="0" /> <!-- Avadon Boots - Heavy Armor -->
+	<item id="673" price="0" /> <!-- Avadon Shield - Heavy Armor -->
+	<item id="90456" price="0" /> <!-- Avadon Circlet - Light Armor -->
+	<item id="2390" price="0" /> <!-- Avadon Leather Armor - Light Armor -->
+	<item id="5715" price="0" /> <!-- Avadon Gloves - Light Armor -->
+	<item id="5731" price="0" /> <!-- Avadon Boots - Light Armor -->
+	<item id="90457" price="0" /> <!-- Avadon Circlet - Robe Armor -->
+	<item id="2406" price="0" /> <!-- Avadon Robe Armor - Robe Armor -->
+	<item id="5716" price="0" /> <!-- Avadon Gloves - Robe Armor -->
+	<item id="5732" price="0" /> <!-- Avadon Boots - Robe Armor -->
+	<item id="90464" price="0" /> <!-- Doom Helmet - Heavy Armor -->
+	<item id="2381" price="0" /> <!-- Doom Plate Armor - Heavy Armor -->
+	<item id="5722" price="0" /> <!-- Doom Gloves - Heavy Armor -->
+	<item id="5738" price="0" /> <!-- Doom Boots - Heavy Armor -->
+	<item id="110" price="0" /> <!-- Doom Shield - Heavy Armor -->
+	<item id="90465" price="0" /> <!-- Doom Helmet - Light Armor -->
+	<item id="2392" price="0" /> <!-- Leather Armor of Doom - Light Armor -->
 	<item id="5723" price="0" /> <!-- Doom Gloves - Light Armor -->
 	<item id="5739" price="0" /> <!-- Doom Boots - Light Armor -->
-	<item id="2397" price="0" /> <!-- Tunic of Zubei -->
-	<item id="2402" price="0" /> <!-- Stockings of Zubei -->
-	<item id="5712" price="0" /> <!-- Zubei's Gauntlets - Robe -->
-	<item id="5728" price="0" /> <!-- Zubei's Boots - Robe -->
-	<item id="2398" price="0" /> <!-- Blue Wolf Tunic -->
-	<item id="2403" price="0" /> <!-- Blue Wolf Stockings -->
-	<item id="5720" price="0" /> <!-- Blue Wolf Gloves - Robe -->
-	<item id="5736" price="0" /> <!-- Blue Wolf Boots - Robe -->
-	<item id="2399" price="0" /> <!-- Tunic of Doom -->
-	<item id="2404" price="0" /> <!-- Stockings of Doom -->
-	<item id="5724" price="0" /> <!-- Doom Gloves - Robe -->
-	<item id="5740" price="0" /> <!-- Doom Boots - Robe -->
-	<item id="2406" price="0" /> <!-- Avadon Robe -->
-	<item id="5716" price="0" /> <!-- Avadon Gloves - Robe -->
-	<item id="5732" price="0" /> <!-- Avadon Boots - Robe -->
-	<item id="554" price="0" /> <!-- Sealed Zubei's Boots -->
-	<item id="612" price="0" /> <!-- Sealed Zubei's Gauntlets -->
-	<item id="2439" price="0" /> <!-- Sealed Blue Wolf Boots -->
-	<item id="2487" price="0" /> <!-- Sealed Blue Wolf Gloves -->
-	<item id="600" price="0" /> <!-- Sealed Avadon Boots -->
-	<item id="2464" price="0" /> <!-- Sealed Avadon Gloves -->
-	<item id="601" price="0" /> <!-- Sealed Doom Boots -->
-	<item id="2475" price="0" /> <!-- Sealed Doom Gloves -->
+	<item id="90466" price="0" /> <!-- Doom Helmet - Robe Armor -->
+	<item id="2399" price="0" /> <!-- Tunic of Doom - Robe Armor -->
+	<item id="2404" price="0" /> <!-- Stockings of Doom - Robe Armor -->
+	<item id="5724" price="0" /> <!-- Doom Gloves - Robe Armor -->
+	<item id="5740" price="0" /> <!-- Doom Boots - Robe Armor -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009955.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009955.xml
index 32c33c4339..d73da51c83 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009955.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009955.xml
@@ -1,77 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="365" price="0" /> <!-- Dark Crystal Breastplate -->
-	<item id="388" price="0" /> <!-- Dark Crystal Gaiters -->
-	<item id="512" price="0" /> <!-- Dark Crystal Helmet -->
+	<item id="90470" price="0" /> <!-- Dark Crystal Helmet - Heavy Armor -->
+	<item id="365" price="0" /> <!-- Dark Crystal Breastplate - Heavy Armor -->
+	<item id="388" price="0" /> <!-- Dark Crystal Gaiters - Heavy Armor -->
 	<item id="5765" price="0" /> <!-- Dark Crystal Gloves - Heavy Armor -->
 	<item id="5777" price="0" /> <!-- Dark Crystal Boots - Heavy Armor -->
-	<item id="641" price="0" /> <!-- Dark Crystal Shield -->
-	<item id="2382" price="0" /> <!-- Tallum Plate Armor -->
-	<item id="547" price="0" /> <!-- Tallum Helm -->
-	<item id="5768" price="0" /> <!-- Tallum Gloves - Heavy Armor -->
-	<item id="5780" price="0" /> <!-- Tallum Boots - Heavy Armor -->
-	<item id="2385" price="0" /> <!-- Dark Crystal Leather Armor -->
-	<item id="2389" price="0" /> <!-- Dark Crystal Leggings -->
+	<item id="641" price="0" /> <!-- Dark Crystal Shield - Heavy Armor -->
+	<item id="90471" price="0" /> <!-- Dark Crystal Helmet - Light Armor -->
+	<item id="2385" price="0" /> <!-- Dark Crystal Leather Armor - Light Armor -->
+	<item id="2389" price="0" /> <!-- Dark Crystal Leggings - Light Armor -->
 	<item id="5766" price="0" /> <!-- Dark Crystal Gloves - Light Armor -->
 	<item id="5778" price="0" /> <!-- Dark Crystal Boots - Light Armor -->
-	<item id="2393" price="0" /> <!-- Tallum Leather Armor -->
+	<item id="90472" price="0" /> <!-- Dark Crystal Helmet - Robe Armor -->
+	<item id="2407" price="0" /> <!-- Dark Crystal Robe Armor - Robe Armor -->
+	<item id="5767" price="0" /> <!-- Dark Crystal Gloves - Robe Armor -->
+	<item id="5779" price="0" /> <!-- Dark Crystal Boots - Robe Armor -->
+	<item id="90467" price="0" /> <!-- Tallum Helm - Heavy Armor -->
+	<item id="2382" price="0" /> <!-- Tallum Plate Armor - Heavy Armor -->
+	<item id="5768" price="0" /> <!-- Tallum Gloves - Heavy Armor -->
+	<item id="5780" price="0" /> <!-- Tallum Boots - Heavy Armor -->
+	<item id="90468" price="0" /> <!-- Tallum Helm - Light Armor -->
+	<item id="2393" price="0" /> <!-- Tallum Leather Armor - Light Armor -->
 	<item id="5769" price="0" /> <!-- Tallum Gloves - Light Armor -->
 	<item id="5781" price="0" /> <!-- Tallum Boots - Light Armor -->
-	<item id="2400" price="0" /> <!-- Tallum Tunic -->
-	<item id="2405" price="0" /> <!-- Tallum Stockings -->
-	<item id="5770" price="0" /> <!-- Tallum Gloves - Robe -->
-	<item id="5782" price="0" /> <!-- Tallum Boots - Robe -->
-	<item id="2407" price="0" /> <!-- Dark Crystal Robe -->
-	<item id="5767" price="0" /> <!-- Dark Crystal Gloves - Robe -->
-	<item id="5779" price="0" /> <!-- Dark Crystal Boots - Robe -->
-	<item id="374" price="0" /> <!-- Armor of Nightmare -->
-	<item id="2418" price="0" /> <!-- Helm of Nightmare -->
+	<item id="90469" price="0" /> <!-- Tallum Helm - Robe Armor -->
+	<item id="2400" price="0" /> <!-- Tallum Tunic - Robe Armor -->
+	<item id="2405" price="0" /> <!-- Tallum Stockings - Robe Armor -->
+	<item id="5770" price="0" /> <!-- Tallum Gloves - Robe Armor -->
+	<item id="5782" price="0" /> <!-- Tallum Boots - Robe Armor -->
+	<item id="90473" price="0" /> <!-- Helm of Nightmare - Heavy Armor -->
+	<item id="374" price="0" /> <!-- Armor of Nightmare - Heavy Armor -->
 	<item id="5771" price="0" /> <!-- Gauntlets of Nightmare - Heavy Armor -->
 	<item id="5783" price="0" /> <!-- Boots of Nightmare - Heavy Armor -->
-	<item id="2498" price="0" /> <!-- Shield of Nightmare -->
-	<item id="2383" price="0" /> <!-- Majestic Plate Armor -->
-	<item id="2419" price="0" /> <!-- Majestic Circlet -->
-	<item id="5774" price="0" /> <!-- Majestic Gauntlets - Heavy Armor -->
-	<item id="5786" price="0" /> <!-- Majestic Boots - Heavy Armor -->
-	<item id="2394" price="0" /> <!-- Leather Armor of Nightmare -->
+	<item id="2498" price="0" /> <!-- Shield of Nightmare - Heavy Armor -->
+	<item id="90474" price="0" /> <!-- Helm of Nightmare - Light Armor -->
+	<item id="2394" price="0" /> <!-- Leather Armor of Nightmare - Light Armor -->
 	<item id="5772" price="0" /> <!-- Gauntlets of Nightmare - Light Armor -->
 	<item id="5784" price="0" /> <!-- Boots of Nightmare - Light Armor -->
-	<item id="2395" price="0" /> <!-- Majestic Leather Armor -->
+	<item id="90475" price="0" /> <!-- Helm of Nightmare - Robe Armor -->
+	<item id="2408" price="0" /> <!-- Robe Armor of Nightmare - Robe Armor -->
+	<item id="5773" price="0" /> <!-- Gauntlets of Nightmare - Robe Armor -->
+	<item id="5785" price="0" /> <!-- Boots of Nightmare - Robe Armor -->
+	<item id="90476" price="0" /> <!-- Majestic Circlet - Heavy Armor -->
+	<item id="2383" price="0" /> <!-- Majestic Plate Armor - Heavy Armor -->
+	<item id="5774" price="0" /> <!-- Majestic Gauntlets - Heavy Armor -->
+	<item id="5786" price="0" /> <!-- Majestic Boots - Heavy Armor -->
+	<item id="90477" price="0" /> <!-- Majestic Circlet - Light Armor -->
+	<item id="2395" price="0" /> <!-- Majestic Leather Armor - Light Armor -->
 	<item id="5775" price="0" /> <!-- Majestic Gauntlets - Light Armor -->
 	<item id="5787" price="0" /> <!-- Majestic Boots - Light Armor -->
-	<item id="2408" price="0" /> <!-- Robe of Nightmare -->
-	<item id="5773" price="0" /> <!-- Gauntlets of Nightmare - Robe -->
-	<item id="5785" price="0" /> <!-- Boots of Nightmare - Robe -->
-	<item id="2409" price="0" /> <!-- Majestic Robe -->
-	<item id="5776" price="0" /> <!-- Majestic Gauntlets - Robe -->
-	<item id="5788" price="0" /> <!-- Majestic Boots - Robe -->
-	<item id="5287" price="0" /> <!-- Sealed Dark Crystal breastplate -->
-	<item id="5288" price="0" /> <!-- Sealed Dark Crystal Gaiters -->
-	<item id="5289" price="0" /> <!-- Sealed Dark Crystal Helmet -->
-	<item id="5290" price="0" /> <!-- Sealed Dark Crystal Gloves -->
-	<item id="5291" price="0" /> <!-- Sealed Dark Crystal Boots -->
-	<item id="5292" price="0" /> <!-- Sealed Dark Crystal Shield -->
-	<item id="5297" price="0" /> <!-- Sealed Dark Crystal Leather Armor -->
-	<item id="5298" price="0" /> <!-- Sealed Dark Crystal Leggings -->
-	<item id="5308" price="0" /> <!-- Sealed Dark Crystal Robe -->
-	<item id="5293" price="0" /> <!-- Sealed Tallum Plate Armor -->
-	<item id="5294" price="0" /> <!-- Sealed Tallum Helmet -->
-	<item id="5295" price="0" /> <!-- Sealed Tallum Gloves -->
-	<item id="5296" price="0" /> <!-- Sealed Tallum Boots -->
-	<item id="5301" price="0" /> <!-- Sealed Tallum Leather Armor -->
-	<item id="5304" price="0" /> <!-- Sealed Tallum Tunic -->
-	<item id="5305" price="0" /> <!-- Sealed Tallum Stockings -->
-	<item id="5311" price="0" /> <!-- Sealed Armor of Nightmare -->
-	<item id="5312" price="0" /> <!-- Sealed Helm of Nightmare -->
-	<item id="5313" price="0" /> <!-- Sealed Gauntlets of Nightmare -->
-	<item id="5314" price="0" /> <!-- Sealed Boots of Nightmare -->
-	<item id="5315" price="0" /> <!-- Sealed Shield of Nightmare -->
-	<item id="5320" price="0" /> <!-- Sealed Leather Armor of Nightmare -->
-	<item id="5326" price="0" /> <!-- Sealed Robe of Nightmare -->
-	<item id="5316" price="0" /> <!-- Sealed Majestic Plate Armor -->
-	<item id="5317" price="0" /> <!-- Sealed Majestic Circlet -->
-	<item id="5318" price="0" /> <!-- Sealed Majestic Gauntlets -->
-	<item id="5319" price="0" /> <!-- Sealed Majestic Boots -->
-	<item id="5323" price="0" /> <!-- Sealed Majestic Leather Armor -->
-	<item id="5329" price="0" /> <!-- Sealed Majestic Robe -->
+	<item id="90478" price="0" /> <!-- Majestic Circlet - Robe Armor -->
+	<item id="2409" price="0" /> <!-- Majestic Robe Armor - Robe Armor -->
+	<item id="5776" price="0" /> <!-- Majestic Gauntlets - Robe Armor -->
+	<item id="5788" price="0" /> <!-- Majestic Boots - Robe Armor -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009959.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009959.xml
index 8b396c5b43..ccbc509050 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009959.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/buylists/custom/0009959.xml
@@ -9,5 +9,5 @@
 	<item id="7856" price="0" /> <!-- Clan Oath Boots - Light Armor -->
 	<item id="7857" price="0" /> <!-- Clan Oath Aketon -->
 	<item id="7858" price="0" /> <!-- Clan Oath Padded Gloves - Robe -->
-	<item id="7859" price="0" /> <!-- Clan Oath Sandals - Robe -->
+	<item id="7859" price="0" /> <!-- Clan Oath Sandals - Robe --> <!-- Kamen -->
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/gmstore/gear/weapons.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/gmstore/gear/weapons.htm
index 65fe04f4c9..803e9daac3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/gmstore/gear/weapons.htm
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/gmstore/gear/weapons.htm
@@ -39,7 +39,7 @@
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9997" value="A Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/weapons/a.htm" value="A Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009001.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009001.xml
index 39430eba1f..1d9ced18b0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009001.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009001.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="308" price="0" /> <!-- Buffalo's Horn -->
+	<item id="2369" price="0" /> <!-- Squire's Sword -->
 	<item id="1" price="0" /> <!-- Short Sword -->
-	<item id="2" price="0" /> <!-- Long Sword -->
 	<item id="3" price="0" /> <!-- Broadsword -->
+	<item id="738" price="0" /> <!-- Sword of Solidarity -->
+	<item id="1510" price="0" /> <!-- Butcher's Sword -->
+	<item id="975" price="0" /> <!-- Blood Saber -->
+	<item id="743" price="0" /> <!-- Sword of Sentinel -->
 	<item id="66" price="0" /> <!-- Gladius -->
+	<item id="122" price="0" /> <!-- Handmade Sword -->
 	<item id="67" price="0" /> <!-- Orcish Sword -->
-	<item id="68" price="0" /> <!-- Falchion -->
+	<item id="3029" price="0" /> <!-- Orcish Sword -->
+	<item id="1142" price="0" /> <!-- Rusted Bronze Sword -->
+	<item id="2" price="0" /> <!-- Long Sword -->
 	<item id="120" price="0" /> <!-- Sword of Reflection -->
 	<item id="121" price="0" /> <!-- Sword of Watershadow -->
-	<item id="122" price="0" /> <!-- Handmade Sword -->
-	<item id="738" price="0" /> <!-- Sword of Solidarity -->
-	<item id="743" price="0" /> <!-- Sword of Sentinel -->
-	<item id="975" price="0" /> <!-- Blood Saber -->
-	<item id="1142" price="0" /> <!-- Rusted Bronze Sword -->
-	<item id="1295" price="0" /> <!-- Long Sword -->
-	<item id="1296" price="0" /> <!-- Gladius -->
-	<item id="1297" price="0" /> <!-- Bastard Sword -->
-	<item id="1298" price="0" /> <!-- Caliburs -->
-	<item id="1510" price="0" /> <!-- Butcher's Sword -->
-	<item id="2369" price="0" /> <!-- Squire's Sword -->
-	<item id="3029" price="0" /> <!-- Sword of Binding -->
-	<item id="4027" price="0" /> <!-- Bouquet -->
-	<item id="4202" price="0" /> <!-- Chrono Cithara -->
-	<item id="4219" price="0" /> <!-- Dream Sword -->
+	<item id="68" price="0" /> <!-- Falchion -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009003.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009003.xml
index 8632803dae..c05cba8bc6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009003.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009003.xml
@@ -2,19 +2,16 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="10" price="0" /> <!-- Dagger -->
 	<item id="11" price="0" /> <!-- Bone Dagger -->
-	<item id="12" price="0" /> <!-- Knife -->
+	<item id="3471" price="0" /> <!-- Cybellin's Dagger -->
 	<item id="215" price="0" /> <!-- Doom Dagger -->
+	<item id="12" price="0" /> <!-- Knife -->
+	<item id="2372" price="0" /> <!-- Dagger of Adept -->
+	<item id="989" price="0" /> <!-- Eldritch Dagger -->
+	<item id="2374" price="0" /> <!-- Red Sunset Dagger -->
 	<item id="216" price="0" /> <!-- Dirk -->
+	<item id="946" price="0" /> <!-- Skeleton Dagger -->
+	<item id="1182" price="0" /> <!-- Neti's Dagger -->
 	<item id="217" price="0" /> <!-- Shining Knife -->
 	<item id="218" price="0" /> <!-- Throwing Knife -->
 	<item id="219" price="0" /> <!-- Sword Breaker -->
-	<item id="946" price="0" /> <!-- Skeleton Dagger -->
-	<item id="989" price="0" /> <!-- Eldritch Dagger -->
-	<item id="1182" price="0" /> <!-- Neti's Dagger -->
-	<item id="1305" price="0" /> <!-- Knife -->
-	<item id="1306" price="0" /> <!-- Crafted Dagger -->
-	<item id="2372" price="0" /> <!-- Dagger of Adept -->
-	<item id="2374" price="0" /> <!-- Red Sunset Dagger -->
-	<item id="3471" price="0" /> <!-- Cybellin's Dagger -->
-	<item id="4220" price="0" /> <!-- Dream Knife -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009004.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009004.xml
index 57c23094b3..c2917f6552 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009004.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009004.xml
@@ -2,12 +2,11 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="13" price="0" /> <!-- Short Bow -->
 	<item id="14" price="0" /> <!-- Bow -->
-	<item id="271" price="0" /> <!-- Hunting Bow -->
-	<item id="272" price="0" /> <!-- Forest Bow -->
-	<item id="273" price="0" /> <!-- Composite Bow -->
-	<item id="1181" price="0" /> <!-- Neti's Bow -->
-	<item id="1213" price="0" /> <!-- Guard's Bow -->
-	<item id="1307" price="0" /> <!-- Bow -->
 	<item id="3028" price="0" /> <!-- Crescent Moon Bow -->
+	<item id="271" price="0" /> <!-- Hunting Bow -->
+	<item id="1181" price="0" /> <!-- Neti's Bow -->
+	<item id="272" price="0" /> <!-- Forest Bow -->
+	<item id="1213" price="0" /> <!-- Guard's Bow -->
+	<item id="273" price="0" /> <!-- Composite Bow -->
 	<item id="17" price="0" /> <!-- Wooden Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009005.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009005.xml
index 36d9648e08..3c547578db 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009005.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009005.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="2368" price="0" /> <!-- Training Gloves -->
 	<item id="253" price="0" /> <!-- Spiked Gloves -->
 	<item id="254" price="0" /> <!-- Iron Gloves -->
+	<item id="2371" price="0" /> <!-- Fist of Butcher -->
 	<item id="255" price="0" /> <!-- Fox Claw Gloves -->
 	<item id="256" price="0" /> <!-- Cestus -->
 	<item id="257" price="0" /> <!-- Viper Fang -->
-	<item id="2368" price="0" /> <!-- Training Gloves -->
-	<item id="2371" price="0" /> <!-- Fist of Butcher -->
-	<item id="5133" price="0" /> <!-- Chrono Unitus -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009006.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009006.xml
index d7d715a2c4..6fc4e88700 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009006.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009006.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="15" price="0" /> <!-- Short Spear -->
-	<item id="16" price="0" /> <!-- Great Spear -->
-	<item id="1302" price="0" /> <!-- Bec de Corbin -->
-	<item id="1303" price="0" /> <!-- Lance -->
 	<item id="3026" price="0" /> <!-- Talins Spear -->
-	<item id="5817" price="0" /> <!-- Chrono Campana -->
+	<item id="16" price="0" /> <!-- Great Spear -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009007.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009007.xml
index 83ea0a60e0..f49e6f8628 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009007.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009007.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="4" price="0" /> <!-- Club -->
-	<item id="5" price="0" /> <!-- Mace -->
 	<item id="6" price="0" /> <!-- Apprentice's Wand -->
 	<item id="7" price="0" /> <!-- Apprentice's Rod -->
-	<item id="87" price="0" /> <!-- Iron Hammer -->
-	<item id="152" price="0" /> <!-- Heavy Chisel -->
-	<item id="153" price="0" /> <!-- Sigil -->
-	<item id="154" price="0" /> <!-- Dwarven Mace -->
-	<item id="155" price="0" /> <!-- Flanged Mace -->
-	<item id="747" price="0" /> <!-- Wand of Adept -->
-	<item id="748" price="0" /> <!-- Gallint's Oak Wand -->
-	<item id="1300" price="0" /> <!-- Apprentice's Rod -->
-	<item id="1301" price="0" /> <!-- Big Hammer -->
-	<item id="1511" price="0" /> <!-- Silversmith Hammer -->
 	<item id="2370" price="0" /> <!-- Guild Member's Club -->
+	<item id="4" price="0" /> <!-- Club -->
+	<item id="152" price="0" /> <!-- Heavy Chisel -->
+	<item id="5" price="0" /> <!-- Mace -->
+	<item id="747" price="0" /> <!-- Wand of Adept -->
+	<item id="153" price="0" /> <!-- Sickle -->
+	<item id="1511" price="0" /> <!-- Silversmith Hammer -->
+	<item id="154" price="0" /> <!-- Dwarven Mace -->
 	<item id="2501" price="0" /> <!-- Bone Club -->
-	<item id="4221" price="0" /> <!-- Ubiquitous Axe -->
+	<item id="155" price="0" /> <!-- Flanged Mace -->
+	<item id="87" price="0" /> <!-- Iron Hammer -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009008.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009008.xml
index 7334960d0c..2d76d487c4 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009008.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009008.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="8" price="0" /> <!-- Willow Staff -->
+	<item id="2373" price="0" /> <!-- Eldritch Staff -->
+	<item id="754" price="0" /> <!-- Red Sunset Staff -->
+	<item id="744" price="0" /> <!-- Staff of Sentinel -->
 	<item id="9" price="0" /> <!-- Cedar Staff -->
 	<item id="176" price="0" /> <!-- Apprentice's Staff -->
 	<item id="177" price="0" /> <!-- Mage Staff -->
-	<item id="744" price="0" /> <!-- Staff of Sentinel -->
-	<item id="754" price="0" /> <!-- Red Sunset Staff -->
-	<item id="1304" price="0" /> <!-- Conjuror's Staff -->
-	<item id="2373" price="0" /> <!-- Eldritch Staff -->
-	<item id="7058" price="0" /> <!-- Chrono Darbuka -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009009.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009009.xml
index 464496df10..be0fbe4fbb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009009.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009009.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="69" price="0" /> <!-- Bastard Sword -->
-	<item id="83" price="0" /> <!-- Sword of Magic -->
+	<item id="7885" price="0" /> <!-- Priest Sword -->
 	<item id="123" price="0" /> <!-- Saber -->
-	<item id="125" price="0" /> <!-- Spinebone Sword -->
-	<item id="126" price="0" /> <!-- Artisan's Sword -->
-	<item id="127" price="0" /> <!-- Crimson Sword -->
-	<item id="128" price="0" /> <!-- Knight's Sword -->
-	<item id="129" price="0" /> <!-- Sword of Revolution -->
-	<item id="130" price="0" /> <!-- Elven Sword -->
+	<item id="83" price="0" /> <!-- Sword of Magic -->
 	<item id="143" price="0" /> <!-- Sword of Mystic -->
 	<item id="144" price="0" /> <!-- Sword of Occult -->
+	<item id="126" price="0" /> <!-- Artisan's Sword -->
+	<item id="69" price="0" /> <!-- Bastard Sword -->
+	<item id="128" price="0" /> <!-- Knight's Sword -->
+	<item id="125" price="0" /> <!-- Spinebone Sword -->
+	<item id="7886" price="0" /> <!-- Sword of Magic Fog -->
+	<item id="127" price="0" /> <!-- Crimson Sword -->
+	<item id="130" price="0" /> <!-- Elven Sword -->
+	<item id="129" price="0" /> <!-- Sword of Revolution -->
 	<item id="2499" price="0" /> <!-- Elven Long Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009010.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009010.xml
index 26102a4458..92316b3b48 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009010.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009010.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="70" price="0" /> <!-- Claymore -->
-	<item id="124" price="0" /> <!-- Two-Handed Sword -->
 	<item id="5285" price="0" /> <!-- Heavy Sword -->
-	<item id="5791" price="0" /> <!-- Tomb Guard A -->
-	<item id="5792" price="0" /> <!-- Tomb Guard B -->
-	<item id="5795" price="0" /> <!-- Tomb Guard A -->
-	<item id="5796" price="0" /> <!-- Tomb Guard B -->
+	<item id="7880" price="0" /> <!-- Steel Sword -->
+	<item id="124" price="0" /> <!-- Two-Handed Sword -->
+	<item id="7881" price="0" /> <!-- Lesser Giant's Sword -->
+	<item id="70" price="0" /> <!-- Claymore -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009011.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009011.xml
index 761914e5d2..916031dadc 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009011.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009011.xml
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="2516" price="0" /> <!-- Saber*Saber -->
-	<item id="2517" price="0" /> <!-- Saber*Bastard Sword -->
-	<item id="2518" price="0" /> <!-- Saber*Spinebone Sword -->
 	<item id="2519" price="0" /> <!-- Saber*Artisan's Sword -->
+	<item id="2517" price="0" /> <!-- Saber*Bastard Sword -->
 	<item id="2520" price="0" /> <!-- Saber*Knight's Sword -->
-	<item id="2521" price="0" /> <!-- Saber*Crimson Sword -->
-	<item id="2522" price="0" /> <!-- Saber*Elven Sword -->
+	<item id="2518" price="0" /> <!-- Saber*Spinebone Sword -->
+	<item id="2540" price="0" /> <!-- Artisan's Sword*Artisan's Sword -->
+	<item id="2541" price="0" /> <!-- Artisan's Sword*Knight's Sword -->
+	<item id="2527" price="0" /> <!-- Bastard Sword*Artisan's Sword -->
 	<item id="2525" price="0" /> <!-- Bastard Sword*Bastard Sword -->
 	<item id="2526" price="0" /> <!-- Bastard Sword*Spinebone Sword -->
-	<item id="2527" price="0" /> <!-- Bastard Sword*Artisan's Sword -->
 	<item id="2528" price="0" /> <!-- Bastard Sword*Knight's Sword -->
-	<item id="2529" price="0" /> <!-- Bastard Sword*Crimson Sword -->
-	<item id="2530" price="0" /> <!-- Bastard Sword*Elven Sword -->
+	<item id="2546" price="0" /> <!-- Knight's Sword*Knight's Sword -->
+	<item id="2521" price="0" /> <!-- Saber*Crimson Sword -->
+	<item id="2522" price="0" /> <!-- Saber*Elven Sword -->
 	<item id="2533" price="0" /> <!-- Spinebone Sword*Spinebone Sword -->
 	<item id="2534" price="0" /> <!-- Spinebone Sword*Artisan's Sword -->
 	<item id="2535" price="0" /> <!-- Spinebone Sword*Knight's Sword -->
-	<item id="2536" price="0" /> <!-- Spinebone Sword*Crimson Sword -->
-	<item id="2537" price="0" /> <!-- Spinebone Sword*Elven Sword -->
-	<item id="2540" price="0" /> <!-- Artisan's Sword*Artisan's Sword -->
-	<item id="2541" price="0" /> <!-- Artisan's Sword*Knight's Sword -->
 	<item id="2542" price="0" /> <!-- Artisan's Sword*Crimson Sword -->
 	<item id="2543" price="0" /> <!-- Artisan's Sword*Elven Sword -->
-	<item id="2546" price="0" /> <!-- Knight's Sword*Knight's Sword -->
+	<item id="2529" price="0" /> <!-- Bastard Sword*Crimson Sword -->
+	<item id="2530" price="0" /> <!-- Bastard Sword*Elven Sword -->
 	<item id="2547" price="0" /> <!-- Knight's Sword*Crimson Sword -->
 	<item id="2548" price="0" /> <!-- Knight's Sword*Elven Sword -->
-	<item id="5129" price="0" /> <!-- Doll Knife -->
+	<item id="2536" price="0" /> <!-- Spinebone Sword*Crimson Sword -->
+	<item id="2537" price="0" /> <!-- Spinebone Sword*Elven Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009012.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009012.xml
index 6c276a3d38..835d727d32 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009012.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009012.xml
@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="220" price="0" /> <!-- Crafted Dagger -->
 	<item id="221" price="0" /> <!-- Assassin Knife -->
-	<item id="222" price="0" /> <!-- Poniard Dagger -->
-	<item id="223" price="0" /> <!-- Kukuri -->
-	<item id="224" price="0" /> <!-- Maingauche -->
-	<item id="225" price="0" /> <!-- Mithril Dagger -->
+	<item id="220" price="0" /> <!-- Crafted Dagger -->
+	<item id="240" price="0" /> <!-- Conjurer's Knife -->
 	<item id="238" price="0" /> <!-- Dagger of Mana -->
 	<item id="239" price="0" /> <!-- Mystic Knife -->
-	<item id="240" price="0" /> <!-- Conjurer's Knife -->
+	<item id="222" price="0" /> <!-- Poniard Dagger -->
 	<item id="241" price="0" /> <!-- Shilen Knife -->
-	<item id="1471" price="0" /> <!-- Silenos Blowgun -->
+	<item id="223" price="0" /> <!-- Kukuri -->
 	<item id="1660" price="0" /> <!-- Cursed Maingauche -->
-	<item id="2507" price="0" /> <!-- Lizardspear -->
-	<item id="4028" price="0" /> <!-- Giant Cannon -->
-	<item id="5127" price="0" /> <!-- Dailaon Knife -->
-	<item id="5128" price="0" /> <!-- Crokian Blade -->
-	<item id="5130" price="0" /> <!-- Nos Sword -->
-	<item id="5131" price="0" /> <!-- Parhit Staff -->
-	<item id="5132" price="0" /> <!-- Giant Trident -->
+	<item id="224" price="0" /> <!-- Maingauche -->
+	<item id="225" price="0" /> <!-- Mithril Dagger -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009013.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009013.xml
index aa02831e23..f3f3c06790 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009013.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009013.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="274" price="0" /> <!-- Reinforced Bow -->
-	<item id="275" price="0" /> <!-- Long Bow -->
-	<item id="276" price="0" /> <!-- Elven Bow -->
 	<item id="277" price="0" /> <!-- Dark Elven Bow -->
+	<item id="276" price="0" /> <!-- Elven Bow -->
+	<item id="275" price="0" /> <!-- Long Bow -->
 	<item id="278" price="0" /> <!-- Gastraphetes -->
 	<item id="279" price="0" /> <!-- Reinforced Long Bow -->
 	<item id="280" price="0" /> <!-- Light Crossbow -->
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009015.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009015.xml
index 0c8d284eaf..8d1d221e56 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009015.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009015.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="93" price="0" /> <!-- Winged Spear -->
 	<item id="291" price="0" /> <!-- Trident -->
+	<item id="295" price="0" /> <!-- Dwarven Trident -->
 	<item id="292" price="0" /> <!-- Pike -->
+	<item id="296" price="0" /> <!-- Dwarven Pike -->
 	<item id="293" price="0" /> <!-- War Hammer -->
 	<item id="294" price="0" /> <!-- War Pick -->
-	<item id="295" price="0" /> <!-- Dwarven Trident -->
-	<item id="296" price="0" /> <!-- Dwarven Pike -->
+	<item id="93" price="0" /> <!-- Winged Spear -->
 	<item id="297" price="0" /> <!-- Glaive -->
-	<item id="1376" price="0" /> <!-- Guard Spear -->
-	<item id="1472" price="0" /> <!-- Dreadbane -->
-	<item id="3937" price="0" /> <!-- Giant Bar -->
-	<item id="3938" price="0" /> <!-- Giant Rod -->
-	<item id="3939" price="0" /> <!-- Lady's Fan -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009016.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009016.xml
index 4504f2eca8..b40d300e9e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009016.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009016.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="86" price="0" /> <!-- Tomahawk -->
-	<item id="88" price="0" /> <!-- Morning Star -->
 	<item id="156" price="0" /> <!-- Hand Axe -->
-	<item id="157" price="0" /> <!-- Spiked Club -->
-	<item id="158" price="0" /> <!-- Tarbar -->
-	<item id="159" price="0" /> <!-- Bonebreaker -->
 	<item id="166" price="0" /> <!-- Heavy Mace -->
 	<item id="167" price="0" /> <!-- Scalpel -->
 	<item id="168" price="0" /> <!-- Work Hammer -->
-	<item id="169" price="0" /> <!-- Skull Breaker -->
-	<item id="172" price="0" /> <!-- Heavy Bone Club -->
-	<item id="179" price="0" /> <!-- Mace of Prayer -->
+	<item id="182" price="0" /> <!-- Doom Hammer -->
 	<item id="180" price="0" /> <!-- Mace of Judgment -->
 	<item id="181" price="0" /> <!-- Mace of Miracle -->
-	<item id="182" price="0" /> <!-- Doom Hammer -->
+	<item id="179" price="0" /> <!-- Mace of Prayer -->
+	<item id="86" price="0" /> <!-- Tomahawk -->
+	<item id="7890" price="0" /> <!-- Priest Mace -->
+	<item id="157" price="0" /> <!-- Spiked Club -->
 	<item id="189" price="0" /> <!-- Staff of Life -->
+	<item id="172" price="0" /> <!-- Heavy Bone Club -->
+	<item id="88" price="0" /> <!-- Morning Star -->
+	<item id="169" price="0" /> <!-- Skull Breaker -->
+	<item id="158" price="0" /> <!-- Tarbar -->
+	<item id="159" price="0" /> <!-- Bonebreaker -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009017.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009017.xml
index 9f1f9b8454..1e8b6aa064 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009017.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009017.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="90" price="0" /> <!-- Goat Head Staff -->
 	<item id="178" price="0" /> <!-- Bone Staff -->
-	<item id="183" price="0" /> <!-- Mystic Staff -->
 	<item id="184" price="0" /> <!-- Conjuror's Staff -->
+	<item id="183" price="0" /> <!-- Mystic Staff -->
 	<item id="185" price="0" /> <!-- Staff of Mana -->
 	<item id="186" price="0" /> <!-- Staff of Magic -->
+	<item id="90" price="0" /> <!-- Goat Head Staff -->
 	<item id="187" price="0" /> <!-- Atuba Hammer -->
-	<item id="188" price="0" /> <!-- Ghost Staff -->
 	<item id="190" price="0" /> <!-- Atuba Mace -->
+	<item id="188" price="0" /> <!-- Ghost Staff -->
+	<item id="7896" price="0" /> <!-- Lesser Giant's Hammer -->
+
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009018.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009018.xml
index dabde201a0..cd31996078 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009018.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009018.xml
@@ -1,61 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="72" price="0" /> <!-- Stormbringer -->
-	<item id="73" price="0" /> <!-- Shamshir -->
+	<item id="84" price="0" /> <!-- Homunkulus's Sword -->
+	<item id="145" price="0" /> <!-- Sword of Whispering Death -->
 	<item id="74" price="0" /> <!-- Katana -->
+	<item id="133" price="0" /> <!-- Raid Sword -->
+	<item id="73" price="0" /> <!-- Shamshir -->
+	<item id="131" price="0" /> <!-- Spirit Sword -->
 	<item id="75" price="0" /> <!-- Caliburs -->
 	<item id="76" price="0" /> <!-- Sword of Delusion -->
-	<item id="77" price="0" /> <!-- Tsurugi -->
-	<item id="84" price="0" /> <!-- Homunkulus's Sword -->
-	<item id="131" price="0" /> <!-- Spirit Sword -->
-	<item id="132" price="0" /> <!-- Sword of Limit -->
-	<item id="133" price="0" /> <!-- Raid Sword -->
 	<item id="134" price="0" /> <!-- Sword of Nightmare -->
+	<item id="77" price="0" /> <!-- Tsurugi -->
 	<item id="135" price="0" /> <!-- Samurai Longsword -->
-	<item id="145" price="0" /> <!-- Sword of Whispering Death -->
-	<item id="4681" price="0" /> <!-- Stormbringer - Critical Anger -->
-	<item id="4682" price="0" /> <!-- Stormbringer - Focus -->
-	<item id="4683" price="0" /> <!-- Stormbringer - Light -->
-	<item id="4684" price="0" /> <!-- Shamshir - Guidance -->
-	<item id="4685" price="0" /> <!-- Shamshir - Back Blow -->
-	<item id="4686" price="0" /> <!-- Shamshir - Rsk. Evasion -->
-	<item id="4687" price="0" /> <!-- Katana - Focus -->
-	<item id="4688" price="0" /> <!-- Katana - Critical Damage -->
-	<item id="4689" price="0" /> <!-- Katana - Haste -->
-	<item id="4690" price="0" /> <!-- Spirit Sword - Critical Damage -->
-	<item id="4691" price="0" /> <!-- Spirit Sword - Critical Poison -->
-	<item id="4692" price="0" /> <!-- Spirit Sword - Haste -->
-	<item id="4693" price="0" /> <!-- Raid Sword - Focus -->
-	<item id="4694" price="0" /> <!-- Raid Sword - Critical Drain -->
-	<item id="4695" price="0" /> <!-- Raid Sword - Critical Poison -->
-	<item id="4696" price="0" /> <!-- Caliburs - Guidance -->
-	<item id="4697" price="0" /> <!-- Caliburs - Focus -->
-	<item id="4698" price="0" /> <!-- Caliburs - Critical Damage -->
-	<item id="4699" price="0" /> <!-- Sword of Delusion - Focus -->
-	<item id="4700" price="0" /> <!-- Sword of Delusion - Health -->
-	<item id="4701" price="0" /> <!-- Sword of Delusion - Rsk. Haste -->
-	<item id="4702" price="0" /> <!-- Tsurugi - Focus -->
-	<item id="4703" price="0" /> <!-- Tsurugi - Critical Damage -->
-	<item id="4704" price="0" /> <!-- Tsurugi - Haste -->
-	<item id="4705" price="0" /> <!-- Sword of Nightmare - Health -->
-	<item id="4706" price="0" /> <!-- Sword of Nightmare - Focus -->
-	<item id="4707" price="0" /> <!-- Sword of Nightmare - Light -->
-	<item id="4708" price="0" /> <!-- Samurai Longsword - Focus -->
-	<item id="4709" price="0" /> <!-- Samurai Longsword - Critical Damage -->
-	<item id="4710" price="0" /> <!-- Samurai Longsword - Haste -->
-	<item id="5793" price="0" /> <!-- Tomb Savant A -->
-	<item id="5794" price="0" /> <!-- Tomb Savant B -->
-	<item id="5797" price="0" /> <!-- Tomb Savant A -->
-	<item id="5798" price="0" /> <!-- Tomb Savant B -->
-	<item id="5800" price="0" /> <!-- Nephilim Lord -->
-	<item id="5801" price="0" /> <!-- For NPC (Dusk) -->
-	<item id="6307" price="0" /> <!-- Sword of Limit - Guidance -->
-	<item id="6308" price="0" /> <!-- Sword of Limit - Critical Drain -->
-	<item id="6309" price="0" /> <!-- Sword of Limit - Health -->
-	<item id="6310" price="0" /> <!-- Sword of Whispering Death - Empower -->
-	<item id="6311" price="0" /> <!-- Sword of Whispering Death - M. Atk. -->
-	<item id="6312" price="0" /> <!-- Sword of Whispering Death - Magic Silence -->
-	<item id="6313" price="0" /> <!-- Homunkulus's Sword - Acumen -->
-	<item id="6314" price="0" /> <!-- Homunkulus's Sword - Conversion -->
-	<item id="6315" price="0" /> <!-- Homunkulus's Sword - Magic Paralyze -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009019.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009019.xml
index 84e753eb78..10c758d75d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009019.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009019.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="71" price="0" /> <!-- Flamberge -->
-	<item id="4711" price="0" /> <!-- Flamberge - Critical Damage -->
-	<item id="4712" price="0" /> <!-- Flamberge - Focus -->
-	<item id="4713" price="0" /> <!-- Flamberge - Light -->
+	<item id="7882" price="0" /> <!-- Pa'agrian Sword -->
 	<item id="5286" price="0" /> <!-- Berserker Blade -->
-	<item id="6347" price="0" /> <!-- Berserker Blade - Focus -->
-	<item id="6348" price="0" /> <!-- Berserker Blade - Critical Damage -->
-	<item id="6349" price="0" /> <!-- Berserker Blade - Haste -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009020.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009020.xml
index 2eaeec49f5..8db83494df 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009020.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009020.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="2523" price="0" /> <!-- Saber*Sword of Revolution -->
-	<item id="2524" price="0" /> <!-- Saber*Elven Long Sword -->
-	<item id="2531" price="0" /> <!-- Bastard Sword*Sword of Revolution -->
-	<item id="2532" price="0" /> <!-- Bastard Sword*Elven Long Sword -->
-	<item id="2538" price="0" /> <!-- Spinebone Sword*Sword of Revolution -->
-	<item id="2539" price="0" /> <!-- Spinebone Sword*Elven Long Sword -->
-	<item id="2544" price="0" /> <!-- Artisan's Sword*Sword of Revolution -->
-	<item id="2545" price="0" /> <!-- Artisan's Sword*Elven Long Sword -->
-	<item id="2549" price="0" /> <!-- Knight's Sword*Sword of Revolution -->
-	<item id="2550" price="0" /> <!-- Knight's Sword*Elven Long Sword -->
 	<item id="2551" price="0" /> <!-- Crimson Sword*Crimson Sword -->
 	<item id="2552" price="0" /> <!-- Crimson Sword*Elven Sword -->
-	<item id="2553" price="0" /> <!-- Crimson Sword*Sword of Revolution -->
-	<item id="2554" price="0" /> <!-- Crimson Sword*Elven Long Sword -->
 	<item id="2555" price="0" /> <!-- Elven Sword*Elven Sword -->
+	<item id="2523" price="0" /> <!-- Saber*Sword of Revolution -->
+	<item id="2544" price="0" /> <!-- Artisan's Sword*Sword of Revolution -->
+	<item id="2531" price="0" /> <!-- Bastard Sword*Sword of Revolution -->
+	<item id="2549" price="0" /> <!-- Knight's Sword*Sword of Revolution -->
+	<item id="2538" price="0" /> <!-- Spinebone Sword*Sword of Revolution -->
+	<item id="2524" price="0" /> <!-- Saber*Elven Long Sword -->
+	<item id="2545" price="0" /> <!-- Artisan's Sword*Elven Long Sword -->
+	<item id="2532" price="0" /> <!-- Bastard Sword*Elven Long Sword -->
+	<item id="2553" price="0" /> <!-- Crimson Sword*Sword of Revolution -->
 	<item id="2556" price="0" /> <!-- Elven Sword*Sword of Revolution -->
+	<item id="2550" price="0" /> <!-- Knight's Sword*Elven Long Sword -->
+	<item id="2539" price="0" /> <!-- Spinebone Sword*Elven Long Sword -->
+	<item id="2554" price="0" /> <!-- Crimson Sword*Elven Long Sword -->
 	<item id="2557" price="0" /> <!-- Elven Sword*Elven Long Sword -->
 	<item id="2558" price="0" /> <!-- Sword of Revolution*Sword of Revolution -->
 	<item id="2559" price="0" /> <!-- Sword of Revolution*Elven Long Sword -->
 	<item id="2560" price="0" /> <!-- Elven Long Sword*Elven Long Sword -->
 	<item id="2561" price="0" /> <!-- Stormbringer*Stormbringer -->
-	<item id="2562" price="0" /> <!-- Stormbringer*Shamshir -->
 	<item id="2563" price="0" /> <!-- Stormbringer*Katana -->
-	<item id="2564" price="0" /> <!-- Stormbringer*Spirit Sword -->
 	<item id="2565" price="0" /> <!-- Stormbringer*Raid Sword -->
+	<item id="2562" price="0" /> <!-- Stormbringer*Shamshir -->
+	<item id="2564" price="0" /> <!-- Stormbringer*Spirit Sword -->
 	<item id="2572" price="0" /> <!-- Shamshir*Shamshir -->
 	<item id="2573" price="0" /> <!-- Shamshir*Katana -->
 	<item id="2574" price="0" /> <!-- Shamshir*Spirit Sword -->
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009021.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009021.xml
index 54fec1a484..fb4e7715e2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009021.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009021.xml
@@ -1,35 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="226" price="0" /> <!-- Cursed Dagger -->
-	<item id="227" price="0" /> <!-- Stiletto -->
-	<item id="228" price="0" /> <!-- Crystal Dagger -->
-	<item id="230" price="0" /> <!-- Wolverine Needle -->
-	<item id="231" price="0" /> <!-- Grace Dagger -->
-	<item id="232" price="0" /> <!-- Dark Elven Dagger -->
-	<item id="233" price="0" /> <!-- Dark Screamer -->
 	<item id="242" price="0" /> <!-- Soulfire Dirk -->
-	<item id="4759" price="0" /> <!-- Cursed Dagger - Critical Bleed -->
-	<item id="4760" price="0" /> <!-- Cursed Dagger - Critical Poison -->
-	<item id="4761" price="0" /> <!-- Cursed Dagger - Rsk. Haste -->
-	<item id="4762" price="0" /> <!-- Dark Elven Dagger - Focus -->
-	<item id="4763" price="0" /> <!-- Dark Elven Dagger - Back Blow -->
-	<item id="4764" price="0" /> <!-- Dark Elven Dagger - Mortal Strike -->
-	<item id="4765" price="0" /> <!-- Stiletto - Critical Bleed -->
-	<item id="4766" price="0" /> <!-- Stiletto - Critical Poison -->
-	<item id="4767" price="0" /> <!-- Stiletto - Mortal Strike -->
-	<item id="4768" price="0" /> <!-- Grace Dagger - Evasion -->
-	<item id="4769" price="0" /> <!-- Grace Dagger - Focus -->
-	<item id="4770" price="0" /> <!-- Grace Dagger - Back Blow -->
-	<item id="4771" price="0" /> <!-- Dark Screamer - Evasion -->
-	<item id="4772" price="0" /> <!-- Dark Screamer - Focus -->
-	<item id="4773" price="0" /> <!-- Dark Screamer - Critical Bleed -->
-	<item id="4774" price="0" /> <!-- Crystal Dagger - Critical Bleed -->
-	<item id="4775" price="0" /> <!-- Crystal Dagger - Critical Poison -->
-	<item id="4776" price="0" /> <!-- Crystal Dagger - Mortal Strike -->
-	<item id="6356" price="0" /> <!-- Dark Elven Dagger - Rsk. Haste -->
-	<item id="6357" price="0" /> <!-- Stiletto - Rsk. Haste -->
-	<item id="6358" price="0" /> <!-- Crystal Dagger - Critical Damage -->
-	<item id="7810" price="0" /> <!-- Soulfire Dirk - Mana Up -->
-	<item id="7811" price="0" /> <!-- Soulfire Dirk - Magic Hold -->
-	<item id="7812" price="0" /> <!-- Soulfire Dirk - Magic Silence -->
+	<item id="226" price="0" /> <!-- Cursed Dagger -->
+	<item id="232" price="0" /> <!-- Dark Elven Dagger -->
+	<item id="230" price="0" /> <!-- Needle Wolverine -->
+	<item id="227" price="0" /> <!-- Stiletto -->
+	<item id="233" price="0" /> <!-- Dark Screamer -->
+	<item id="231" price="0" /> <!-- Grace Dagger -->
+	<item id="228" price="0" /> <!-- Crystal Dagger -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009022.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009022.xml
index 805b5d0ec0..bdb4a1c912 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009022.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009022.xml
@@ -1,24 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="281" price="0" /> <!-- Crystallized Ice Bow -->
+	<item id="285" price="0" /> <!-- Noble Elven Bow -->
 	<item id="282" price="0" /> <!-- Elemental Bow -->
 	<item id="283" price="0" /> <!-- Akat Long Bow -->
-	<item id="285" price="0" /> <!-- Noble Elven Bow -->
 	<item id="286" price="0" /> <!-- Eminence Bow -->
-	<item id="4810" price="0" /> <!-- Crystallized Ice Bow - Guidance -->
-	<item id="4811" price="0" /> <!-- Crystallized Ice Bow - Evasion -->
-	<item id="4812" price="0" /> <!-- Crystallized Ice Bow - Quick Recovery -->
-	<item id="4813" price="0" /> <!-- Elemental Bow - Guidance -->
-	<item id="4814" price="0" /> <!-- Elemental Bow - Miser -->
-	<item id="4815" price="0" /> <!-- Elemental Bow - Quick Recovery -->
-	<item id="4816" price="0" /> <!-- Noble Elven Bow - Evasion -->
-	<item id="4817" price="0" /> <!-- Noble Elven Bow - Miser -->
-	<item id="4818" price="0" /> <!-- Noble Elven Bow - Cheap Shot -->
-	<item id="4819" price="0" /> <!-- Akat Long Bow - Guidance -->
-	<item id="4820" price="0" /> <!-- Akat Long Bow - Evasion -->
-	<item id="4821" price="0" /> <!-- Akat Long Bow - Miser -->
-	<item id="4822" price="0" /> <!-- Eminence Bow - Guidance -->
-	<item id="4823" price="0" /> <!-- Eminence Bow - Miser -->
-	<item id="4824" price="0" /> <!-- Eminence Bow - Cheap Shot -->
 	<item id="1342" price="0" /> <!-- Steel Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009023.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009023.xml
index f42119d73d..284a32758e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009023.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009023.xml
@@ -1,19 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="263" price="0" /> <!-- Chakram -->
+	<item id="4233" price="0" /> <!-- Fist -->
 	<item id="265" price="0" /> <!-- Fisted Blade -->
 	<item id="266" price="0" /> <!-- Great Pata -->
-	<item id="4233" price="0" /> <!-- Knuckle Duster -->
-	<item id="4789" price="0" /> <!-- Chakram - Critical Drain -->
-	<item id="4790" price="0" /> <!-- Chakram - Critical Poison -->
-	<item id="4791" price="0" /> <!-- Chakram - Rsk. Haste -->
-	<item id="4792" price="0" /> <!-- Fisted Blade - Rsk. Evasion -->
-	<item id="4793" price="0" /> <!-- Fisted Blade - Rsk. Haste -->
-	<item id="4794" price="0" /> <!-- Fisted Blade - Haste -->
-	<item id="4795" price="0" /> <!-- Great Pata - Critical Drain -->
-	<item id="4796" price="0" /> <!-- Great Pata - Critical Poison -->
-	<item id="4797" price="0" /> <!-- Great Pata - Rsk. Haste -->
-	<item id="4798" price="0" /> <!-- Knuckle Duster - Rsk. Evasion -->
-	<item id="4799" price="0" /> <!-- Knuckle Duster - Rsk. Haste -->
-	<item id="4800" price="0" /> <!-- Knuckle Duster - Haste -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009024.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009024.xml
index f88c895bef..8331e91886 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009024.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009024.xml
@@ -1,35 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="302" price="0" /> <!-- Body Slasher -->
+	<item id="298" price="0" /> <!-- Orcish Glaive -->
+	<item id="96" price="0" /> <!-- Scythe -->
 	<item id="94" price="0" /> <!-- Bec de Corbin -->
 	<item id="95" price="0" /> <!-- Poleaxe -->
-	<item id="96" price="0" /> <!-- Scythe -->
-	<item id="298" price="0" /> <!-- Orcish Glaive -->
-	<item id="299" price="0" /> <!-- Orcish Poleaxe -->
 	<item id="301" price="0" /> <!-- Scorpion -->
-	<item id="302" price="0" /> <!-- Body Slasher -->
 	<item id="303" price="0" /> <!-- Widow Maker -->
-	<item id="4834" price="0" /> <!-- Scythe - Anger -->
-	<item id="4835" price="0" /> <!-- Scythe - Critical Stun -->
-	<item id="4836" price="0" /> <!-- Scythe - Light -->
-	<item id="4837" price="0" /> <!-- Orcish Glaive - Anger -->
-	<item id="4838" price="0" /> <!-- Orcish Glaive - Critical Stun -->
-	<item id="4839" price="0" /> <!-- Orcish Glaive - Towering Blow -->
-	<item id="4840" price="0" /> <!-- Body Slasher - Critical Stun -->
-	<item id="4841" price="0" /> <!-- Body Slasher - Towering Blow -->
-	<item id="4842" price="0" /> <!-- Body Slasher - Wide Blow -->
-	<item id="4843" price="0" /> <!-- Bec de Corbin - Critical Stun -->
-	<item id="4844" price="0" /> <!-- Bec de Corbin - Towering Blow -->
-	<item id="4845" price="0" /> <!-- Bec de Corbin - Light -->
-	<item id="4846" price="0" /> <!-- Scorpion - Anger -->
-	<item id="4847" price="0" /> <!-- Scorpion - Critical Stun -->
-	<item id="4848" price="0" /> <!-- Scorpion - Towering Blow -->
-	<item id="4849" price="0" /> <!-- Widow Maker - Critical Stun -->
-	<item id="4850" price="0" /> <!-- Widow Maker - Towering Blow -->
-	<item id="4851" price="0" /> <!-- Widow Maker - Wide Blow -->
-	<item id="4852" price="0" /> <!-- Orcish Poleaxe - Critical Stun -->
-	<item id="4853" price="0" /> <!-- Orcish Poleaxe - Towering Blow -->
-	<item id="4854" price="0" /> <!-- Orcish Poleaxe - Wide Blow -->
-	<item id="7719" price="0" /> <!-- Poleaxe - Critical Stun -->
-	<item id="7720" price="0" /> <!-- Poleaxe - Towering Blow -->
-	<item id="7721" price="0" /> <!-- Poleaxe - Wide Blow -->
+		<item id="299" price="0" /> <!-- Orcish Poleaxe -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009025.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009025.xml
index 16b8eb5eb4..1b7af43055 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009025.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009025.xml
@@ -1,42 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="4734" price="0" /> <!-- Silver Axe - Haste -->
-	<item id="4735" price="0" /> <!-- Skull Graver - Anger -->
-	<item id="4736" price="0" /> <!-- Skull Graver - Health -->
-	<item id="4737" price="0" /> <!-- Skull Graver - Rsk. Focus -->
-	<item id="4738" price="0" /> <!-- Dwarven War Hammer - Anger -->
-	<item id="4739" price="0" /> <!-- Dwarven War Hammer - Health -->
-	<item id="4740" price="0" /> <!-- Dwarven War Hammer - Haste -->
-	<item id="4741" price="0" /> <!-- War Axe - Anger -->
-	<item id="4742" price="0" /> <!-- War Axe - Health -->
-	<item id="4743" price="0" /> <!-- War Axe - Haste -->
-	<item id="4744" price="0" /> <!-- Yaksa Mace - Anger -->
-	<item id="4745" price="0" /> <!-- Yaksa Mace - Health -->
-	<item id="4746" price="0" /> <!-- Yaksa Mace - Rsk. Focus -->
-	<item id="7701" price="0" /> <!-- Stick of Faith - Mana Up -->
-	<item id="7702" price="0" /> <!-- Stick of Faith - Magic Hold -->
-	<item id="7703" price="0" /> <!-- Stick of Faith - Magic Shield -->
-	<item id="7704" price="0" /> <!-- Stick of Eternity - Empower -->
-	<item id="7705" price="0" /> <!-- Stick of Eternity - Rsk. Evasion -->
-	<item id="7706" price="0" /> <!-- Stick of Eternity - Blessed Body -->
-	<item id="7707" price="0" /> <!-- Nirvana Axe - M. Atk. -->
-	<item id="7708" price="0" /> <!-- Nirvana Axe - Magic Poison -->
-	<item id="7709" price="0" /> <!-- Nirvana Axe - Magic Weakness -->
-	<item id="7710" price="0" /> <!-- Club of Nature - Acumen -->
-	<item id="7711" price="0" /> <!-- Club of Nature - Mental Shield -->
-	<item id="7712" price="0" /> <!-- Club of Nature - Magic Hold -->
-	<item id="7713" price="0" /> <!-- Mace of Underworld - Mana Up -->
-	<item id="7714" price="0" /> <!-- Mace of Underworld - Magic Silence -->
-	<item id="7715" price="0" /> <!-- Mace of Underworld - Conversion -->
-	<item id="2503" price="0" /> <!-- Yaksa Mace -->
-	<item id="162" price="0" /> <!-- War Axe -->
-	<item id="202" price="0" /> <!-- Mace of Underworld -->
-	<item id="201" price="0" /> <!-- Club of Nature -->
-	<item id="196" price="0" /> <!-- Stick of Eternity -->
-	<item id="174" price="0" /> <!-- Nirvana Axe -->
-	<item id="2502" price="0" /> <!-- Dwarven War Hammer -->
-	<item id="173" price="0" /> <!-- Skull Graver -->
-	<item id="161" price="0" /> <!-- Silver Axe -->
-	<item id="160" price="0" /> <!-- Battle Axe -->
 	<item id="193" price="0" /> <!-- Stick of Faith -->
+	<item id="160" price="0" /> <!-- Battle Axe -->
+	<item id="89" price="0" /> <!-- Big Hammer -->
+	<item id="161" price="0" /> <!-- Silver Axe -->
+	<item id="173" price="0" /> <!-- Skull Graver -->
+	<item id="201" price="0" /> <!-- Club of Nature -->
+	<item id="202" price="0" /> <!-- Mace of Underworld -->
+	<item id="174" price="0" /> <!-- Nirvana Axe -->
+	<item id="196" price="0" /> <!-- Stick of Eternity -->
+	<item id="2502" price="0" /> <!-- Dwarven War Hammer -->
+	<item id="7891" price="0" /> <!-- Ecliptic Axe -->
+	<item id="162" price="0" /> <!-- War Axe -->
+	<item id="2503" price="0" /> <!-- Yaksa Mace -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009026.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009026.xml
index 92a29f78a2..7f2b66b29d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009026.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009026.xml
@@ -1,28 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="4888" price="0" /> <!-- Deadman's Staff - Magic Regeneration -->
-	<item id="4889" price="0" /> <!-- Deadman's Staff - Mental Shield -->
-	<item id="4890" price="0" /> <!-- Deadman's Staff - Magic Hold -->
-	<item id="4891" price="0" /> <!-- Ghoul's Staff - Rsk. Evasion -->
-	<item id="4892" price="0" /> <!-- Ghoul's Staff - Mana Up -->
-	<item id="4893" price="0" /> <!-- Ghoul's Staff - Blessed Body -->
-	<item id="4894" price="0" /> <!-- Demon's Staff - Magic Poison -->
-	<item id="4895" price="0" /> <!-- Demon's Staff - Magic Weakness -->
-	<item id="4896" price="0" /> <!-- Demon's Staff - Magic Chaos -->
-	<item id="6719" price="0" /> <!-- Monster Only(Ketra Orc Chieftain) -->
-	<item id="7716" price="0" /> <!-- Inferno Staff - Acumen -->
-	<item id="7717" price="0" /> <!-- Inferno Staff - Magic Silence -->
-	<item id="7718" price="0" /> <!-- Inferno Staff - Magic Paralyze -->
-	<item id="197" price="0" /> <!-- Paradia Staff -->
-	<item id="191" price="0" /> <!-- Heavy Doom Hammer -->
 	<item id="192" price="0" /> <!-- Crystal Staff -->
 	<item id="194" price="0" /> <!-- Heavy Doom Axe -->
+	<item id="191" price="0" /> <!-- Heavy Doom Hammer -->
 	<item id="195" price="0" /> <!-- Cursed Staff -->
 	<item id="198" price="0" /> <!-- Inferno Staff -->
-	<item id="199" price="0" /> <!-- Pa'agrian Hammer -->
+	<item id="199" price="0" /> <!-- Pa'agrio Hammer -->
+	<item id="197" price="0" /> <!-- Paradia Staff -->
 	<item id="200" price="0" /> <!-- Sage's Staff -->
-	<item id="203" price="0" /> <!-- Pa'agrian Axe -->
+	<item id="203" price="0" /> <!-- Pa'agrio Axe -->
 	<item id="204" price="0" /> <!-- Deadman's Staff -->
-	<item id="205" price="0" /> <!-- Ghoul's Staff -->
 	<item id="206" price="0" /> <!-- Demon's Staff -->
+	<item id="205" price="0" /> <!-- Ghoul's Staff -->
+	<item id="7898" price="0" /> <!-- Karik Horn -->
+	<item id="7897" price="0" /> <!-- Dwarven Hammer -->
+	
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009027.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009027.xml
index b91a5ce3e5..7baee77f51 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009027.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009027.xml
@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="79" price="0" /> <!-- Sword of Damascus -->
-	<item id="142" price="0" /> <!-- Keshanberk -->
-	<item id="146" price="0" /> <!-- Ghoulbane -->
 	<item id="148" price="0" /> <!-- Sword of Valhalla -->
-	<item id="4714" price="0" /> <!-- Keshanberk - Guidance -->
-	<item id="4715" price="0" /> <!-- Keshanberk - Focus -->
-	<item id="4716" price="0" /> <!-- Keshanberk - Back Blow -->
-	<item id="4717" price="0" /> <!-- Sword of Damascus - Focus -->
-	<item id="4718" price="0" /> <!-- Sword of Damascus - Critical Damage -->
-	<item id="4719" price="0" /> <!-- Sword of Damascus - Haste -->
-	<item id="7722" price="0" /> <!-- Sword of Valhalla - Acumen -->
-	<item id="7723" price="0" /> <!-- Sword of Valhalla - Magic Weakness -->
-	<item id="7724" price="0" /> <!-- Sword of Valhalla - Magic Regeneration -->
+	<item id="7889" price="0" /> <!-- Wizard's Tear -->
+	<item id="142" price="0" /> <!-- Keshanberk -->
+	<item id="79" price="0" /> <!-- Damascus -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009028.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009028.xml
index beb50cb0cf..d3590e55aa 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009028.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009028.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="78" price="0" /> <!-- Great Sword -->
-	<item id="4723" price="0" /> <!-- Great Sword - Health -->
-	<item id="4724" price="0" /> <!-- Great Sword - Critical Damage -->
-	<item id="4725" price="0" /> <!-- Great Sword - Focus -->
+	<item id="7883" price="0" /> <!-- Guardian's Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009029.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009029.xml
index 2a1130d2ba..9a359fde6d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009029.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009029.xml
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="2566" price="0" /> <!-- Stormbringer*Caliburs -->
-	<item id="2567" price="0" /> <!-- Stormbringer*Sword of Limit -->
 	<item id="2568" price="0" /> <!-- Stormbringer*Sword of Delusion -->
 	<item id="2569" price="0" /> <!-- Stormbringer*Sword of Nightmare -->
 	<item id="2570" price="0" /> <!-- Stormbringer*Tsurugi -->
-	<item id="2571" price="0" /> <!-- Stormbringer*Samurai Long sword -->
-	<item id="2576" price="0" /> <!-- Shamshir*Caliburs -->
-	<item id="2577" price="0" /> <!-- Shamshir*Sword of Limit -->
-	<item id="2578" price="0" /> <!-- Shamshir*Sword of Delusion -->
-	<item id="2579" price="0" /> <!-- Shamshir*Sword of Nightmare -->
-	<item id="2580" price="0" /> <!-- Shamshir*Tsurugi -->
-	<item id="2581" price="0" /> <!-- Shamshir*Samurai Long Sword -->
+	<item id="2567" price="0" /> <!-- Stormbringer*Ultimate Sword -->
 	<item id="2585" price="0" /> <!-- Katana*Caliburs -->
-	<item id="2586" price="0" /> <!-- Katana*Sword of Limit -->
 	<item id="2587" price="0" /> <!-- Katana*Sword of Delusion -->
 	<item id="2588" price="0" /> <!-- Katana*Sword of Nightmare -->
 	<item id="2589" price="0" /> <!-- Katana*Tsurugi -->
-	<item id="2590" price="0" /> <!-- Katana*Samurai Long Sword -->
-	<item id="2593" price="0" /> <!-- Spirit Sword*Caliburs -->
-	<item id="2594" price="0" /> <!-- Spirit Sword*Sword of Limit -->
-	<item id="2595" price="0" /> <!-- Spirit Sword*Sword of Delusion -->
-	<item id="2596" price="0" /> <!-- Spirit Sword*Sword of Nightmare -->
-	<item id="2597" price="0" /> <!-- Spirit Sword*Tsurugi -->
-	<item id="2598" price="0" /> <!-- Spirit Sword*Samurai Long Sword -->
+	<item id="2586" price="0" /> <!-- Katana*Ultimate Sword -->
 	<item id="2600" price="0" /> <!-- Raid Sword*Caliburs -->
-	<item id="2601" price="0" /> <!-- Raid Sword*Sword of Limit -->
 	<item id="2602" price="0" /> <!-- Raid Sword*Sword of Delusion -->
 	<item id="2603" price="0" /> <!-- Raid Sword*Sword of Nightmare -->
 	<item id="2604" price="0" /> <!-- Raid Sword*Tsurugi -->
-	<item id="2605" price="0" /> <!-- Raid Sword*Samurai Long Sword -->
+	<item id="2601" price="0" /> <!-- Raid Sword*Ultimate Sword -->
+	<item id="2576" price="0" /> <!-- Shamshir*Caliburs -->
+	<item id="2578" price="0" /> <!-- Shamshir*Sword of Delusion -->
+	<item id="2579" price="0" /> <!-- Shamshir*Sword of Nightmare -->
+	<item id="2580" price="0" /> <!-- Shamshir*Tsurugi -->
+	<item id="2577" price="0" /> <!-- Shamshir*Ultimate Sword -->
+	<item id="2593" price="0" /> <!-- Spirit Sword*Caliburs -->
+	<item id="2595" price="0" /> <!-- Spirit Sword*Sword of Delusion -->
+	<item id="2596" price="0" /> <!-- Spirit Sword*Sword of Nightmare -->
+	<item id="2597" price="0" /> <!-- Spirit Sword*Tsurugi -->
+	<item id="2594" price="0" /> <!-- Spirit Sword*Ultimate Sword -->
 	<item id="2606" price="0" /> <!-- Caliburs*Caliburs -->
-	<item id="2607" price="0" /> <!-- Caliburs*Sword of Limit -->
 	<item id="2608" price="0" /> <!-- Caliburs*Sword of Delusion -->
 	<item id="2609" price="0" /> <!-- Caliburs*Sword of Nightmare -->
 	<item id="2610" price="0" /> <!-- Caliburs*Tsurugi -->
-	<item id="2611" price="0" /> <!-- Caliburs*Samurai Long Sword -->
-	<item id="2612" price="0" /> <!-- Sword of Limit*Sword of Limit -->
-	<item id="2613" price="0" /> <!-- Sword of Limit*Sword of Delusion -->
-	<item id="2614" price="0" /> <!-- Sword of Limit*Sword of Nightmare -->
-	<item id="2615" price="0" /> <!-- Sword of Limit*Tsurugi -->
-	<item id="2616" price="0" /> <!-- Sword of Limit*Samurai Long Sword -->
+	<item id="2607" price="0" /> <!-- Caliburs*Ultimate Sword -->
+	<item id="2571" price="0" /> <!-- Stormbringer*Samurai Long sword -->
 	<item id="2617" price="0" /> <!-- Sword of Delusion*Sword of Delusion -->
 	<item id="2618" price="0" /> <!-- Sword of Delusion*Sword of Nightmare -->
 	<item id="2619" price="0" /> <!-- Sword of Delusion*Tsurugi -->
-	<item id="2620" price="0" /> <!-- Sword of Delusion*Samurai Long Sword -->
 	<item id="2621" price="0" /> <!-- Sword of Nightmare*Sword of Nightmare -->
 	<item id="2622" price="0" /> <!-- Sword of Nightmare*Tsurugi -->
-	<item id="2623" price="0" /> <!-- Sword of Nightmare*Samurai Long Sword -->
 	<item id="2624" price="0" /> <!-- Tsurugi*Tsurugi -->
+	<item id="2613" price="0" /> <!-- Ultimate Sword*Sword of Delusion -->
+	<item id="2614" price="0" /> <!-- Ultimate Sword*Sword of Nightmare -->
+	<item id="2615" price="0" /> <!-- Ultimate Sword*Tsurugi -->
+	<item id="2612" price="0" /> <!-- Ultimate Sword*Ultimate Sword -->
+	<item id="2590" price="0" /> <!-- Katana*Samurai Long Sword -->
+	<item id="2605" price="0" /> <!-- Raid Sword*Samurai Long Sword -->
+	<item id="2581" price="0" /> <!-- Shamshir*Samurai Long Sword -->
+	<item id="2598" price="0" /> <!-- Spirit Sword*Samurai Long Sword -->
+	<item id="2611" price="0" /> <!-- Caliburs*Samurai Long Sword -->
+	<item id="2620" price="0" /> <!-- Sword of Delusion*Samurai Long Sword -->
+	<item id="2623" price="0" /> <!-- Sword of Nightmare*Samurai Long Sword -->
 	<item id="2625" price="0" /> <!-- Tsurugi*Samurai Long Sword -->
+	<item id="2616" price="0" /> <!-- Ultimate Sword*Samurai Long Sword -->
 	<item id="2626" price="0" /> <!-- Samurai Long Sword*Samurai Long Sword -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009030.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009030.xml
index 7091db8fe2..5cb950a512 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009030.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009030.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="243" price="0" /> <!-- Twilight Knife -->
 	<item id="229" price="0" /> <!-- Kris -->
 	<item id="234" price="0" /> <!-- Demon's Dagger -->
-	<item id="243" price="0" /> <!-- Hell Knife -->
-	<item id="4777" price="0" /> <!-- Kris - Evasion -->
-	<item id="4778" price="0" /> <!-- Kris - Focus -->
-	<item id="4779" price="0" /> <!-- Kris - Back Blow -->
-	<item id="4780" price="0" /> <!-- Demon's Dagger - Critical Bleed -->
-	<item id="4781" price="0" /> <!-- Demon's Dagger - Critical Poison -->
-	<item id="4782" price="0" /> <!-- Demon's Dagger - Mortal Strike -->
-	<item id="6359" price="0" /> <!-- Demon's Dagger - Critical Damage -->
-	<item id="7813" price="0" /> <!-- Hell Knife - Magic Regeneration -->
-	<item id="7814" price="0" /> <!-- Hell Knife - Mental Shield -->
-	<item id="7815" price="0" /> <!-- Hell Knife - Magic Weakness -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009031.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009031.xml
index 59b2b47721..b8396f074d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009031.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009031.xml
@@ -2,11 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="284" price="0" /> <!-- Dark Elven Long Bow -->
 	<item id="287" price="0" /> <!-- Bow of Peril -->
-	<item id="4825" price="0" /> <!-- Dark Elven Long Bow - Evasion -->
-	<item id="4826" price="0" /> <!-- Dark Elven Long Bow - Critical Bleed -->
-	<item id="4827" price="0" /> <!-- Dark Elven Long Bow - Miser -->
-	<item id="4828" price="0" /> <!-- Bow of Peril - Guidance -->
-	<item id="4829" price="0" /> <!-- Bow of Peril - Quick Recovery -->
-	<item id="4830" price="0" /> <!-- Bow of Peril - Cheap Shot -->
 	<item id="1343" price="0" /> <!-- Silver Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009032.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009032.xml
index 21f0642b74..54e6fcccb0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009032.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009032.xml
@@ -3,10 +3,4 @@
 	<item id="264" price="0" /> <!-- Pata -->
 	<item id="267" price="0" /> <!-- Arthro Nail -->
 	<item id="268" price="0" /> <!-- Bellion Cestus -->
-	<item id="4801" price="0" /> <!-- Arthro Nail - Critical Poison -->
-	<item id="4802" price="0" /> <!-- Arthro Nail - Rsk. Evasion -->
-	<item id="4803" price="0" /> <!-- Arthro Nail - Rsk. Haste -->
-	<item id="4804" price="0" /> <!-- Bellion Cestus - Critical Drain -->
-	<item id="4805" price="0" /> <!-- Bellion Cestus - Critical Poison -->
-	<item id="4806" price="0" /> <!-- Bellion Cestus - Rsk. Haste -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009033.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009033.xml
index 4436abf60d..28396bb47c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009033.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009033.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="97" price="0" /> <!-- Lance -->
 	<item id="300" price="0" /> <!-- Great Axe -->
-	<item id="4855" price="0" /> <!-- Great Axe - Anger -->
-	<item id="4856" price="0" /> <!-- Great Axe - Critical Stun -->
-	<item id="4857" price="0" /> <!-- Great Axe - Light -->
-	<item id="4858" price="0" /> <!-- Lance - Anger -->
-	<item id="4859" price="0" /> <!-- Lance - Critical Stun -->
-	<item id="4860" price="0" /> <!-- Lance - Towering Blow -->
+	<item id="97" price="0" /> <!-- Lance -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009034.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009034.xml
index af7e439f8f..a796f66e26 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009034.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009034.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="7892" price="0" /> <!-- Spell Breaker -->
+	<item id="7893" price="0" /> <!-- Heavy War Axe -->
 	<item id="91" price="0" /> <!-- Heavy War Axe -->
-	<item id="171" price="0" /> <!-- Deadman's Glory -->
 	<item id="175" price="0" /> <!-- Art of Battle Axe -->
-	<item id="4747" price="0" /> <!-- Heavy War Axe - Anger -->
-	<item id="4748" price="0" /> <!-- Heavy War Axe - Health -->
-	<item id="4749" price="0" /> <!-- Heavy War Axe - Rsk. Focus -->
-	<item id="4750" price="0" /> <!-- Deadman's Glory - Anger -->
-	<item id="4751" price="0" /> <!-- Deadman's Glory - Health -->
-	<item id="4752" price="0" /> <!-- Deadman's Glory - Haste -->
-	<item id="4753" price="0" /> <!-- Art of Battle Axe - Health -->
-	<item id="4754" price="0" /> <!-- Art of Battle Axe - Rsk. Focus -->
-	<item id="4755" price="0" /> <!-- Art of Battle Axe - Haste -->
+	<item id="171" price="0" /> <!-- Deadman's Glory -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009035.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009035.xml
index 9a3a663a08..a944156b69 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009035.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009035.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="92" price="0" /> <!-- Sprite's Staff -->
-	<item id="207" price="0" /> <!-- Staff of Phantom -->
-	<item id="208" price="0" /> <!-- Staff of Seal -->
-	<item id="209" price="0" /> <!-- Divine Staff -->
+	<item id="92" price="0" /> <!-- Spirit's Staff -->
 	<item id="210" price="0" /> <!-- Staff of Evil Spirits -->
-	<item id="211" price="0" /> <!-- Staff of Nobility -->
-	<item id="4897" price="0" /> <!-- Sprite's Staff - Magic Regeneration -->
-	<item id="4898" price="0" /> <!-- Sprite's Staff - Mental Shield -->
-	<item id="4899" price="0" /> <!-- Sprite's Staff - Magic Hold -->
-	<item id="4900" price="0" /> <!-- Staff of Evil Spirits - Magic Focus -->
-	<item id="4901" price="0" /> <!-- Staff of Evil Spirits - Blessed Body -->
-	<item id="4902" price="0" /> <!-- Staff of Evil Spirits - Magic Poison -->
+	<item id="7900" price="0" /> <!-- Ice Storm Hammer -->
+	<item id="7901" price="0" /> <!-- Star Buster -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009036.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009036.xml
index 16780d3c54..afaf036a1b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009036.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009036.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="80" price="0" /> <!-- Tallum Blade -->
 	<item id="150" price="0" /> <!-- Elemental Sword -->
 	<item id="151" price="0" /> <!-- Sword of Miracles -->
+	<item id="8686" price="0" /> <!-- Themis' Tongue -->
+	<item id="80" price="0" /> <!-- Tallum Blade -->
 	<item id="2500" price="0" /> <!-- Dark Legion's Edge -->
-	<item id="5635" price="0" /> <!-- Tallum Blade - Critical Poison -->
-	<item id="5636" price="0" /> <!-- Tallum Blade - Haste -->
-	<item id="5637" price="0" /> <!-- Tallum Blade - Anger -->
-	<item id="5638" price="0" /> <!-- Elemental Sword - M. Atk. -->
-	<item id="5639" price="0" /> <!-- Elemental Sword - Magic Paralyze -->
-	<item id="5640" price="0" /> <!-- Elemental Sword - Empower -->
-	<item id="5641" price="0" /> <!-- Sword of Miracles - M. Atk. -->
-	<item id="5642" price="0" /> <!-- Sword of Miracles - Magic Silence -->
-	<item id="5643" price="0" /> <!-- Sword of Miracles - Acumen -->
-	<item id="5647" price="0" /> <!-- Dark Legion's Edge - Critical Damage -->
-	<item id="5648" price="0" /> <!-- Dark Legion's Edge - Health -->
-	<item id="5649" price="0" /> <!-- Dark Legion's Edge - Rsk. Focus -->
+	<item id="8678" price="0" /> <!-- Sirra's Blade -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009037.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009037.xml
index 976bc711b4..251a892ef6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009037.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009037.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="7884" price="0" /> <!-- Infernal Master -->
 	<item id="81" price="0" /> <!-- Dragon Slayer -->
-	<item id="5644" price="0" /> <!-- Dragon Slayer - Health -->
-	<item id="5645" price="0" /> <!-- Dragon Slayer - Critical Bleed -->
-	<item id="5646" price="0" /> <!-- Dragon Slayer - Critical Drain -->
+	<item id="8679" price="0" /> <!-- Sword of Ipos -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009038.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009038.xml
index 61016de041..d506a12075 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009038.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009038.xml
@@ -3,4 +3,5 @@
 	<item id="5233" price="0" /> <!-- Keshanberk*Keshanberk -->
 	<item id="5705" price="0" /> <!-- Keshanberk*Damascus -->
 	<item id="5706" price="0" /> <!-- Damascus*Damascus -->
+	<item id="8938" price="0" /> <!-- Tallum Blade*Damascus -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009039.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009039.xml
index 936abc1f93..cff29e0e50 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009039.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009039.xml
@@ -2,10 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="235" price="0" /> <!-- Bloody Orchid -->
 	<item id="236" price="0" /> <!-- Soul Separator -->
-	<item id="5614" price="0" /> <!-- Bloody Orchid - Focus -->
-	<item id="5615" price="0" /> <!-- Bloody Orchid - Back Blow -->
-	<item id="5616" price="0" /> <!-- Bloody Orchid - Critical Bleed -->
-	<item id="5617" price="0" /> <!-- Soul Separator - Guidance -->
-	<item id="5618" price="0" /> <!-- Soul Separator - Critical Damage -->
-	<item id="5619" price="0" /> <!-- Soul Separator - Rsk. Haste -->
+	<item id="8682" price="0" /> <!-- Naga Storm -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009040.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009040.xml
index 9afb32b628..9e31151cb3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009040.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009040.xml
@@ -2,11 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="288" price="0" /> <!-- Carnage Bow -->
 	<item id="289" price="0" /> <!-- Soul Bow -->
-	<item id="5608" price="0" /> <!-- Carnage Bow - Light -->
-	<item id="5609" price="0" /> <!-- Carnage Bow - Critical Bleed -->
-	<item id="5610" price="0" /> <!-- Carnage Bow - Mana Up -->
-	<item id="5611" price="0" /> <!-- Soul Bow - Cheap Shot -->
-	<item id="5612" price="0" /> <!-- Soul Bow - Quick Recovery -->
-	<item id="5613" price="0" /> <!-- Soul Bow - Critical Poison -->
+	<item id="8684" price="0" /> <!-- Shyeed's Bow -->
 	<item id="1344" price="0" /> <!-- Mithril Arrow -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009041.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009041.xml
index 212c87c360..bffdcb5bad 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009041.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009041.xml
@@ -2,10 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="269" price="0" /> <!-- Blood Tornado -->
 	<item id="270" price="0" /> <!-- Dragon Grinder -->
-	<item id="5620" price="0" /> <!-- Blood Tornado - Haste -->
-	<item id="5621" price="0" /> <!-- Blood Tornado - Focus -->
-	<item id="5622" price="0" /> <!-- Blood Tornado - Anger -->
-	<item id="5623" price="0" /> <!-- Dragon Grinder - Rsk. Evasion -->
-	<item id="5624" price="0" /> <!-- Dragon Grinder - Guidance -->
-	<item id="5625" price="0" /> <!-- Dragon Grinder - Health -->
+	<item id="8685" price="0" /> <!-- Sobekk's Hurricane -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009042.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009042.xml
index 00cd3c9b01..e2c6094470 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009042.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009042.xml
@@ -2,10 +2,5 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="98" price="0" /> <!-- Halberd -->
 	<item id="305" price="0" /> <!-- Tallum Glaive -->
-	<item id="5626" price="0" /> <!-- Halberd - Haste -->
-	<item id="5627" price="0" /> <!-- Halberd - Critical Stun -->
-	<item id="5628" price="0" /> <!-- Halberd - Wide Blow -->
-	<item id="5632" price="0" /> <!-- Tallum Glaive - Guidance -->
-	<item id="5633" price="0" /> <!-- Tallum Glaive - Health -->
-	<item id="5634" price="0" /> <!-- Tallum Glaive - Wide Blow -->
+	<item id="8683" price="0" /> <!-- Tiphon's Spear -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009043.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009043.xml
index cd682a1050..4e6e460fa4 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009043.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009043.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="164" price="0" /> <!-- Elysian -->
+	<item id="7894" price="0" /> <!-- Spiritual Eye -->
+	<item id="7895" price="0" /> <!-- Flaming Dragon Skull -->
+	<item id="8687" price="0" /> <!-- Cabrio's Hand -->
 	<item id="2504" price="0" /> <!-- Meteor Shower -->
-	<item id="5599" price="0" /> <!-- Meteor Shower - Focus -->
-	<item id="5600" price="0" /> <!-- Meteor Shower - Critical Bleed -->
-	<item id="5601" price="0" /> <!-- Meteor Shower - Rsk. Haste -->
-	<item id="5602" price="0" /> <!-- Elysian - Health -->
-	<item id="5603" price="0" /> <!-- Elysian - Anger -->
-	<item id="5604" price="0" /> <!-- Elysian - Critical Drain -->
+	<item id="164" price="0" /> <!-- Elysian -->
+	<item id="8680" price="0" /> <!-- Barakiel's Axe -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009044.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009044.xml
index cc016bc43f..db90303038 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009044.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009044.xml
@@ -2,10 +2,8 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
 	<item id="212" price="0" /> <!-- Dasparion's Staff -->
 	<item id="213" price="0" /> <!-- Branch of the Mother Tree -->
-	<item id="5596" price="0" /> <!-- Dasparion's Staff - Mana Up -->
-	<item id="5597" price="0" /> <!-- Dasparion's Staff - Conversion -->
-	<item id="5598" price="0" /> <!-- Dasparion's Staff - Acumen -->
-	<item id="5605" price="0" /> <!-- Branch of the Mother Tree - Conversion -->
-	<item id="5606" price="0" /> <!-- Branch of the Mother Tree - Magic Damage -->
-	<item id="5607" price="0" /> <!-- Branch of the Mother Tree - Acumen -->
+	<item id="8688" price="0" /> <!-- Daimon Crystal -->
+	<item id="7899" price="0" /> <!-- Destroyer Hammer -->
+	<item id="7902" price="0" /> <!-- Doom Crusher -->
+	<item id="8681" price="0" /> <!-- Behemoth' Tuning Fork -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009952.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009952.xml
index 6808fcb188..6e9272f38b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009952.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009952.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
+	<item id="47" price="0" /> <!-- Helmet -->
 	<item id="58" price="0" /> <!-- Mithril Breastplate -->
 	<item id="59" price="0" /> <!-- Mithril Gaiters -->
-	<item id="47" price="0" /> <!-- Helmet -->
 	<item id="628" price="0" /> <!-- Hoplon -->
+	<item id="2411" price="0" /> <!-- Brigandine Helmet -->
 	<item id="352" price="0" /> <!-- Brigandine Tunic -->
 	<item id="2378" price="0" /> <!-- Brigandine Gaiters -->
-	<item id="2411" price="0" /> <!-- Brigandine Helmet -->
 	<item id="2493" price="0" /> <!-- Brigandine Shield -->
 	<item id="394" price="0" /> <!-- Reinforced Leather Shirt -->
 	<item id="416" price="0" /> <!-- Reinforced Leather Gaiters -->
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009953.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009953.xml
index ae5cd7af7a..5f710ac332 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009953.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009953.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="60" price="0" /> <!-- Composite Armor -->
 	<item id="517" price="0" /> <!-- Composite Helmet -->
+	<item id="60" price="0" /> <!-- Composite Armor -->
 	<item id="64" price="0" /> <!-- Composite Boots -->
 	<item id="107" price="0" /> <!-- Composite Shield -->
 	<item id="354" price="0" /> <!-- Chain Mail Shirt -->
@@ -10,8 +10,8 @@
 	<item id="2453" price="0" /> <!-- Chain Gloves -->
 	<item id="2429" price="0" /> <!-- Chain Boots -->
 	<item id="2495" price="0" /> <!-- Chain Shield -->
-	<item id="356" price="0" /> <!-- Full Plate Armor -->
 	<item id="2414" price="0" /> <!-- Full Plate Helmet -->
+	<item id="356" price="0" /> <!-- Full Plate Armor -->
 	<item id="2462" price="0" /> <!-- Full Plate Gauntlets -->
 	<item id="2438" price="0" /> <!-- Full Plate Boots -->
 	<item id="2497" price="0" /> <!-- Full Plate Shield -->
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009954.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009954.xml
index 1e75b92bfa..584403d96b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009954.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009954.xml
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="357" price="0" /> <!-- Zubei's Breastplate -->
-	<item id="383" price="0" /> <!-- Zubei's Gaiters -->
-	<item id="503" price="0" /> <!-- Zubei's Helmet -->
+	<item id="90458" price="0" /> <!-- Zubei's Helmet - Heavy Armor -->
+	<item id="357" price="0" /> <!-- Zubei's Breastplate - Heavy Armor -->
+	<item id="383" price="0" /> <!-- Zubei's Gaiters - Heavy Armor -->
 	<item id="5710" price="0" /> <!-- Zubei's Gauntlets - Heavy Armor -->
 	<item id="5726" price="0" /> <!-- Zubei's Boots - Heavy Armor -->
-	<item id="633" price="0" /> <!-- Zubei's Shield -->
-	<item id="358" price="0" /> <!-- Blue Wolf Breastplate -->
-	<item id="2380" price="0" /> <!-- Blue Wolf Gaiters -->
-	<item id="2416" price="0" /> <!-- Blue Wolf Helmet -->
-	<item id="5718" price="0" /> <!-- Blue Wolf Gloves - Heavy Armor -->
-	<item id="5734" price="0" /> <!-- Blue Wolf Boots - Heavy Armor -->
-	<item id="2376" price="0" /> <!-- Avadon Breastplate -->
-	<item id="2379" price="0" /> <!-- Avadon Gaiters -->
-	<item id="2415" price="0" /> <!-- Avadon Circlet -->
-	<item id="5714" price="0" /> <!-- Avadon Gloves - Heavy Armor -->
-	<item id="5730" price="0" /> <!-- Avadon Boots - Heavy Armor -->
-	<item id="673" price="0" /> <!-- Avadon Shield -->
-	<item id="2381" price="0" /> <!-- Doom Plate Armor -->
-	<item id="2417" price="0" /> <!-- Doom Helmet -->
-	<item id="5722" price="0" /> <!-- Doom Gloves - Heavy Armor -->
-	<item id="5738" price="0" /> <!-- Doom Boots - Heavy Armor -->
-	<item id="110" price="0" /> <!-- Doom Shield -->
-	<item id="2384" price="0" /> <!-- Zubei's Leather Shirt -->
-	<item id="2388" price="0" /> <!-- Zubei's Leather Gaiters -->
+	<item id="633" price="0" /> <!-- Zubei's Shield - Heavy Armor -->
+	<item id="90459" price="0" /> <!-- Zubei's Helmet - Light Armor -->
+	<item id="2384" price="0" /> <!-- Zubei's Leather Shirt - Light Armor -->
+	<item id="2388" price="0" /> <!-- Zubei's Leather Gaiters - Light Armor -->
 	<item id="5711" price="0" /> <!-- Zubei's Gauntlets - Light Armor -->
 	<item id="5727" price="0" /> <!-- Zubei's Boots - Light Armor -->
-	<item id="2390" price="0" /> <!-- Avadon Leather Armor -->
-	<item id="5715" price="0" /> <!-- Avadon Gloves - Light Armor -->
-	<item id="5731" price="0" /> <!-- Avadon Boots - Light Armor -->
-	<item id="2391" price="0" /> <!-- Blue Wolf Leather Armor -->
+	<item id="90460" price="0" /> <!-- Zubei's Helmet - Robe Armor -->
+	<item id="2397" price="0" /> <!-- Tunic of Zubei - Robe Armor -->
+	<item id="2402" price="0" /> <!-- Stockings of Zubei - Robe Armor -->
+	<item id="5712" price="0" /> <!-- Zubei's Gauntlets - Robe Armor -->
+	<item id="5728" price="0" /> <!-- Zubei's Boots - Robe Armor -->
+	<item id="90461" price="0" /> <!-- Blue Wolf Helmet - Heavy Armor -->
+	<item id="358" price="0" /> <!-- Blue Wolf Breastplate - Heavy Armor -->
+	<item id="2380" price="0" /> <!-- Blue Wolf Gaiters - Heavy Armor -->
+	<item id="5718" price="0" /> <!-- Blue Wolf Gloves - Heavy Armor -->
+	<item id="5734" price="0" /> <!-- Blue Wolf Boots - Heavy Armor -->
+	<item id="90462" price="0" /> <!-- Blue Wolf Helmet - Light Armor -->
+	<item id="2391" price="0" /> <!-- Blue Wolf Leather Armor - Light Armor -->
 	<item id="5719" price="0" /> <!-- Blue Wolf Gloves - Light Armor -->
 	<item id="5735" price="0" /> <!-- Blue Wolf Boots - Light Armor -->
-	<item id="2392" price="0" /> <!-- Leather Armor of Doom -->
+	<item id="90463" price="0" /> <!-- Blue Wolf Helmet - Robe Armor -->
+	<item id="2398" price="0" /> <!-- Blue Wolf Tunic - Robe Armor -->
+	<item id="2403" price="0" /> <!-- Blue Wolf Stockings - Robe Armor -->
+	<item id="5720" price="0" /> <!-- Blue Wolf Gloves - Robe Armor -->
+	<item id="5736" price="0" /> <!-- Blue Wolf Boots - Robe Armor -->
+	<item id="90455" price="0" /> <!-- Avadon Circlet - Heavy Armor -->
+	<item id="2376" price="0" /> <!-- Avadon Breastplate - Heavy Armor -->
+	<item id="2379" price="0" /> <!-- Avadon Gaiters - Heavy Armor -->
+	<item id="5714" price="0" /> <!-- Avadon Gloves - Heavy Armor -->
+	<item id="5730" price="0" /> <!-- Avadon Boots - Heavy Armor -->
+	<item id="673" price="0" /> <!-- Avadon Shield - Heavy Armor -->
+	<item id="90456" price="0" /> <!-- Avadon Circlet - Light Armor -->
+	<item id="2390" price="0" /> <!-- Avadon Leather Armor - Light Armor -->
+	<item id="5715" price="0" /> <!-- Avadon Gloves - Light Armor -->
+	<item id="5731" price="0" /> <!-- Avadon Boots - Light Armor -->
+	<item id="90457" price="0" /> <!-- Avadon Circlet - Robe Armor -->
+	<item id="2406" price="0" /> <!-- Avadon Robe Armor - Robe Armor -->
+	<item id="5716" price="0" /> <!-- Avadon Gloves - Robe Armor -->
+	<item id="5732" price="0" /> <!-- Avadon Boots - Robe Armor -->
+	<item id="90464" price="0" /> <!-- Doom Helmet - Heavy Armor -->
+	<item id="2381" price="0" /> <!-- Doom Plate Armor - Heavy Armor -->
+	<item id="5722" price="0" /> <!-- Doom Gloves - Heavy Armor -->
+	<item id="5738" price="0" /> <!-- Doom Boots - Heavy Armor -->
+	<item id="110" price="0" /> <!-- Doom Shield - Heavy Armor -->
+	<item id="90465" price="0" /> <!-- Doom Helmet - Light Armor -->
+	<item id="2392" price="0" /> <!-- Leather Armor of Doom - Light Armor -->
 	<item id="5723" price="0" /> <!-- Doom Gloves - Light Armor -->
 	<item id="5739" price="0" /> <!-- Doom Boots - Light Armor -->
-	<item id="2397" price="0" /> <!-- Tunic of Zubei -->
-	<item id="2402" price="0" /> <!-- Stockings of Zubei -->
-	<item id="5712" price="0" /> <!-- Zubei's Gauntlets - Robe -->
-	<item id="5728" price="0" /> <!-- Zubei's Boots - Robe -->
-	<item id="2398" price="0" /> <!-- Blue Wolf Tunic -->
-	<item id="2403" price="0" /> <!-- Blue Wolf Stockings -->
-	<item id="5720" price="0" /> <!-- Blue Wolf Gloves - Robe -->
-	<item id="5736" price="0" /> <!-- Blue Wolf Boots - Robe -->
-	<item id="2399" price="0" /> <!-- Tunic of Doom -->
-	<item id="2404" price="0" /> <!-- Stockings of Doom -->
-	<item id="5724" price="0" /> <!-- Doom Gloves - Robe -->
-	<item id="5740" price="0" /> <!-- Doom Boots - Robe -->
-	<item id="2406" price="0" /> <!-- Avadon Robe -->
-	<item id="5716" price="0" /> <!-- Avadon Gloves - Robe -->
-	<item id="5732" price="0" /> <!-- Avadon Boots - Robe -->
-	<item id="554" price="0" /> <!-- Sealed Zubei's Boots -->
-	<item id="612" price="0" /> <!-- Sealed Zubei's Gauntlets -->
-	<item id="2439" price="0" /> <!-- Sealed Blue Wolf Boots -->
-	<item id="2487" price="0" /> <!-- Sealed Blue Wolf Gloves -->
-	<item id="600" price="0" /> <!-- Sealed Avadon Boots -->
-	<item id="2464" price="0" /> <!-- Sealed Avadon Gloves -->
-	<item id="601" price="0" /> <!-- Sealed Doom Boots -->
-	<item id="2475" price="0" /> <!-- Sealed Doom Gloves -->
+	<item id="90466" price="0" /> <!-- Doom Helmet - Robe Armor -->
+	<item id="2399" price="0" /> <!-- Tunic of Doom - Robe Armor -->
+	<item id="2404" price="0" /> <!-- Stockings of Doom - Robe Armor -->
+	<item id="5724" price="0" /> <!-- Doom Gloves - Robe Armor -->
+	<item id="5740" price="0" /> <!-- Doom Boots - Robe Armor -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009955.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009955.xml
index 32c33c4339..d73da51c83 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009955.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009955.xml
@@ -1,77 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/buylist.xsd">
-	<item id="365" price="0" /> <!-- Dark Crystal Breastplate -->
-	<item id="388" price="0" /> <!-- Dark Crystal Gaiters -->
-	<item id="512" price="0" /> <!-- Dark Crystal Helmet -->
+	<item id="90470" price="0" /> <!-- Dark Crystal Helmet - Heavy Armor -->
+	<item id="365" price="0" /> <!-- Dark Crystal Breastplate - Heavy Armor -->
+	<item id="388" price="0" /> <!-- Dark Crystal Gaiters - Heavy Armor -->
 	<item id="5765" price="0" /> <!-- Dark Crystal Gloves - Heavy Armor -->
 	<item id="5777" price="0" /> <!-- Dark Crystal Boots - Heavy Armor -->
-	<item id="641" price="0" /> <!-- Dark Crystal Shield -->
-	<item id="2382" price="0" /> <!-- Tallum Plate Armor -->
-	<item id="547" price="0" /> <!-- Tallum Helm -->
-	<item id="5768" price="0" /> <!-- Tallum Gloves - Heavy Armor -->
-	<item id="5780" price="0" /> <!-- Tallum Boots - Heavy Armor -->
-	<item id="2385" price="0" /> <!-- Dark Crystal Leather Armor -->
-	<item id="2389" price="0" /> <!-- Dark Crystal Leggings -->
+	<item id="641" price="0" /> <!-- Dark Crystal Shield - Heavy Armor -->
+	<item id="90471" price="0" /> <!-- Dark Crystal Helmet - Light Armor -->
+	<item id="2385" price="0" /> <!-- Dark Crystal Leather Armor - Light Armor -->
+	<item id="2389" price="0" /> <!-- Dark Crystal Leggings - Light Armor -->
 	<item id="5766" price="0" /> <!-- Dark Crystal Gloves - Light Armor -->
 	<item id="5778" price="0" /> <!-- Dark Crystal Boots - Light Armor -->
-	<item id="2393" price="0" /> <!-- Tallum Leather Armor -->
+	<item id="90472" price="0" /> <!-- Dark Crystal Helmet - Robe Armor -->
+	<item id="2407" price="0" /> <!-- Dark Crystal Robe Armor - Robe Armor -->
+	<item id="5767" price="0" /> <!-- Dark Crystal Gloves - Robe Armor -->
+	<item id="5779" price="0" /> <!-- Dark Crystal Boots - Robe Armor -->
+	<item id="90467" price="0" /> <!-- Tallum Helm - Heavy Armor -->
+	<item id="2382" price="0" /> <!-- Tallum Plate Armor - Heavy Armor -->
+	<item id="5768" price="0" /> <!-- Tallum Gloves - Heavy Armor -->
+	<item id="5780" price="0" /> <!-- Tallum Boots - Heavy Armor -->
+	<item id="90468" price="0" /> <!-- Tallum Helm - Light Armor -->
+	<item id="2393" price="0" /> <!-- Tallum Leather Armor - Light Armor -->
 	<item id="5769" price="0" /> <!-- Tallum Gloves - Light Armor -->
 	<item id="5781" price="0" /> <!-- Tallum Boots - Light Armor -->
-	<item id="2400" price="0" /> <!-- Tallum Tunic -->
-	<item id="2405" price="0" /> <!-- Tallum Stockings -->
-	<item id="5770" price="0" /> <!-- Tallum Gloves - Robe -->
-	<item id="5782" price="0" /> <!-- Tallum Boots - Robe -->
-	<item id="2407" price="0" /> <!-- Dark Crystal Robe -->
-	<item id="5767" price="0" /> <!-- Dark Crystal Gloves - Robe -->
-	<item id="5779" price="0" /> <!-- Dark Crystal Boots - Robe -->
-	<item id="374" price="0" /> <!-- Armor of Nightmare -->
-	<item id="2418" price="0" /> <!-- Helm of Nightmare -->
+	<item id="90469" price="0" /> <!-- Tallum Helm - Robe Armor -->
+	<item id="2400" price="0" /> <!-- Tallum Tunic - Robe Armor -->
+	<item id="2405" price="0" /> <!-- Tallum Stockings - Robe Armor -->
+	<item id="5770" price="0" /> <!-- Tallum Gloves - Robe Armor -->
+	<item id="5782" price="0" /> <!-- Tallum Boots - Robe Armor -->
+	<item id="90473" price="0" /> <!-- Helm of Nightmare - Heavy Armor -->
+	<item id="374" price="0" /> <!-- Armor of Nightmare - Heavy Armor -->
 	<item id="5771" price="0" /> <!-- Gauntlets of Nightmare - Heavy Armor -->
 	<item id="5783" price="0" /> <!-- Boots of Nightmare - Heavy Armor -->
-	<item id="2498" price="0" /> <!-- Shield of Nightmare -->
-	<item id="2383" price="0" /> <!-- Majestic Plate Armor -->
-	<item id="2419" price="0" /> <!-- Majestic Circlet -->
-	<item id="5774" price="0" /> <!-- Majestic Gauntlets - Heavy Armor -->
-	<item id="5786" price="0" /> <!-- Majestic Boots - Heavy Armor -->
-	<item id="2394" price="0" /> <!-- Leather Armor of Nightmare -->
+	<item id="2498" price="0" /> <!-- Shield of Nightmare - Heavy Armor -->
+	<item id="90474" price="0" /> <!-- Helm of Nightmare - Light Armor -->
+	<item id="2394" price="0" /> <!-- Leather Armor of Nightmare - Light Armor -->
 	<item id="5772" price="0" /> <!-- Gauntlets of Nightmare - Light Armor -->
 	<item id="5784" price="0" /> <!-- Boots of Nightmare - Light Armor -->
-	<item id="2395" price="0" /> <!-- Majestic Leather Armor -->
+	<item id="90475" price="0" /> <!-- Helm of Nightmare - Robe Armor -->
+	<item id="2408" price="0" /> <!-- Robe Armor of Nightmare - Robe Armor -->
+	<item id="5773" price="0" /> <!-- Gauntlets of Nightmare - Robe Armor -->
+	<item id="5785" price="0" /> <!-- Boots of Nightmare - Robe Armor -->
+	<item id="90476" price="0" /> <!-- Majestic Circlet - Heavy Armor -->
+	<item id="2383" price="0" /> <!-- Majestic Plate Armor - Heavy Armor -->
+	<item id="5774" price="0" /> <!-- Majestic Gauntlets - Heavy Armor -->
+	<item id="5786" price="0" /> <!-- Majestic Boots - Heavy Armor -->
+	<item id="90477" price="0" /> <!-- Majestic Circlet - Light Armor -->
+	<item id="2395" price="0" /> <!-- Majestic Leather Armor - Light Armor -->
 	<item id="5775" price="0" /> <!-- Majestic Gauntlets - Light Armor -->
 	<item id="5787" price="0" /> <!-- Majestic Boots - Light Armor -->
-	<item id="2408" price="0" /> <!-- Robe of Nightmare -->
-	<item id="5773" price="0" /> <!-- Gauntlets of Nightmare - Robe -->
-	<item id="5785" price="0" /> <!-- Boots of Nightmare - Robe -->
-	<item id="2409" price="0" /> <!-- Majestic Robe -->
-	<item id="5776" price="0" /> <!-- Majestic Gauntlets - Robe -->
-	<item id="5788" price="0" /> <!-- Majestic Boots - Robe -->
-	<item id="5287" price="0" /> <!-- Sealed Dark Crystal breastplate -->
-	<item id="5288" price="0" /> <!-- Sealed Dark Crystal Gaiters -->
-	<item id="5289" price="0" /> <!-- Sealed Dark Crystal Helmet -->
-	<item id="5290" price="0" /> <!-- Sealed Dark Crystal Gloves -->
-	<item id="5291" price="0" /> <!-- Sealed Dark Crystal Boots -->
-	<item id="5292" price="0" /> <!-- Sealed Dark Crystal Shield -->
-	<item id="5297" price="0" /> <!-- Sealed Dark Crystal Leather Armor -->
-	<item id="5298" price="0" /> <!-- Sealed Dark Crystal Leggings -->
-	<item id="5308" price="0" /> <!-- Sealed Dark Crystal Robe -->
-	<item id="5293" price="0" /> <!-- Sealed Tallum Plate Armor -->
-	<item id="5294" price="0" /> <!-- Sealed Tallum Helmet -->
-	<item id="5295" price="0" /> <!-- Sealed Tallum Gloves -->
-	<item id="5296" price="0" /> <!-- Sealed Tallum Boots -->
-	<item id="5301" price="0" /> <!-- Sealed Tallum Leather Armor -->
-	<item id="5304" price="0" /> <!-- Sealed Tallum Tunic -->
-	<item id="5305" price="0" /> <!-- Sealed Tallum Stockings -->
-	<item id="5311" price="0" /> <!-- Sealed Armor of Nightmare -->
-	<item id="5312" price="0" /> <!-- Sealed Helm of Nightmare -->
-	<item id="5313" price="0" /> <!-- Sealed Gauntlets of Nightmare -->
-	<item id="5314" price="0" /> <!-- Sealed Boots of Nightmare -->
-	<item id="5315" price="0" /> <!-- Sealed Shield of Nightmare -->
-	<item id="5320" price="0" /> <!-- Sealed Leather Armor of Nightmare -->
-	<item id="5326" price="0" /> <!-- Sealed Robe of Nightmare -->
-	<item id="5316" price="0" /> <!-- Sealed Majestic Plate Armor -->
-	<item id="5317" price="0" /> <!-- Sealed Majestic Circlet -->
-	<item id="5318" price="0" /> <!-- Sealed Majestic Gauntlets -->
-	<item id="5319" price="0" /> <!-- Sealed Majestic Boots -->
-	<item id="5323" price="0" /> <!-- Sealed Majestic Leather Armor -->
-	<item id="5329" price="0" /> <!-- Sealed Majestic Robe -->
+	<item id="90478" price="0" /> <!-- Majestic Circlet - Robe Armor -->
+	<item id="2409" price="0" /> <!-- Majestic Robe Armor - Robe Armor -->
+	<item id="5776" price="0" /> <!-- Majestic Gauntlets - Robe Armor -->
+	<item id="5788" price="0" /> <!-- Majestic Boots - Robe Armor -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009959.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009959.xml
index 8b396c5b43..ccbc509050 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009959.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/buylists/custom/0009959.xml
@@ -9,5 +9,5 @@
 	<item id="7856" price="0" /> <!-- Clan Oath Boots - Light Armor -->
 	<item id="7857" price="0" /> <!-- Clan Oath Aketon -->
 	<item id="7858" price="0" /> <!-- Clan Oath Padded Gloves - Robe -->
-	<item id="7859" price="0" /> <!-- Clan Oath Sandals - Robe -->
+	<item id="7859" price="0" /> <!-- Clan Oath Sandals - Robe --> <!-- Kamen -->
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/gmstore/gear/weapons.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/gmstore/gear/weapons.htm
index 65fe04f4c9..803e9daac3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/gmstore/gear/weapons.htm
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/gmstore/gear/weapons.htm
@@ -39,7 +39,7 @@
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9997" value="A Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/weapons/a.htm" value="A Grade" width=120 height=21 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>