diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125701.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125701.xml
new file mode 100644
index 0000000000..9db5b2ea83
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125701.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+	<npcs>
+		<npc>31257</npc> <!--Veronica -->
+	</npcs>
+	<item id="2" price="490800" />	<!-- Long Sword -->
+	<item id="218" price="163200" />	<!-- Throwing Knife -->
+	<item id="272" price="163200" />	<!-- Forest Bow -->
+	<item id="15" price="163200" />	<!-- Short Spear -->
+	<item id="256" price="163200" />	<!-- Cestus -->
+	<item id="68" price="292800" />	<!-- Falchion -->
+	<item id="219" price="292800" />	<!-- Sword Breaker -->
+	<item id="273" price="292800" />	<!-- Compound Bow -->
+	<item id="155" price="292800" />	<!-- Flanged Mace -->
+	<item id="87" price="292800" />	<!-- Iron Hammer -->
+	<item id="16" price="292800" />	<!-- Great Spear -->
+	<item id="257" price="292800" />	<!-- Viper Fang -->
+	<item id="123" price="490800" />	<!-- Saber -->
+	<item id="7880" price="490800" />	<!-- Steel Sword -->
+	<item id="220" price="490800" />	<!-- Crafted Dagger -->
+	<item id="221" price="490800" />	<!-- Assassin Knife -->
+	<item id="274" price="490800" />	<!-- Reinforced Bow -->
+	<item id="156" price="490800" />	<!-- Hand Axe -->
+	<item id="166" price="490800" />	<!-- Heavy Mace -->
+	<item id="168" price="490800" />	<!-- Work Hammer -->
+	<item id="291" price="490800" />	<!-- Trident -->
+	<item id="258" price="490800" />	<!-- Bagh-Nakh -->
+	<item id="69" price="772800" />	<!-- Bastard Sword -->
+	<item id="222" price="772800" />	<!-- Poniard Dagger -->
+	<item id="275" price="772800" />	<!-- Longbow -->
+	<item id="277" price="772800" />	<!-- Dark Elven Bow -->
+	<item id="292" price="772800" />	<!-- Pike -->
+	<item id="295" price="772800" />	<!-- Dwarven Trident -->
+	<item id="259" price="772800" />	<!-- Single-Edged Jamadhr -->
+	<item id="88" price="1680000" />	<!-- Mornign Star -->
+</list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125702.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125702.xml
new file mode 100644
index 0000000000..8abc69f62d
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125702.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+	<npcs>
+		<npc>31257</npc> <!--Veronica -->
+	</npcs>
+	<item id="176" price="163200" /> <!-- Apprentice's Staff -->
+	<item id="310" price="163200" /> <!-- Relic of the Saints -->
+	<item id="177" price="292800" /> <!-- Mage Staff -->
+	<item id="311" price="292800" /> <!-- Crucifix of Blessing -->
+	<item id="100" price="292800" /> <!-- Voodoo Doll -->
+	<item id="178" price="490800" /> <!-- Bone Staff -->
+	<item id="101" price="490800" /> <!-- Scroll of Wisdom -->
+	<item id="7885" price="490800" /> <!-- Priest Sword -->
+	<item id="312" price="490800" /> <!-- Branch of Life -->
+	<item id="314" price="490800" /> <!-- Proof of Revenge -->
+	<item id="179" price="772800" /> <!-- Mace of Prayer -->
+	<item id="182" price="772800" /> <!-- Doom Hammer -->
+	<item id="183" price="772800" /> <!-- Mystic Staff -->
+	<item id="185" price="772800" /> <!-- Staff of Mana -->
+	<item id="315" price="772800" /> <!-- Divine Tome -->
+	<item id="83" price="859200" /> <!-- Sword of Magic -->
+	<item id="143" price="859200" /> <!-- Sword of Mystic -->
+	<item id="144" price="859200" /> <!-- Sword of Occult -->
+	<item id="238" price="1160400" /> <!-- Dagger of Mana -->
+	<item id="239" price="1160400" /> <!-- Mystic Knife -->
+	<item id="240" price="1160400" /> <!-- Conjurer's Knife -->
+</list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125801.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125801.xml
new file mode 100644
index 0000000000..adf3179a29
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125801.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+	<npcs>
+		<npc>31258</npc> <!-- Simplon -->
+	</npcs>
+	<item id="412" price="15240" /> <!-- Cotton Pants -->
+	<item id="390" price="24360" /> <!-- Cotton Shirt -->
+	<item id="24" price="24360" /> <!-- Bone Bronze -->
+	<item id="31" price="15240" /> <!-- Bone Gaiters -->
+	<item id="102" price="8532" /> <!-- Round Shield -->
+	<item id="50" price="8124" /> <!-- Leather Gloves -->
+	<item id="38" price="8124" /> <!-- Low Boots -->
+	<item id="44" price="12240" /> <!-- Leather Helm -->
+	<item id="25" price="38160" /> <!-- Piece Bone Breastplate -->
+	<item id="32" price="23880" /> <!-- Piece Bone Gaiters -->
+	<item id="26" price="59040" /> <!-- Bronze Breastplate -->
+	<item id="33" price="27600" /> <!-- Durable Leather Gaiters -->
+	<item id="27" price="44280" /> <!-- Durable Leather Shirt -->
+	<item id="34" price="36840" /> <!-- Bronze Gaiters -->
+	<item id="625" price="15480" /> <!-- Bone Shield -->
+	<item id="51" price="14760" /> <!-- Bracer  -->
+	<item id="39" price="14760" /> <!-- Boots  -->
+	<item id="1148" price="22080" /> <!-- Durable Leather Helmet -->
+	<item id="413" price="46920" /> <!-- Puma Skin Gaiters -->
+	<item id="347" price="100200" /> <!-- Ring Breastplate -->
+	<item id="376" price="62640" /> <!-- Iron Plate Gaiters -->
+	<item id="391" price="75120" /> <!-- Puma Skin Shirt -->
+	<item id="626" price="26280" /> <!-- Bronze Shield -->
+	<item id="604" price="25080" /> <!-- Quality Leather Gloves -->
+	<item id="40" price="25080" /> <!-- Leather Boots -->
+	<item id="45" price="37560" /> <!-- Bone Helmet -->
+	<item id="414" price="75000" /> <!-- Lion Skin Gaiters -->
+	<item id="392" price="119880" /> <!-- Lion Skin Shirt -->
+	<item id="627" price="42000" /> <!-- Aspis -->
+	<item id="605" price="39960" /> <!-- Leather Gauntlets -->
+	<item id="1123" price="39960" /> <!-- Blue Buckskin Boots -->
+	<item id="46" price="60000" /> <!-- Bronze Helmet -->
+	<item id="58" price="219600" /> <!-- Mithril Breastplate -->
+	<item id="59" price="152400" /> <!-- Mithril Gaiters -->
+	<item id="415" price="114240" /> <!-- Mithril Banded Gaiters -->
+	<item id="393" price="182400" /> <!-- Mithril Banded Mail -->
+</list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125802.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125802.xml
new file mode 100644
index 0000000000..ff39b30d3b
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3125802.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+	<npcs>
+		<npc>31258</npc> <!-- Simplon -->
+	</npcs>
+	<item id="1104" price="15240" /> <!-- Stockings of Devotion -->
+	<item id="1101" price="24360" /> <!-- Tunic of Devotion -->
+	<item id="102" price="8532" /> <!-- Round Shield -->
+	<item id="50" price="8124" /> <!-- Leather Gloves -->
+	<item id="38" price="8124" /> <!-- Low Boots -->
+	<item id="44" price="12240" /> <!-- Leather Helm -->
+	<item id="1105" price="27600" /> <!-- Stockings of Magic -->
+	<item id="1102" price="44280" /> <!-- Tunic of Magic -->
+	<item id="625" price="15480" /> <!-- Bone Shield -->
+	<item id="51" price="14760" /> <!-- Bracer  -->
+	<item id="39" price="14760" /> <!-- Boots  -->
+	<item id="1148" price="22080" /> <!-- Durable Leather Helmet -->
+	<item id="465" price="46920" /> <!-- Crused Stockings  -->
+	<item id="432" price="75120" /> <!-- Crused Tunic  -->
+	<item id="626" price="26280" /> <!-- Bronze Shield -->
+	<item id="604" price="25080" /> <!-- Quality Leather Gloves -->
+	<item id="40" price="25080" /> <!-- Leather Boots -->
+	<item id="45" price="37560" /> <!-- Bone Helmet -->
+	<item id="467" price="75000" /> <!-- Dark Stockings -->
+	<item id="434" price="119880" /> <!-- White Tunic  -->
+	<item id="468" price="75000" /> <!-- Wizard Stockings  -->
+	<item id="435" price="119880" /> <!-- Wizard Tunic  -->
+	<item id="627" price="42000" /> <!-- Aspis -->
+	<item id="605" price="39960" /> <!-- Leather Gauntlets -->
+	<item id="1123" price="39960" /> <!-- Blue Buckskin Boots -->
+	<item id="46" price="60000" /> <!-- Bronze Helmet -->
+	<item id="469" price="114240" /> <!-- Stockings of Knowledge -->
+	<item id="436" price="182400" /> <!-- Tunic of Knowledge -->
+</list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3126001.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3126001.xml
new file mode 100644
index 0000000000..c767b1d1cb
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3126001.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+	<npcs>
+		<npc>31260</npc> <!-- Varan -->
+	</npcs>
+	<item id="908" price="14280" /> <!-- Necklace of Wisdom -->
+	<item id="845" price="10668" /> <!-- Cat's Eye Earring -->
+	<item id="877" price="7104" /> <!-- Ring of Wisdom -->
+	<item id="909" price="25560" /> <!-- Blue Diamond Necklace -->
+	<item id="846" price="19200" /> <!-- Coral Earring -->
+	<item id="878" price="12840" /> <!-- Blue Coral Ring -->
+	<item id="910" price="43080" /> <!-- Necklace of Devotion -->
+	<item id="847" price="32280" /> <!-- Red Crescent -->
+	<item id="890" price="21600" /> <!-- Ring of Devotion -->
+</list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3126301.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3126301.xml
new file mode 100644
index 0000000000..1c1de52c50
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3126301.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+	<npcs>
+		<npc>31263</npc> <!-- Harmony -->
+	</npcs>
+	<item id="1835" price="8" /> <!-- Soulshot (No-grade) -->
+	<item id="2509" price="17" /> <!-- Spiritshot (No-grade) -->
+	<item id="3947" price="40" /> <!-- Blessed Spiritshot (No-grade) -->
+	<item id="5146" price="13282" /> <!-- Blessed Spiritshot Compressed Package (No-grade) -->
+	<item id="5140" price="5692" /> <!-- Spiritshot Compressed Package (No-grade) -->
+	<item id="5134" price="2645" /> <!-- Soulshot Compressed Package (No-grade) -->
+	<item id="5262" price="44275" /> <!-- Greater Blessed Spiritshot Compressed Package (No-grade) -->
+	<item id="5256" price="18975" /> <!-- Greater Spiritshot Compressed Package (No-grade) -->
+	<item id="5250" price="8855" /> <!-- Greater Soulshot Compressed Package (No-grade) -->
+	<item id="17" price="2" /> <!-- Wooden Arrow -->
+	<item id="1341" price="3" /> <!-- Bone Arrow -->
+	<item id="1342" price="7" /> <!-- Steel Arrow -->
+	<item id="1060" price="103" /> <!-- Healing Potion -->
+	<item id="1061" price="379" /> <!-- Major Healing Potion -->
+	<item id="1831" price="86" /> <!-- Antidote -->
+	<item id="1832" price="270" /> <!-- Greater Antidote -->
+	<item id="1833" price="86" /> <!-- Bandage -->
+	<item id="1834" price="270" /> <!-- Emergency Dressing -->
+	<item id="734" price="1380" /> <!-- Wind Walk Potion -->
+	<item id="735" price="2760" /> <!-- Haste Potion -->
+	<item id="6035" price="2760" /> <!-- Magic Haste Potion -->
+	<item id="6037" price="150" /> <!-- Cancel Sleep Scroll -->
+	<item id="736" price="460" /> <!-- Scroll of Escape -->
+	<item id="737" price="2300" /> <!-- Scroll of Resurrection -->
+	<item id="3031" price="460" /> <!-- Spirit Ore -->
+	<item id="1785" price="287" /> <!-- Soulstone -->
+	<item id="5589" price="115" /> <!-- Momentum Stone -->
+	<item id="1661" price="1150" /> <!-- Thief Key -->
+	<item id="5192" price="115" /> <!-- Magic Rope (D-grade) -->
+	<item id="5193" price="172" /> <!-- Magic Rope (C-grade) -->
+	<item id="2130" price="1150" /> <!-- Gemstone (D-grade) -->
+	<item id="2131" price="4500" /> <!-- Gemstone (C-grade) -->
+	<item id="4679" price="750" /> <!-- Eva's Blessing -->
+</list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3126302.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3126302.xml
new file mode 100644
index 0000000000..af5edc6bbf
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/buylists/3126302.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+	<npcs>
+		<npc>31263</npc> <!-- Harmony -->
+	</npcs>
+	<item id="4445" price="6120" /> <!-- Dye of STR <STR + 1 CON -3> (1st Class tranfer)-->
+	<item id="4446" price="6120" /> <!-- Dye of STR <STR + 1 DEX -3> (1st Class tranfer)-->
+	<item id="4447" price="6120" /> <!-- Dye of CON <CON + 1 STR -3> (1st Class tranfer)-->
+	<item id="4448" price="6120" /> <!-- Dye of CON <CON + 1 DEX -3> (1st Class tranfer)-->
+	<item id="4449" price="6120" /> <!-- Dye of DEX <DEX + 1 STR -3> (1st Class tranfer)-->
+	<item id="4450" price="6120" /> <!-- Dye of DEX <DEX + 1 CON -3> (1st Class tranfer)-->
+	<item id="4451" price="6120" /> <!-- Dye of INT <INT + 1 MEN -3> (1st Class tranfer)-->
+	<item id="4452" price="6120" /> <!-- Dye of INT <INT + 1 WIT -3> (1st Class tranfer)-->
+	<item id="4453" price="6120" /> <!-- Dye of MEN <MEN + 1 INT -3> (1st Class tranfer)-->
+	<item id="4454" price="6120" /> <!-- Dye of MEN <MEN + 1 WIT -3> (1st Class tranfer)-->
+	<item id="4455" price="6120" /> <!-- Dye of WIT <WIT + 1 INT -3> (1st Class tranfer)-->
+	<item id="4456" price="6120" /> <!-- Dye of WIT <WIT + 1 MEN -3> (1st Class tranfer)-->
+	<item id="4457" price="14400" /> <!-- Dye of STR <STR + 1 CON -2> (1st Class tranfer)-->
+	<item id="4458" price="14400" /> <!-- Dye of STR <STR + 1 DEX -2> (1st Class tranfer)-->
+	<item id="4459" price="14400" /> <!-- Dye of CON <CON + 1 STR -2> (1st Class tranfer)-->
+	<item id="4460" price="14400" /> <!-- Dye of CON <CON + 1 DEX -2> (1st Class tranfer)-->
+	<item id="4461" price="14400" /> <!-- Dye of DEX <DEX + 1 STR -2> (1st Class tranfer)-->
+	<item id="4462" price="14400" /> <!-- Dye of DEX <DEX + 1 CON -2> (1st Class tranfer)-->
+	<item id="4463" price="14400" /> <!-- Dye of INT <INT + 1 MEN -2> (1st Class tranfer)-->
+	<item id="4464" price="14400" /> <!-- Dye of INT <INT + 1 WIT -2> (1st Class tranfer)-->
+	<item id="4465" price="14400" /> <!-- Dye of MEN <MEN + 1 INT -2> (1st Class tranfer)-->
+	<item id="4466" price="14400" /> <!-- Dye of MEN <MEN + 1 WIT -2> (1st Class tranfer)-->
+	<item id="4467" price="14400" /> <!-- Dye of WIT <WIT + 1 INT -2> (1st Class tranfer)-->
+	<item id="4468" price="14400" /> <!-- Dye of WIT <WIT + 1 MEN -2> (1st Class tranfer)-->
+</list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31257-1.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31257-1.htm
new file mode 100644
index 0000000000..5458a00611
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31257-1.htm
@@ -0,0 +1,5 @@
+<html><head><body>Trader Veronica:<br>
+Well, What excatly are you looking for?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 3125701">"I want to trade Warrior Equipment."</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 3125702">"I want to trade Wizard Equipment."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31257-pk.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31257-pk.htm
new file mode 100644
index 0000000000..82d4f2dd1e
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31257-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Veronica:<br>
+Oh ... you're a wanted criminal. My man may report you to the village guards if he sees you. Escape to another place at once. I cannot sell to you now, but I trust you will be a future customer. When you are free once more, please pay our shop a visit. Don't forget us.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31257.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31257.htm
new file mode 100644
index 0000000000..5ae2579fbe
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31257.htm
@@ -0,0 +1,5 @@
+<html><head><body>Trader Veronica:<br>
+Welcome! We carry every weapon you could need, from steel swords to fancy staffs. Please have a look around!<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 1">"I want to trade equipment."</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31258-1.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31258-1.htm
new file mode 100644
index 0000000000..a8d85de844
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31258-1.htm
@@ -0,0 +1,5 @@
+<html><head><body>Trader Helmut:<br>
+You look tired, friend. Here. have a seat. Take a load off. Let me show you some of our newest inventory.....<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 3125801">"I want to trade Warrior Equipment."</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 3125802">"I want to trade Wizard Equipment."</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31258-pk.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31258-pk.htm
new file mode 100644
index 0000000000..7b8e8ef51a
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31258-pk.htm
@@ -0,0 +1,4 @@
+<html><body>Trader Helmut:<br>
+Welcome. I've seen your face somewhere ... Where was it?<br>
+Wait a minute. Let me check something. Ah, here it is. There is a person that the village guards are looking for, who looks very much like you. Ever since I opened this shop in the town of Gludio, I have obeyed the law. I do not wish to sell my items to someone who may create problems. Please go elsewhere.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31258.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31258.htm
new file mode 100644
index 0000000000..5a7c7eaa09
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31258.htm
@@ -0,0 +1,6 @@
+<html><head><body>Trader Helmut:<br>
+Heave... Ho! What? A customer! Oh, I'm in the middle of moving loads...
+So, you need armor? Well, have a look around and see if there;s something you want! We used to have a lot of good items, but nowdays... well, with the northem regions so troubled, getting genuine Dwarven-made items is like  plucking a star from the sky. Too bad...<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 1">"I want to trade some equipment."</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31260-pk.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31260-pk.htm
new file mode 100644
index 0000000000..2c35ae0a15
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31260-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Judith:<br>
+Our shop must be famous, seeing how wanted criminals brave the danger of town to visit us. Well, it's true that there aren't that many shops with such wonderful items or such a dashing owner. Nonetheless ... Recently, someone broke the law and sold an item to a wanted criminal. He was put through great pain. I'm sorry, but please come back when you're free. I promise I will give you the royal treatment.
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31260.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31260.htm
new file mode 100644
index 0000000000..2602148424
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31260.htm
@@ -0,0 +1,5 @@
+<html><head><body>Trader Judith:<br>
+Would you like to see some of our featured items? Necklases, earrings, or I just got in some lovely rings! All sizes.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 3126001">"Trade."</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31263-pk.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31263-pk.htm
new file mode 100644
index 0000000000..41490b1f61
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31263-pk.htm
@@ -0,0 +1,4 @@
+<html><body>Trader Liesel:<br>
+Oh! Oh! Oh! I am so pleased to meet you! Aren't you the famous fugitive that has the whole village gossiping? How did you fool the guards? I can't believe I'm seeing you in person. Hmm ... What should I ask you first?<br>Just why are the village guards looking for you anyway? You punished the bad lords and helped the poor people, right? Isn't that it? Have I been reading too many stories?<br>
+<a action="bypass -h npc_%objectId%_Chat 1">Next</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31263.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31263.htm
new file mode 100644
index 0000000000..bcc7beb50e
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/merchant/31263.htm
@@ -0,0 +1,6 @@
+<html><head><body>Trader Liesel:<br>
+In our shop we carry a large number of pigments that have various effects. There must be one that suits you best, so please take a look arround.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 3126301">Trade supplies</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Buy 3126302">Trade Dye</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/villagemaster/31269.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/villagemaster/31269.htm
new file mode 100644
index 0000000000..38ac1cbd66
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/villagemaster/31269.htm
@@ -0,0 +1,10 @@
+<html><body>Warehouse Chief Gesto:<br>
+I am Warehouse Chief Gesto of the Iron Gate Guild here in Giran. Our motto is "We sell anything to anyone, anywhere." We travel to frozen wastes, deserts, even volcanic zones, to create prosperity for our Dwarven tribe. Who else can claim that?<br>
+But you're a new face around here, I see. What can I do for you?<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest DwarfWarehouseChange2">Listen to information about second class transfer.</Button>
+<!-- <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Subclass 0">Sub Class.</Button> -->
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest Clan">Clan.</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest Alliance">Alliance.</Button>
+<!-- <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Quest ShadowWeapons">Use Shadow Weapon Exchange Coupon.</Button> -->
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest.</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31267-1.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31267-1.htm
new file mode 100644
index 0000000000..5e914fb664
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31267-1.htm
@@ -0,0 +1,5 @@
+<html><body>Warehouse Keeper Lietta:<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_DepositP">Deposit an item (Private Warehouse)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_WithdrawP">Claim an item (Private Warehouse)</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h npc_%objectId%_Chat 0">Back</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31267-2.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31267-2.htm
new file mode 100644
index 0000000000..0389ec00bb
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31267-2.htm
@@ -0,0 +1,5 @@
+<html><body>Warehouse Keeper Lietta:<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_DepositC">Deposit an item (Clan Warehouse)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_WithdrawC">Claim an item (Clan Warehouse)</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h npc_%objectId%_Chat 0">Back</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31267.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31267.htm
new file mode 100644
index 0000000000..64784aa817
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31267.htm
@@ -0,0 +1,6 @@
+<html><body>Warehouse Keeper Lietta:<br>
+"The best Storage Service on the Continent!" That's the our warehouse's goal - we'll store anything the costumers need!<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 1">Private Warehouse</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 2">Clan warehouse</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31268-1.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31268-1.htm
new file mode 100644
index 0000000000..8edb2acbc0
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31268-1.htm
@@ -0,0 +1,5 @@
+<html><body>Warehouse Keeper Hakon:<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_DepositP">Deposit an item (Private Warehouse)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_WithdrawP">Claim an item (Private Warehouse)</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h npc_%objectId%_Chat 0">Back</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31268-2.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31268-2.htm
new file mode 100644
index 0000000000..f8f85c5c0f
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31268-2.htm
@@ -0,0 +1,5 @@
+<html><body>Warehouse Keeper Hakon:<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_DepositC">Deposit an item (Clan Warehouse)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_WithdrawC">Claim an item (Clan Warehouse)</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h npc_%objectId%_Chat 0">Back</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31268.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31268.htm
new file mode 100644
index 0000000000..c2258f37cc
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31268.htm
@@ -0,0 +1,6 @@
+<html><body>Warehouse Keeper Hakon:<br>
+"We handle our customer's property like our own!" That's the principle of our warehouse employees!<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 1">Private Warehouse</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 2">Clan warehouse</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31270-1.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31270-1.htm
new file mode 100644
index 0000000000..0c055f173b
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31270-1.htm
@@ -0,0 +1,5 @@
+<html><body>Warehouse Keeper Stefanio:<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_DepositP">Deposit an item (Private Warehouse)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_WithdrawP">Claim an item (Private Warehouse)</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h npc_%objectId%_Chat 0">Back</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31270-2.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31270-2.htm
new file mode 100644
index 0000000000..e224f0b55b
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31270-2.htm
@@ -0,0 +1,5 @@
+<html><body>Warehouse Keeper Stefanio:<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_DepositC">Deposit an item (Clan Warehouse)</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_WithdrawC">Claim an item (Clan Warehouse)</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h npc_%objectId%_Chat 0">Back</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31270.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31270.htm
new file mode 100644
index 0000000000..3f3448e234
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/warehouse/31270.htm
@@ -0,0 +1,6 @@
+<html><body>Warehouse Keeper Stefanio:<br>
+"Safe storage at low, low prices! Would you like to store that heavy spare shield or your high-priced accessories? You can store anything here with Stefanio! I will keep your treasures safe and dry until you come back to reclaim them! Refunds guaranteed for any lost items! Not that i ever lose items! No! No! I am very precise!<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 1">Private Warehouse</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Chat 2">Clan warehouse</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
+</body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
index 591fcb1e37..1eb5d1f03f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/SymbolMaker/SymbolMaker.java
@@ -40,6 +40,7 @@ public final class SymbolMaker extends AbstractNpcAI
 		31051, // Keach
 		31052, // Heid
 		31053, // Kidder
+		31264, // Olsun
 	};
 	
 	private SymbolMaker()
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/31200-31299.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/31200-31299.xml
index b598010387..807c5fda22 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/31200-31299.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/npcs/31200-31299.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
 	<npc id="31210" level="70" type="L2Npc" name="Race Track Gatekeeper" title="Monster Race Track">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -188,7 +188,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="31257" level="80" type="L2Npc" name="Veronica" title="Weapon Merchant">
+	<npc id="31257" level="80" type="L2Merchant" name="Veronica" title="Weapon Merchant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -207,7 +207,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="31258" level="80" type="L2Npc" name="Helmut" title="Armor Merchant">
+	<npc id="31258" level="80" type="L2Merchant" name="Helmut" title="Armor Merchant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -245,7 +245,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="31260" level="80" type="L2Npc" name="Judith" title="Accessory Merchant">
+	<npc id="31260" level="80" type="L2Merchant" name="Judith" title="Accessory Merchant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -302,7 +302,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="31263" level="80" type="L2Npc" name="Liesel" title="Grocer">
+	<npc id="31263" level="80" type="L2Merchant" name="Liesel" title="Grocer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -340,7 +340,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="31267" level="80" type="L2Npc" name="Lietta" title="Warehouse Keeper">
+	<npc id="31267" level="80" type="L2Warehouse" name="Lietta" title="Warehouse Keeper">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -359,7 +359,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="31268" level="80" type="L2Npc" name="Hakon" title="Warehouse Keeper">
+	<npc id="31268" level="80" type="L2Warehouse" name="Hakon" title="Warehouse Keeper">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -378,10 +378,10 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="31269" level="80" type="L2Npc" name="Mona" title="Warehouse Chief">
+	<npc id="31269" level="80" type="L2VillageMasterDwarf" name="Mona" title="Warehouse Chief">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
+		<race>DWARF</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
 			<speed>
@@ -397,7 +397,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="31270" level="80" type="L2Npc" name="Stefano" title="Warehouse Keeper">
+	<npc id="31270" level="80" type="L2Warehouse" name="Stefano" title="Warehouse Keeper">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>