From 189e4a3c7cace4c8b746aa3f1329a3e60fee9420 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 8 Jan 2019 00:47:04 +0000
Subject: [PATCH] Appearance stones two handed blunt fixes. Contributed by
 facab.

---
 .../dist/game/data/AppearanceStones.xml       |  67 +++------
 .../dist/game/data/AppearanceStones.xml       | 118 +++++----------
 .../dist/game/data/AppearanceStones.xml       | 118 +++++----------
 .../dist/game/data/AppearanceStones.xml       | 142 ++++++------------
 .../dist/game/data/AppearanceStones.xml       | 142 ++++++------------
 .../dist/game/data/AppearanceStones.xml       | 142 ++++++------------
 6 files changed, 226 insertions(+), 503 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/AppearanceStones.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/AppearanceStones.xml
index abbdd3b139..faa05b3ce5 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/AppearanceStones.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/AppearanceStones.xml
@@ -256,7 +256,6 @@
 		<targetType>ARMOR</targetType>
 	</appearance_stone>
 
-	<!-- Fixed -->
 	<!-- Metal Suit -->
 	<appearance_stone id="23493" targetType="ARMOR" type="FIXED" visualId="23448"> <!-- Metal Top Appearance Stone -->
 		<bodyPart>chest</bodyPart>
@@ -431,7 +430,7 @@
 	<appearance_stone id="23936" targetType="WEAPON" type="FIXED" visualId="23920" weaponType="BLUNT" bodyPart="lhand" lifeTime="7days" /> <!-- Tears One-handed Blunt Weapon -->
 	<appearance_stone id="23937" targetType="WEAPON" type="FIXED" visualId="23921" weaponType="SWORD" magicType="MAGICAL" bodyPart="lhand" lifeTime="7days" /> <!-- Tears Magic Sword -->
 	<appearance_stone id="23938" targetType="WEAPON" type="FIXED" visualId="23922" weaponType="BLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Tears One-handed Magic Blunt Weapon -->
-	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="23941" targetType="WEAPON" type="FIXED" visualId="23945" weaponType="DUALDAGGER" lifeTime="7days" /> <!-- Tears Dual Dagger -->
 	<appearance_stone id="23942" targetType="WEAPON" type="FIXED" visualId="23946" weaponType="DUALBLUNT" lifeTime="7days" /> <!-- Tears Dual Blunt Weapon -->
 	<appearance_stone id="23943" targetType="ARMOR" type="FIXED" visualId="23927" armorType="SHIELD" lifeTime="7days" /> <!-- Tears Shield -->
@@ -3087,7 +3086,7 @@
 	<appearance_stone id="37695" targetType="WEAPON" type="FIXED" visualId="37695" weaponType="CROSSBOW" lifeTime="15days" /> <!-- Valentine Crossbow -->
 	<appearance_stone id="37696" targetType="WEAPON" type="FIXED" visualId="37696" weaponType="SWORD" lifeTime="15days" /> <!-- Valentine One-handed Magic Sword -->
 	<appearance_stone id="37697" targetType="WEAPON" type="FIXED" visualId="37697" weaponType="BLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine One-handed Magic Blunt Weapon -->
-	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="37699" targetType="WEAPON" type="FIXED" visualId="37699" weaponType="DUAL" lifeTime="15days" /> <!-- Valentine Dualsword -->
 	<appearance_stone id="37700" targetType="WEAPON" type="FIXED" visualId="37700" weaponType="DUALDAGGER" lifeTime="15days" /> <!-- Valentine Dual Dagger -->
 	<appearance_stone id="37701" targetType="WEAPON" type="FIXED" visualId="37701" weaponType="DUALBLUNT" lifeTime="15days" /> <!-- Valentine Dual Blunt Weapon -->
@@ -3098,52 +3097,32 @@
 	<appearance_stone id="37908" targetType="WEAPON" type="FIXED" visualId="37945" weaponType="SWORD" /> <!-- Chrono Cithara Appearance Stone: One-handed Sword -->
 	<appearance_stone id="37909" targetType="WEAPON" type="FIXED" visualId="37946" weaponType="DUALFIST" /> <!-- Chrono Unitus Appearance Stone: Fist Weapon -->
 	<appearance_stone id="37910" targetType="WEAPON" type="FIXED" visualId="37947" weaponType="POLE" /> <!-- Chrono Campana Appearance Stone: Spear -->
-	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="DUALBLUNT" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
+	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
 	<appearance_stone id="37912" targetType="WEAPON" type="FIXED" visualId="37949" weaponType="DUAL" /> <!-- Chrono Maracas Appearance Stone: Dualsword -->
 	<appearance_stone id="37913" targetType="WEAPON" type="FIXED" visualId="37916" weaponType="DAGGER" /> <!-- Pumpkin Dagger Appearance Stone: Dagger -->
 	<appearance_stone id="37914" targetType="WEAPON" type="FIXED" visualId="37917" weaponType="DUALDAGGER" /> <!-- Pumpkin Dual Dagger Appearance Stone: Dual Dagger -->
 	<appearance_stone id="37915" targetType="WEAPON" type="FIXED" visualId="37918" weaponType="SWORD" magicType="MAGICAL" /> <!-- Scarecrow Sword Appearance Stone: One-handed Magic Sword -->
 
-	<!-- Monster Weapon Appearance Stone: Theor's Sword -->
-	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Sword of Corruption -->
-	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Octavis' Sword -->
-	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
-	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" />
-	<!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
-	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Axe -->
-	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
-	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
-	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
-	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
-	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/>
-	<!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
-	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
-	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
-	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Satyr's Staff -->
-	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/>
-	<!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
-	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" />
-	<!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
-	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Centaur's Bow -->
-	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
-	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" />
-	<!-- Monster Weapon Appearance Stone: Theor's Shield -->
-	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" />
-	<!-- Monster Weapon Appearance Stone: Shield of Corruption -->
-	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" />
+	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Theor's Sword -->
+	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Sword of Corruption -->
+	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Octavis' Sword -->
+	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" /> <!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
+	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" /> <!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
+	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Axe -->
+	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
+	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
+	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" /> <!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
+	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/> <!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
+	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
+	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
+	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
+	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/> <!-- Monster Weapon Appearance Stone: Satyr's Staff -->
+	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" /> <!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
+	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
+	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Centaur's Bow -->
+	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" /> <!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
+	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Theor's Shield -->
+	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Shield of Corruption -->
 
 	<appearance_stone id="40310" targetType="ACCESSORY" type="FIXED" visualId="37535"> <!-- Appearance Stone: Santa Hat -->
 		<bodyPart>hair</bodyPart>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/AppearanceStones.xml b/L2J_Mobius_2.5_Underground/dist/game/data/AppearanceStones.xml
index 3b6dcc0574..e1b56b1917 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/AppearanceStones.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/AppearanceStones.xml
@@ -436,7 +436,7 @@
 	<appearance_stone id="23936" targetType="WEAPON" type="FIXED" visualId="23920" weaponType="BLUNT" bodyPart="lhand" lifeTime="7days" /> <!-- Tears One-handed Blunt Weapon -->
 	<appearance_stone id="23937" targetType="WEAPON" type="FIXED" visualId="23921" weaponType="SWORD" magicType="MAGICAL" bodyPart="lhand" lifeTime="7days" /> <!-- Tears Magic Sword -->
 	<appearance_stone id="23938" targetType="WEAPON" type="FIXED" visualId="23922" weaponType="BLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Tears One-handed Magic Blunt Weapon -->
-	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="23941" targetType="WEAPON" type="FIXED" visualId="23945" weaponType="DUALDAGGER" lifeTime="7days" /> <!-- Tears Dual Dagger -->
 	<appearance_stone id="23942" targetType="WEAPON" type="FIXED" visualId="23946" weaponType="DUALBLUNT" lifeTime="7days" /> <!-- Tears Dual Blunt Weapon -->
 	<appearance_stone id="23943" targetType="ARMOR" type="FIXED" visualId="23927" armorType="SHIELD" lifeTime="7days" /> <!-- Tears Shield -->
@@ -3429,7 +3429,7 @@
 	<appearance_stone id="37695" targetType="WEAPON" type="FIXED" visualId="37695" weaponType="CROSSBOW" lifeTime="15days" /> <!-- Valentine Crossbow -->
 	<appearance_stone id="37696" targetType="WEAPON" type="FIXED" visualId="37696" weaponType="SWORD" lifeTime="15days" /> <!-- Valentine One-handed Magic Sword -->
 	<appearance_stone id="37697" targetType="WEAPON" type="FIXED" visualId="37697" weaponType="BLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine One-handed Magic Blunt Weapon -->
-	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="37699" targetType="WEAPON" type="FIXED" visualId="37699" weaponType="DUAL" lifeTime="15days" /> <!-- Valentine Dualsword -->
 	<appearance_stone id="37700" targetType="WEAPON" type="FIXED" visualId="37700" weaponType="DUALDAGGER" lifeTime="15days" /> <!-- Valentine Dual Dagger -->
 	<appearance_stone id="37701" targetType="WEAPON" type="FIXED" visualId="37701" weaponType="DUALBLUNT" lifeTime="15days" /> <!-- Valentine Dual Blunt Weapon -->
@@ -3440,52 +3440,32 @@
 	<appearance_stone id="37908" targetType="WEAPON" type="FIXED" visualId="37945" weaponType="SWORD" /> <!-- Chrono Cithara Appearance Stone: One-handed Sword -->
 	<appearance_stone id="37909" targetType="WEAPON" type="FIXED" visualId="37946" weaponType="DUALFIST" /> <!-- Chrono Unitus Appearance Stone: Fist Weapon -->
 	<appearance_stone id="37910" targetType="WEAPON" type="FIXED" visualId="37947" weaponType="POLE" /> <!-- Chrono Campana Appearance Stone: Spear -->
-	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="DUALBLUNT" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
+	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
 	<appearance_stone id="37912" targetType="WEAPON" type="FIXED" visualId="37949" weaponType="DUAL" /> <!-- Chrono Maracas Appearance Stone: Dualsword -->
 	<appearance_stone id="37913" targetType="WEAPON" type="FIXED" visualId="37916" weaponType="DAGGER" /> <!-- Pumpkin Dagger Appearance Stone: Dagger -->
 	<appearance_stone id="37914" targetType="WEAPON" type="FIXED" visualId="37917" weaponType="DUALDAGGER" /> <!-- Pumpkin Dual Dagger Appearance Stone: Dual Dagger -->
 	<appearance_stone id="37915" targetType="WEAPON" type="FIXED" visualId="37918" weaponType="SWORD" magicType="MAGICAL" /> <!-- Scarecrow Sword Appearance Stone: One-handed Magic Sword -->
 
-	<!-- Monster Weapon Appearance Stone: Theor's Sword -->
-	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Sword of Corruption -->
-	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Octavis' Sword -->
-	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
-	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" />
-	<!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
-	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Axe -->
-	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
-	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
-	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
-	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
-	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/>
-	<!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
-	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
-	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
-	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Satyr's Staff -->
-	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/>
-	<!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
-	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" />
-	<!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
-	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Centaur's Bow -->
-	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
-	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" />
-	<!-- Monster Weapon Appearance Stone: Theor's Shield -->
-	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" />
-	<!-- Monster Weapon Appearance Stone: Shield of Corruption -->
-	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" />
+	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Theor's Sword -->
+	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Sword of Corruption -->
+	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Octavis' Sword -->
+	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" /> <!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
+	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" /> <!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
+	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Axe -->
+	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
+	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
+	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" /> <!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
+	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/> <!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
+	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
+	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
+	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
+	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/> <!-- Monster Weapon Appearance Stone: Satyr's Staff -->
+	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" /> <!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
+	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
+	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Centaur's Bow -->
+	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" /> <!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
+	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Theor's Shield -->
+	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Shield of Corruption -->
 
 	<appearance_stone id="46573" targetType="ARMOR" type="FIXED" visualId="46538"> <!-- Tauti's Breastplate Appearance Stone -->
 		<bodyPart>chest</bodyPart>
@@ -3627,7 +3607,7 @@
 		<visual id="46383" weaponType="CROSSBOW" /> <!-- Frozen Crossbow -->
 		<visual id="46377" weaponType="SWORD" handType="ONE_HANDED" magicType="MAGICAL" /> <!-- Frozen One-handed Magic Sword (Not-retail) -->
 		<visual id="46386" weaponType="BLUNT" handType="ONE_HANDED" magicType="MAGICAL" /> <!-- Frozen One-handed Magic Blunt Weapon -->
-		<visual id="46387" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Frozen Two-handed Magic Blunt Weapon -->
+		<visual id="46387" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Frozen Two-handed Magic Blunt Weapon -->
 		<visual id="46388" weaponType="DUAL" /> <!-- Frozen Dualsword -->
 		<visual id="46389" weaponType="DUALDAGGER" /> <!-- Frozen Dual Dagger -->
 		<visual id="46390" weaponType="DUALBLUNT" /> <!-- Frozen Dual Blunt -->
@@ -3635,43 +3615,19 @@
 		<visual id="46392" armorType="SIGIL" /> <!-- Frozen Sigil -->
 	</appearance_stone>
 	
-	<appearance_stone id="46108" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Drake Maul Appearance Stone -->
-		<visual id="22775" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46109" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Freya's Staff Appearance Stone -->
-		<visual id="22791" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" />
-	</appearance_stone>
-	<appearance_stone id="46110" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Spezion's Claw Appearance Stone -->
-		<visual id="22807" weaponType="DUALFIST" />
-	</appearance_stone>
-	<appearance_stone id="46111" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Maliss Stormer Appearance Stone -->
-		<visual id="22814" weaponType="POLE" />
-	</appearance_stone>
-	<appearance_stone id="46112" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Steregos' Dagger Appearance Stone -->
-		<visual id="22821" weaponType="DAGGER" />
-	</appearance_stone>
-	<appearance_stone id="46113" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
-		<visual id="22828" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46114" targetType="ALL" type="FIXED"> <!-- Drake Maul Appearance Stone -->
-		<visual id="22775" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46115" targetType="ALL" type="FIXED"> <!-- Freya's Staff Appearance Stone -->
-		<visual id="22791" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" />
-	</appearance_stone>
-	<appearance_stone id="46116" targetType="ALL" type="FIXED"> <!-- Spezion's Claw Appearance Stone -->
-		<visual id="22807" weaponType="DUALFIST" />
-	</appearance_stone>
-	<appearance_stone id="46117" targetType="ALL" type="FIXED"> <!-- Maliss Stormer Appearance Stone -->
-		<visual id="22814" weaponType="POLE" />
-	</appearance_stone>
-	<appearance_stone id="46118" targetType="ALL" type="FIXED"> <!-- Steregos' Dagger Appearance Stone -->
-		<visual id="22821" weaponType="DAGGER" />
-	</appearance_stone>
-	<appearance_stone id="46119" targetType="ALL" type="FIXED"> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
-		<visual id="22828" weaponType="DUALBLUNT" />
-	</appearance_stone>
-
+	<appearance_stone id="46108" targetType="WEAPON" type="FIXED" visualId="22775" weaponType="BLUNT" handType="TWO_HANDED" lifeTime="30days" /> <!-- Drake Maul Appearance Stone -->
+	<appearance_stone id="46109" targetType="WEAPON" type="FIXED" visualId="22791" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="30days" /> <!-- Freya's Staff Appearance Stone -->
+	<appearance_stone id="46110" targetType="WEAPON" type="FIXED" visualId="22807" weaponType="DUALFIST" lifeTime="30days" /> <!-- Spezion's Claw Appearance Stone -->
+	<appearance_stone id="46111" targetType="WEAPON" type="FIXED" visualId="22814" weaponType="POLE" lifeTime="30days" /> <!-- Maliss Stormer Appearance Stone -->
+	<appearance_stone id="46112" targetType="WEAPON" type="FIXED" visualId="22821" weaponType="DAGGER" lifeTime="30days" /> <!-- Steregos' Dagger Appearance Stone -->
+	<appearance_stone id="46113" targetType="WEAPON" type="FIXED" visualId="22828" weaponType="DUALBLUNT" lifeTime="30days" /> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
+	<appearance_stone id="46114" targetType="WEAPON" type="FIXED" visualId="22775" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Drake Maul Appearance Stone -->
+	<appearance_stone id="46115" targetType="WEAPON" type="FIXED" visualId="22791" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Freya's Staff Appearance Stone -->
+	<appearance_stone id="46116" targetType="WEAPON" type="FIXED" visualId="22807" weaponType="DUALFIST" /> <!-- Spezion's Claw Appearance Stone -->
+	<appearance_stone id="46117" targetType="WEAPON" type="FIXED" visualId="22814" weaponType="POLE" /> <!-- Maliss Stormer Appearance Stone -->
+	<appearance_stone id="46118" targetType="WEAPON" type="FIXED" visualId="22821" weaponType="DAGGER" /> <!-- Steregos' Dagger Appearance Stone -->
+	<appearance_stone id="46119" targetType="WEAPON" type="FIXED" visualId="22828" weaponType="DUALBLUNT" /> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
+	
 	<appearance_stone id="46120" targetType="ACCESSORY" type="FIXED" visualId="22169" lifeTime="30days"> <!-- Little Girls' Hat Appearance Stone -->
 		<bodyPart>hair</bodyPart>
 		<bodyPart>hair2</bodyPart>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/AppearanceStones.xml b/L2J_Mobius_3.0_Helios/dist/game/data/AppearanceStones.xml
index 6a1634e98f..0ffc86b0ca 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/AppearanceStones.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/AppearanceStones.xml
@@ -436,7 +436,7 @@
 	<appearance_stone id="23936" targetType="WEAPON" type="FIXED" visualId="23920" weaponType="BLUNT" bodyPart="lhand" lifeTime="7days" /> <!-- Tears One-handed Blunt Weapon -->
 	<appearance_stone id="23937" targetType="WEAPON" type="FIXED" visualId="23921" weaponType="SWORD" magicType="MAGICAL" bodyPart="lhand" lifeTime="7days" /> <!-- Tears Magic Sword -->
 	<appearance_stone id="23938" targetType="WEAPON" type="FIXED" visualId="23922" weaponType="BLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Tears One-handed Magic Blunt Weapon -->
-	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="23941" targetType="WEAPON" type="FIXED" visualId="23945" weaponType="DUALDAGGER" lifeTime="7days" /> <!-- Tears Dual Dagger -->
 	<appearance_stone id="23942" targetType="WEAPON" type="FIXED" visualId="23946" weaponType="DUALBLUNT" lifeTime="7days" /> <!-- Tears Dual Blunt Weapon -->
 	<appearance_stone id="23943" targetType="ARMOR" type="FIXED" visualId="23927" armorType="SHIELD" lifeTime="7days" /> <!-- Tears Shield -->
@@ -3429,7 +3429,7 @@
 	<appearance_stone id="37695" targetType="WEAPON" type="FIXED" visualId="37695" weaponType="CROSSBOW" lifeTime="15days" /> <!-- Valentine Crossbow -->
 	<appearance_stone id="37696" targetType="WEAPON" type="FIXED" visualId="37696" weaponType="SWORD" lifeTime="15days" /> <!-- Valentine One-handed Magic Sword -->
 	<appearance_stone id="37697" targetType="WEAPON" type="FIXED" visualId="37697" weaponType="BLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine One-handed Magic Blunt Weapon -->
-	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="37699" targetType="WEAPON" type="FIXED" visualId="37699" weaponType="DUAL" lifeTime="15days" /> <!-- Valentine Dualsword -->
 	<appearance_stone id="37700" targetType="WEAPON" type="FIXED" visualId="37700" weaponType="DUALDAGGER" lifeTime="15days" /> <!-- Valentine Dual Dagger -->
 	<appearance_stone id="37701" targetType="WEAPON" type="FIXED" visualId="37701" weaponType="DUALBLUNT" lifeTime="15days" /> <!-- Valentine Dual Blunt Weapon -->
@@ -3440,52 +3440,32 @@
 	<appearance_stone id="37908" targetType="WEAPON" type="FIXED" visualId="37945" weaponType="SWORD" /> <!-- Chrono Cithara Appearance Stone: One-handed Sword -->
 	<appearance_stone id="37909" targetType="WEAPON" type="FIXED" visualId="37946" weaponType="DUALFIST" /> <!-- Chrono Unitus Appearance Stone: Fist Weapon -->
 	<appearance_stone id="37910" targetType="WEAPON" type="FIXED" visualId="37947" weaponType="POLE" /> <!-- Chrono Campana Appearance Stone: Spear -->
-	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="DUALBLUNT" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
+	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
 	<appearance_stone id="37912" targetType="WEAPON" type="FIXED" visualId="37949" weaponType="DUAL" /> <!-- Chrono Maracas Appearance Stone: Dualsword -->
 	<appearance_stone id="37913" targetType="WEAPON" type="FIXED" visualId="37916" weaponType="DAGGER" /> <!-- Pumpkin Dagger Appearance Stone: Dagger -->
 	<appearance_stone id="37914" targetType="WEAPON" type="FIXED" visualId="37917" weaponType="DUALDAGGER" /> <!-- Pumpkin Dual Dagger Appearance Stone: Dual Dagger -->
 	<appearance_stone id="37915" targetType="WEAPON" type="FIXED" visualId="37918" weaponType="SWORD" magicType="MAGICAL" /> <!-- Scarecrow Sword Appearance Stone: One-handed Magic Sword -->
 
-	<!-- Monster Weapon Appearance Stone: Theor's Sword -->
-	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Sword of Corruption -->
-	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Octavis' Sword -->
-	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
-	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" />
-	<!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
-	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Axe -->
-	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
-	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
-	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
-	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
-	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/>
-	<!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
-	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
-	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
-	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Satyr's Staff -->
-	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/>
-	<!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
-	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" />
-	<!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
-	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Centaur's Bow -->
-	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
-	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" />
-	<!-- Monster Weapon Appearance Stone: Theor's Shield -->
-	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" />
-	<!-- Monster Weapon Appearance Stone: Shield of Corruption -->
-	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" />
+	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Theor's Sword -->
+	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Sword of Corruption -->
+	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Octavis' Sword -->
+	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" /> <!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
+	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" /> <!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
+	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Axe -->
+	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
+	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
+	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" /> <!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
+	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/> <!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
+	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
+	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
+	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
+	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/> <!-- Monster Weapon Appearance Stone: Satyr's Staff -->
+	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" /> <!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
+	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
+	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Centaur's Bow -->
+	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" /> <!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
+	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Theor's Shield -->
+	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Shield of Corruption -->
 
 	<appearance_stone id="46573" targetType="ARMOR" type="FIXED" visualId="46538"> <!-- Tauti's Breastplate Appearance Stone -->
 		<bodyPart>chest</bodyPart>
@@ -3667,7 +3647,7 @@
 		<visual id="46383" weaponType="CROSSBOW" /> <!-- Frozen Crossbow -->
 		<visual id="46377" weaponType="SWORD" handType="ONE_HANDED" magicType="MAGICAL" /> <!-- Frozen One-handed Magic Sword (Not-retail) -->
 		<visual id="46386" weaponType="BLUNT" handType="ONE_HANDED" magicType="MAGICAL" /> <!-- Frozen One-handed Magic Blunt Weapon -->
-		<visual id="46387" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Frozen Two-handed Magic Blunt Weapon -->
+		<visual id="46387" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Frozen Two-handed Magic Blunt Weapon -->
 		<visual id="46388" weaponType="DUAL" /> <!-- Frozen Dualsword -->
 		<visual id="46389" weaponType="DUALDAGGER" /> <!-- Frozen Dual Dagger -->
 		<visual id="46390" weaponType="DUALBLUNT" /> <!-- Frozen Dual Blunt -->
@@ -3675,43 +3655,19 @@
 		<visual id="46392" armorType="SIGIL" /> <!-- Frozen Sigil -->
 	</appearance_stone>
 	
-	<appearance_stone id="46108" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Drake Maul Appearance Stone -->
-		<visual id="22775" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46109" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Freya's Staff Appearance Stone -->
-		<visual id="22791" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" />
-	</appearance_stone>
-	<appearance_stone id="46110" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Spezion's Claw Appearance Stone -->
-		<visual id="22807" weaponType="DUALFIST" />
-	</appearance_stone>
-	<appearance_stone id="46111" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Maliss Stormer Appearance Stone -->
-		<visual id="22814" weaponType="POLE" />
-	</appearance_stone>
-	<appearance_stone id="46112" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Steregos' Dagger Appearance Stone -->
-		<visual id="22821" weaponType="DAGGER" />
-	</appearance_stone>
-	<appearance_stone id="46113" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
-		<visual id="22828" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46114" targetType="ALL" type="FIXED"> <!-- Drake Maul Appearance Stone -->
-		<visual id="22775" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46115" targetType="ALL" type="FIXED"> <!-- Freya's Staff Appearance Stone -->
-		<visual id="22791" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" />
-	</appearance_stone>
-	<appearance_stone id="46116" targetType="ALL" type="FIXED"> <!-- Spezion's Claw Appearance Stone -->
-		<visual id="22807" weaponType="DUALFIST" />
-	</appearance_stone>
-	<appearance_stone id="46117" targetType="ALL" type="FIXED"> <!-- Maliss Stormer Appearance Stone -->
-		<visual id="22814" weaponType="POLE" />
-	</appearance_stone>
-	<appearance_stone id="46118" targetType="ALL" type="FIXED"> <!-- Steregos' Dagger Appearance Stone -->
-		<visual id="22821" weaponType="DAGGER" />
-	</appearance_stone>
-	<appearance_stone id="46119" targetType="ALL" type="FIXED"> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
-		<visual id="22828" weaponType="DUALBLUNT" />
-	</appearance_stone>
-
+	<appearance_stone id="46108" targetType="WEAPON" type="FIXED" visualId="22775" weaponType="BLUNT" handType="TWO_HANDED" lifeTime="30days" /> <!-- Drake Maul Appearance Stone -->
+	<appearance_stone id="46109" targetType="WEAPON" type="FIXED" visualId="22791" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="30days" /> <!-- Freya's Staff Appearance Stone -->
+	<appearance_stone id="46110" targetType="WEAPON" type="FIXED" visualId="22807" weaponType="DUALFIST" lifeTime="30days" /> <!-- Spezion's Claw Appearance Stone -->
+	<appearance_stone id="46111" targetType="WEAPON" type="FIXED" visualId="22814" weaponType="POLE" lifeTime="30days" /> <!-- Maliss Stormer Appearance Stone -->
+	<appearance_stone id="46112" targetType="WEAPON" type="FIXED" visualId="22821" weaponType="DAGGER" lifeTime="30days" /> <!-- Steregos' Dagger Appearance Stone -->
+	<appearance_stone id="46113" targetType="WEAPON" type="FIXED" visualId="22828" weaponType="DUALBLUNT" lifeTime="30days" /> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
+	<appearance_stone id="46114" targetType="WEAPON" type="FIXED" visualId="22775" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Drake Maul Appearance Stone -->
+	<appearance_stone id="46115" targetType="WEAPON" type="FIXED" visualId="22791" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Freya's Staff Appearance Stone -->
+	<appearance_stone id="46116" targetType="WEAPON" type="FIXED" visualId="22807" weaponType="DUALFIST" /> <!-- Spezion's Claw Appearance Stone -->
+	<appearance_stone id="46117" targetType="WEAPON" type="FIXED" visualId="22814" weaponType="POLE" /> <!-- Maliss Stormer Appearance Stone -->
+	<appearance_stone id="46118" targetType="WEAPON" type="FIXED" visualId="22821" weaponType="DAGGER" /> <!-- Steregos' Dagger Appearance Stone -->
+	<appearance_stone id="46119" targetType="WEAPON" type="FIXED" visualId="22828" weaponType="DUALBLUNT" /> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
+	
 	<appearance_stone id="46120" targetType="ACCESSORY" type="FIXED" visualId="22169" lifeTime="30days"> <!-- Little Girls' Hat Appearance Stone -->
 		<bodyPart>hair</bodyPart>
 		<bodyPart>hair2</bodyPart>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/AppearanceStones.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/AppearanceStones.xml
index 267fa6144e..35ce94b048 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/AppearanceStones.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/AppearanceStones.xml
@@ -446,7 +446,7 @@
 	<appearance_stone id="23936" targetType="WEAPON" type="FIXED" visualId="23920" weaponType="BLUNT" bodyPart="lhand" lifeTime="7days" /> <!-- Tears One-handed Blunt Weapon -->
 	<appearance_stone id="23937" targetType="WEAPON" type="FIXED" visualId="23921" weaponType="SWORD" magicType="MAGICAL" bodyPart="lhand" lifeTime="7days" /> <!-- Tears Magic Sword -->
 	<appearance_stone id="23938" targetType="WEAPON" type="FIXED" visualId="23922" weaponType="BLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Tears One-handed Magic Blunt Weapon -->
-	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="23941" targetType="WEAPON" type="FIXED" visualId="23945" weaponType="DUALDAGGER" lifeTime="7days" /> <!-- Tears Dual Dagger -->
 	<appearance_stone id="23942" targetType="WEAPON" type="FIXED" visualId="23946" weaponType="DUALBLUNT" lifeTime="7days" /> <!-- Tears Dual Blunt Weapon -->
 	<appearance_stone id="23943" targetType="ARMOR" type="FIXED" visualId="23927" armorType="SHIELD" lifeTime="7days" /> <!-- Tears Shield -->
@@ -3439,7 +3439,7 @@
 	<appearance_stone id="37695" targetType="WEAPON" type="FIXED" visualId="37695" weaponType="CROSSBOW" lifeTime="15days" /> <!-- Valentine Crossbow -->
 	<appearance_stone id="37696" targetType="WEAPON" type="FIXED" visualId="37696" weaponType="SWORD" lifeTime="15days" /> <!-- Valentine One-handed Magic Sword -->
 	<appearance_stone id="37697" targetType="WEAPON" type="FIXED" visualId="37697" weaponType="BLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine One-handed Magic Blunt Weapon -->
-	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="37699" targetType="WEAPON" type="FIXED" visualId="37699" weaponType="DUAL" lifeTime="15days" /> <!-- Valentine Dualsword -->
 	<appearance_stone id="37700" targetType="WEAPON" type="FIXED" visualId="37700" weaponType="DUALDAGGER" lifeTime="15days" /> <!-- Valentine Dual Dagger -->
 	<appearance_stone id="37701" targetType="WEAPON" type="FIXED" visualId="37701" weaponType="DUALBLUNT" lifeTime="15days" /> <!-- Valentine Dual Blunt Weapon -->
@@ -3450,52 +3450,32 @@
 	<appearance_stone id="37908" targetType="WEAPON" type="FIXED" visualId="37945" weaponType="SWORD" /> <!-- Chrono Cithara Appearance Stone: One-handed Sword -->
 	<appearance_stone id="37909" targetType="WEAPON" type="FIXED" visualId="37946" weaponType="DUALFIST" /> <!-- Chrono Unitus Appearance Stone: Fist Weapon -->
 	<appearance_stone id="37910" targetType="WEAPON" type="FIXED" visualId="37947" weaponType="POLE" /> <!-- Chrono Campana Appearance Stone: Spear -->
-	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="DUALBLUNT" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
+	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
 	<appearance_stone id="37912" targetType="WEAPON" type="FIXED" visualId="37949" weaponType="DUAL" /> <!-- Chrono Maracas Appearance Stone: Dualsword -->
 	<appearance_stone id="37913" targetType="WEAPON" type="FIXED" visualId="37916" weaponType="DAGGER" /> <!-- Pumpkin Dagger Appearance Stone: Dagger -->
 	<appearance_stone id="37914" targetType="WEAPON" type="FIXED" visualId="37917" weaponType="DUALDAGGER" /> <!-- Pumpkin Dual Dagger Appearance Stone: Dual Dagger -->
 	<appearance_stone id="37915" targetType="WEAPON" type="FIXED" visualId="37918" weaponType="SWORD" magicType="MAGICAL" /> <!-- Scarecrow Sword Appearance Stone: One-handed Magic Sword -->
 
-	<!-- Monster Weapon Appearance Stone: Theor's Sword -->
-	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Sword of Corruption -->
-	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Octavis' Sword -->
-	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
-	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" />
-	<!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
-	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Axe -->
-	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
-	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
-	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
-	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
-	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/>
-	<!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
-	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
-	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
-	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Satyr's Staff -->
-	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/>
-	<!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
-	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" />
-	<!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
-	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Centaur's Bow -->
-	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
-	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" />
-	<!-- Monster Weapon Appearance Stone: Theor's Shield -->
-	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" />
-	<!-- Monster Weapon Appearance Stone: Shield of Corruption -->
-	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" />
+	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Theor's Sword -->
+	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Sword of Corruption -->
+	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Octavis' Sword -->
+	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" /> <!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
+	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" /> <!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
+	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Axe -->
+	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
+	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
+	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" /> <!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
+	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/> <!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
+	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
+	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
+	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
+	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/> <!-- Monster Weapon Appearance Stone: Satyr's Staff -->
+	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" /> <!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
+	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
+	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Centaur's Bow -->
+	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" /> <!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
+	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Theor's Shield -->
+	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Shield of Corruption -->
 
 	<appearance_stone id="40270" targetType="ARMOR" type="FIXED" visualId="40240"> <!-- Dark Assassin Appearance Stone -->
 		<bodyPart>chest</bodyPart>
@@ -3681,7 +3661,7 @@
 		<visual id="46383" weaponType="CROSSBOW" /> <!-- Frozen Crossbow -->
 		<visual id="46377" weaponType="SWORD" handType="ONE_HANDED" magicType="MAGICAL" /> <!-- Frozen One-handed Magic Sword (Not-retail) -->
 		<visual id="46386" weaponType="BLUNT" handType="ONE_HANDED" magicType="MAGICAL" /> <!-- Frozen One-handed Magic Blunt Weapon -->
-		<visual id="46387" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Frozen Two-handed Magic Blunt Weapon -->
+		<visual id="46387" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Frozen Two-handed Magic Blunt Weapon -->
 		<visual id="46388" weaponType="DUAL" /> <!-- Frozen Dualsword -->
 		<visual id="46389" weaponType="DUALDAGGER" /> <!-- Frozen Dual Dagger -->
 		<visual id="46390" weaponType="DUALBLUNT" /> <!-- Frozen Dual Blunt -->
@@ -3689,43 +3669,19 @@
 		<visual id="46392" armorType="SIGIL" /> <!-- Frozen Sigil -->
 	</appearance_stone>
 	
-	<appearance_stone id="46108" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Drake Maul Appearance Stone -->
-		<visual id="22775" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46109" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Freya's Staff Appearance Stone -->
-		<visual id="22791" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" />
-	</appearance_stone>
-	<appearance_stone id="46110" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Spezion's Claw Appearance Stone -->
-		<visual id="22807" weaponType="DUALFIST" />
-	</appearance_stone>
-	<appearance_stone id="46111" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Maliss Stormer Appearance Stone -->
-		<visual id="22814" weaponType="POLE" />
-	</appearance_stone>
-	<appearance_stone id="46112" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Steregos' Dagger Appearance Stone -->
-		<visual id="22821" weaponType="DAGGER" />
-	</appearance_stone>
-	<appearance_stone id="46113" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
-		<visual id="22828" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46114" targetType="ALL" type="FIXED"> <!-- Drake Maul Appearance Stone -->
-		<visual id="22775" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46115" targetType="ALL" type="FIXED"> <!-- Freya's Staff Appearance Stone -->
-		<visual id="22791" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" />
-	</appearance_stone>
-	<appearance_stone id="46116" targetType="ALL" type="FIXED"> <!-- Spezion's Claw Appearance Stone -->
-		<visual id="22807" weaponType="DUALFIST" />
-	</appearance_stone>
-	<appearance_stone id="46117" targetType="ALL" type="FIXED"> <!-- Maliss Stormer Appearance Stone -->
-		<visual id="22814" weaponType="POLE" />
-	</appearance_stone>
-	<appearance_stone id="46118" targetType="ALL" type="FIXED"> <!-- Steregos' Dagger Appearance Stone -->
-		<visual id="22821" weaponType="DAGGER" />
-	</appearance_stone>
-	<appearance_stone id="46119" targetType="ALL" type="FIXED"> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
-		<visual id="22828" weaponType="DUALBLUNT" />
-	</appearance_stone>
-
+	<appearance_stone id="46108" targetType="WEAPON" type="FIXED" visualId="22775" weaponType="BLUNT" handType="TWO_HANDED" lifeTime="30days" /> <!-- Drake Maul Appearance Stone -->
+	<appearance_stone id="46109" targetType="WEAPON" type="FIXED" visualId="22791" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="30days" /> <!-- Freya's Staff Appearance Stone -->
+	<appearance_stone id="46110" targetType="WEAPON" type="FIXED" visualId="22807" weaponType="DUALFIST" lifeTime="30days" /> <!-- Spezion's Claw Appearance Stone -->
+	<appearance_stone id="46111" targetType="WEAPON" type="FIXED" visualId="22814" weaponType="POLE" lifeTime="30days" /> <!-- Maliss Stormer Appearance Stone -->
+	<appearance_stone id="46112" targetType="WEAPON" type="FIXED" visualId="22821" weaponType="DAGGER" lifeTime="30days" /> <!-- Steregos' Dagger Appearance Stone -->
+	<appearance_stone id="46113" targetType="WEAPON" type="FIXED" visualId="22828" weaponType="DUALBLUNT" lifeTime="30days" /> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
+	<appearance_stone id="46114" targetType="WEAPON" type="FIXED" visualId="22775" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Drake Maul Appearance Stone -->
+	<appearance_stone id="46115" targetType="WEAPON" type="FIXED" visualId="22791" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Freya's Staff Appearance Stone -->
+	<appearance_stone id="46116" targetType="WEAPON" type="FIXED" visualId="22807" weaponType="DUALFIST" /> <!-- Spezion's Claw Appearance Stone -->
+	<appearance_stone id="46117" targetType="WEAPON" type="FIXED" visualId="22814" weaponType="POLE" /> <!-- Maliss Stormer Appearance Stone -->
+	<appearance_stone id="46118" targetType="WEAPON" type="FIXED" visualId="22821" weaponType="DAGGER" /> <!-- Steregos' Dagger Appearance Stone -->
+	<appearance_stone id="46119" targetType="WEAPON" type="FIXED" visualId="22828" weaponType="DUALBLUNT" /> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
+	
 	<appearance_stone id="46120" targetType="ACCESSORY" type="FIXED" visualId="22169" lifeTime="30days"> <!-- Little Girls' Hat Appearance Stone -->
 		<bodyPart>hair</bodyPart>
 		<bodyPart>hair2</bodyPart>
@@ -3818,24 +3774,12 @@
 		<bodyPart>chest</bodyPart>
 		<bodyPart>fullarmor</bodyPart>
 	</appearance_stone>
-	<appearance_stone id="47591" targetType="ALL" type="FIXED" race="ERTHEIA"> <!-- Cat Fighter Appearance Stone - Ertheia Only -->
-		<visual id="39717" weaponType="DUALFIST"/>
-	</appearance_stone>
-	<appearance_stone id="47593" targetType="ALL" type="FIXED" race="ERTHEIA"> <!-- Boxing Glove Appearance Stone -->
-		<visual id="39718" weaponType="DUALFIST"/>
-	</appearance_stone>
-	<appearance_stone id="47592" targetType="ALL" type="FIXED"> <!-- Warm Bear Paws Appearance Stone -->
-		<visual id="47600" weaponType="DUALFIST"/>
-	</appearance_stone>
-	<appearance_stone id="47594" targetType="ALL" type="FIXED"> <!-- Cupid's Arrow Appearance Stone -->
-		<visual id="47597" weaponType="BOW"/>
-	</appearance_stone>
-	<appearance_stone id="47595" targetType="ALL" type="FIXED"> <!-- Wedding Bouquet Appearance Stone -->
-		<visual id="47598" weaponType="BLUNT" handType="ONE_HANDED"/>
-	</appearance_stone>
-	<appearance_stone id="47596" targetType="ALL" type="FIXED"> <!-- Pig Lollipop Appearance Stone -->
-		<visual id="47599" weaponType="DAGGER"/>
-	</appearance_stone>
+	<appearance_stone id="47591" targetType="WEAPON" type="FIXED" race="ERTHEIA" visualId="39717" weaponType="DUALFIST" /> <!-- Cat Fighter Appearance Stone - Ertheia Only -->
+	<appearance_stone id="47593" targetType="WEAPON" type="FIXED" race="ERTHEIA" visualId="39718" weaponType="DUALFIST" /> <!-- Boxing Glove Appearance Stone -->
+	<appearance_stone id="47592" targetType="WEAPON" type="FIXED" visualId="47600" weaponType="DUALFIST" /> <!-- Warm Bear Paws Appearance Stone -->
+	<appearance_stone id="47594" targetType="WEAPON" type="FIXED" visualId="47597" weaponType="BOW" /> <!-- Cupid's Arrow Appearance Stone -->
+	<appearance_stone id="47595" targetType="WEAPON" type="FIXED" visualId="47598" weaponType="BLUNT" handType="ONE_HANDED" /> <!-- Wedding Bouquet Appearance Stone -->
+	<appearance_stone id="47596" targetType="WEAPON" type="FIXED" visualId="47599" weaponType="DAGGER" /> <!-- Pig Lollipop Appearance Stone -->
 
 	<appearance_stone id="47672" targetType="ARMOR" type="FIXED" visualId="39379"> <!-- Formal Wear Appearance Stone -->
 		<bodyPart>chest</bodyPart>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/AppearanceStones.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/AppearanceStones.xml
index 267fa6144e..35ce94b048 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/AppearanceStones.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/AppearanceStones.xml
@@ -446,7 +446,7 @@
 	<appearance_stone id="23936" targetType="WEAPON" type="FIXED" visualId="23920" weaponType="BLUNT" bodyPart="lhand" lifeTime="7days" /> <!-- Tears One-handed Blunt Weapon -->
 	<appearance_stone id="23937" targetType="WEAPON" type="FIXED" visualId="23921" weaponType="SWORD" magicType="MAGICAL" bodyPart="lhand" lifeTime="7days" /> <!-- Tears Magic Sword -->
 	<appearance_stone id="23938" targetType="WEAPON" type="FIXED" visualId="23922" weaponType="BLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Tears One-handed Magic Blunt Weapon -->
-	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="23941" targetType="WEAPON" type="FIXED" visualId="23945" weaponType="DUALDAGGER" lifeTime="7days" /> <!-- Tears Dual Dagger -->
 	<appearance_stone id="23942" targetType="WEAPON" type="FIXED" visualId="23946" weaponType="DUALBLUNT" lifeTime="7days" /> <!-- Tears Dual Blunt Weapon -->
 	<appearance_stone id="23943" targetType="ARMOR" type="FIXED" visualId="23927" armorType="SHIELD" lifeTime="7days" /> <!-- Tears Shield -->
@@ -3439,7 +3439,7 @@
 	<appearance_stone id="37695" targetType="WEAPON" type="FIXED" visualId="37695" weaponType="CROSSBOW" lifeTime="15days" /> <!-- Valentine Crossbow -->
 	<appearance_stone id="37696" targetType="WEAPON" type="FIXED" visualId="37696" weaponType="SWORD" lifeTime="15days" /> <!-- Valentine One-handed Magic Sword -->
 	<appearance_stone id="37697" targetType="WEAPON" type="FIXED" visualId="37697" weaponType="BLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine One-handed Magic Blunt Weapon -->
-	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="37699" targetType="WEAPON" type="FIXED" visualId="37699" weaponType="DUAL" lifeTime="15days" /> <!-- Valentine Dualsword -->
 	<appearance_stone id="37700" targetType="WEAPON" type="FIXED" visualId="37700" weaponType="DUALDAGGER" lifeTime="15days" /> <!-- Valentine Dual Dagger -->
 	<appearance_stone id="37701" targetType="WEAPON" type="FIXED" visualId="37701" weaponType="DUALBLUNT" lifeTime="15days" /> <!-- Valentine Dual Blunt Weapon -->
@@ -3450,52 +3450,32 @@
 	<appearance_stone id="37908" targetType="WEAPON" type="FIXED" visualId="37945" weaponType="SWORD" /> <!-- Chrono Cithara Appearance Stone: One-handed Sword -->
 	<appearance_stone id="37909" targetType="WEAPON" type="FIXED" visualId="37946" weaponType="DUALFIST" /> <!-- Chrono Unitus Appearance Stone: Fist Weapon -->
 	<appearance_stone id="37910" targetType="WEAPON" type="FIXED" visualId="37947" weaponType="POLE" /> <!-- Chrono Campana Appearance Stone: Spear -->
-	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="DUALBLUNT" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
+	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
 	<appearance_stone id="37912" targetType="WEAPON" type="FIXED" visualId="37949" weaponType="DUAL" /> <!-- Chrono Maracas Appearance Stone: Dualsword -->
 	<appearance_stone id="37913" targetType="WEAPON" type="FIXED" visualId="37916" weaponType="DAGGER" /> <!-- Pumpkin Dagger Appearance Stone: Dagger -->
 	<appearance_stone id="37914" targetType="WEAPON" type="FIXED" visualId="37917" weaponType="DUALDAGGER" /> <!-- Pumpkin Dual Dagger Appearance Stone: Dual Dagger -->
 	<appearance_stone id="37915" targetType="WEAPON" type="FIXED" visualId="37918" weaponType="SWORD" magicType="MAGICAL" /> <!-- Scarecrow Sword Appearance Stone: One-handed Magic Sword -->
 
-	<!-- Monster Weapon Appearance Stone: Theor's Sword -->
-	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Sword of Corruption -->
-	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Octavis' Sword -->
-	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
-	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" />
-	<!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
-	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Axe -->
-	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
-	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
-	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
-	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
-	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/>
-	<!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
-	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
-	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
-	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Satyr's Staff -->
-	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/>
-	<!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
-	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" />
-	<!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
-	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Centaur's Bow -->
-	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
-	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" />
-	<!-- Monster Weapon Appearance Stone: Theor's Shield -->
-	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" />
-	<!-- Monster Weapon Appearance Stone: Shield of Corruption -->
-	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" />
+	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Theor's Sword -->
+	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Sword of Corruption -->
+	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Octavis' Sword -->
+	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" /> <!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
+	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" /> <!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
+	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Axe -->
+	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
+	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
+	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" /> <!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
+	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/> <!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
+	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
+	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
+	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
+	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/> <!-- Monster Weapon Appearance Stone: Satyr's Staff -->
+	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" /> <!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
+	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
+	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Centaur's Bow -->
+	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" /> <!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
+	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Theor's Shield -->
+	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Shield of Corruption -->
 
 	<appearance_stone id="40270" targetType="ARMOR" type="FIXED" visualId="40240"> <!-- Dark Assassin Appearance Stone -->
 		<bodyPart>chest</bodyPart>
@@ -3681,7 +3661,7 @@
 		<visual id="46383" weaponType="CROSSBOW" /> <!-- Frozen Crossbow -->
 		<visual id="46377" weaponType="SWORD" handType="ONE_HANDED" magicType="MAGICAL" /> <!-- Frozen One-handed Magic Sword (Not-retail) -->
 		<visual id="46386" weaponType="BLUNT" handType="ONE_HANDED" magicType="MAGICAL" /> <!-- Frozen One-handed Magic Blunt Weapon -->
-		<visual id="46387" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Frozen Two-handed Magic Blunt Weapon -->
+		<visual id="46387" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Frozen Two-handed Magic Blunt Weapon -->
 		<visual id="46388" weaponType="DUAL" /> <!-- Frozen Dualsword -->
 		<visual id="46389" weaponType="DUALDAGGER" /> <!-- Frozen Dual Dagger -->
 		<visual id="46390" weaponType="DUALBLUNT" /> <!-- Frozen Dual Blunt -->
@@ -3689,43 +3669,19 @@
 		<visual id="46392" armorType="SIGIL" /> <!-- Frozen Sigil -->
 	</appearance_stone>
 	
-	<appearance_stone id="46108" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Drake Maul Appearance Stone -->
-		<visual id="22775" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46109" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Freya's Staff Appearance Stone -->
-		<visual id="22791" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" />
-	</appearance_stone>
-	<appearance_stone id="46110" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Spezion's Claw Appearance Stone -->
-		<visual id="22807" weaponType="DUALFIST" />
-	</appearance_stone>
-	<appearance_stone id="46111" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Maliss Stormer Appearance Stone -->
-		<visual id="22814" weaponType="POLE" />
-	</appearance_stone>
-	<appearance_stone id="46112" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Steregos' Dagger Appearance Stone -->
-		<visual id="22821" weaponType="DAGGER" />
-	</appearance_stone>
-	<appearance_stone id="46113" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
-		<visual id="22828" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46114" targetType="ALL" type="FIXED"> <!-- Drake Maul Appearance Stone -->
-		<visual id="22775" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46115" targetType="ALL" type="FIXED"> <!-- Freya's Staff Appearance Stone -->
-		<visual id="22791" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" />
-	</appearance_stone>
-	<appearance_stone id="46116" targetType="ALL" type="FIXED"> <!-- Spezion's Claw Appearance Stone -->
-		<visual id="22807" weaponType="DUALFIST" />
-	</appearance_stone>
-	<appearance_stone id="46117" targetType="ALL" type="FIXED"> <!-- Maliss Stormer Appearance Stone -->
-		<visual id="22814" weaponType="POLE" />
-	</appearance_stone>
-	<appearance_stone id="46118" targetType="ALL" type="FIXED"> <!-- Steregos' Dagger Appearance Stone -->
-		<visual id="22821" weaponType="DAGGER" />
-	</appearance_stone>
-	<appearance_stone id="46119" targetType="ALL" type="FIXED"> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
-		<visual id="22828" weaponType="DUALBLUNT" />
-	</appearance_stone>
-
+	<appearance_stone id="46108" targetType="WEAPON" type="FIXED" visualId="22775" weaponType="BLUNT" handType="TWO_HANDED" lifeTime="30days" /> <!-- Drake Maul Appearance Stone -->
+	<appearance_stone id="46109" targetType="WEAPON" type="FIXED" visualId="22791" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="30days" /> <!-- Freya's Staff Appearance Stone -->
+	<appearance_stone id="46110" targetType="WEAPON" type="FIXED" visualId="22807" weaponType="DUALFIST" lifeTime="30days" /> <!-- Spezion's Claw Appearance Stone -->
+	<appearance_stone id="46111" targetType="WEAPON" type="FIXED" visualId="22814" weaponType="POLE" lifeTime="30days" /> <!-- Maliss Stormer Appearance Stone -->
+	<appearance_stone id="46112" targetType="WEAPON" type="FIXED" visualId="22821" weaponType="DAGGER" lifeTime="30days" /> <!-- Steregos' Dagger Appearance Stone -->
+	<appearance_stone id="46113" targetType="WEAPON" type="FIXED" visualId="22828" weaponType="DUALBLUNT" lifeTime="30days" /> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
+	<appearance_stone id="46114" targetType="WEAPON" type="FIXED" visualId="22775" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Drake Maul Appearance Stone -->
+	<appearance_stone id="46115" targetType="WEAPON" type="FIXED" visualId="22791" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Freya's Staff Appearance Stone -->
+	<appearance_stone id="46116" targetType="WEAPON" type="FIXED" visualId="22807" weaponType="DUALFIST" /> <!-- Spezion's Claw Appearance Stone -->
+	<appearance_stone id="46117" targetType="WEAPON" type="FIXED" visualId="22814" weaponType="POLE" /> <!-- Maliss Stormer Appearance Stone -->
+	<appearance_stone id="46118" targetType="WEAPON" type="FIXED" visualId="22821" weaponType="DAGGER" /> <!-- Steregos' Dagger Appearance Stone -->
+	<appearance_stone id="46119" targetType="WEAPON" type="FIXED" visualId="22828" weaponType="DUALBLUNT" /> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
+	
 	<appearance_stone id="46120" targetType="ACCESSORY" type="FIXED" visualId="22169" lifeTime="30days"> <!-- Little Girls' Hat Appearance Stone -->
 		<bodyPart>hair</bodyPart>
 		<bodyPart>hair2</bodyPart>
@@ -3818,24 +3774,12 @@
 		<bodyPart>chest</bodyPart>
 		<bodyPart>fullarmor</bodyPart>
 	</appearance_stone>
-	<appearance_stone id="47591" targetType="ALL" type="FIXED" race="ERTHEIA"> <!-- Cat Fighter Appearance Stone - Ertheia Only -->
-		<visual id="39717" weaponType="DUALFIST"/>
-	</appearance_stone>
-	<appearance_stone id="47593" targetType="ALL" type="FIXED" race="ERTHEIA"> <!-- Boxing Glove Appearance Stone -->
-		<visual id="39718" weaponType="DUALFIST"/>
-	</appearance_stone>
-	<appearance_stone id="47592" targetType="ALL" type="FIXED"> <!-- Warm Bear Paws Appearance Stone -->
-		<visual id="47600" weaponType="DUALFIST"/>
-	</appearance_stone>
-	<appearance_stone id="47594" targetType="ALL" type="FIXED"> <!-- Cupid's Arrow Appearance Stone -->
-		<visual id="47597" weaponType="BOW"/>
-	</appearance_stone>
-	<appearance_stone id="47595" targetType="ALL" type="FIXED"> <!-- Wedding Bouquet Appearance Stone -->
-		<visual id="47598" weaponType="BLUNT" handType="ONE_HANDED"/>
-	</appearance_stone>
-	<appearance_stone id="47596" targetType="ALL" type="FIXED"> <!-- Pig Lollipop Appearance Stone -->
-		<visual id="47599" weaponType="DAGGER"/>
-	</appearance_stone>
+	<appearance_stone id="47591" targetType="WEAPON" type="FIXED" race="ERTHEIA" visualId="39717" weaponType="DUALFIST" /> <!-- Cat Fighter Appearance Stone - Ertheia Only -->
+	<appearance_stone id="47593" targetType="WEAPON" type="FIXED" race="ERTHEIA" visualId="39718" weaponType="DUALFIST" /> <!-- Boxing Glove Appearance Stone -->
+	<appearance_stone id="47592" targetType="WEAPON" type="FIXED" visualId="47600" weaponType="DUALFIST" /> <!-- Warm Bear Paws Appearance Stone -->
+	<appearance_stone id="47594" targetType="WEAPON" type="FIXED" visualId="47597" weaponType="BOW" /> <!-- Cupid's Arrow Appearance Stone -->
+	<appearance_stone id="47595" targetType="WEAPON" type="FIXED" visualId="47598" weaponType="BLUNT" handType="ONE_HANDED" /> <!-- Wedding Bouquet Appearance Stone -->
+	<appearance_stone id="47596" targetType="WEAPON" type="FIXED" visualId="47599" weaponType="DAGGER" /> <!-- Pig Lollipop Appearance Stone -->
 
 	<appearance_stone id="47672" targetType="ARMOR" type="FIXED" visualId="39379"> <!-- Formal Wear Appearance Stone -->
 		<bodyPart>chest</bodyPart>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/AppearanceStones.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/AppearanceStones.xml
index 267fa6144e..35ce94b048 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/AppearanceStones.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/AppearanceStones.xml
@@ -446,7 +446,7 @@
 	<appearance_stone id="23936" targetType="WEAPON" type="FIXED" visualId="23920" weaponType="BLUNT" bodyPart="lhand" lifeTime="7days" /> <!-- Tears One-handed Blunt Weapon -->
 	<appearance_stone id="23937" targetType="WEAPON" type="FIXED" visualId="23921" weaponType="SWORD" magicType="MAGICAL" bodyPart="lhand" lifeTime="7days" /> <!-- Tears Magic Sword -->
 	<appearance_stone id="23938" targetType="WEAPON" type="FIXED" visualId="23922" weaponType="BLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Tears One-handed Magic Blunt Weapon -->
-	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="23939" targetType="WEAPON" type="FIXED" visualId="23923" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="7days" /> <!-- Tears Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="23941" targetType="WEAPON" type="FIXED" visualId="23945" weaponType="DUALDAGGER" lifeTime="7days" /> <!-- Tears Dual Dagger -->
 	<appearance_stone id="23942" targetType="WEAPON" type="FIXED" visualId="23946" weaponType="DUALBLUNT" lifeTime="7days" /> <!-- Tears Dual Blunt Weapon -->
 	<appearance_stone id="23943" targetType="ARMOR" type="FIXED" visualId="23927" armorType="SHIELD" lifeTime="7days" /> <!-- Tears Shield -->
@@ -3439,7 +3439,7 @@
 	<appearance_stone id="37695" targetType="WEAPON" type="FIXED" visualId="37695" weaponType="CROSSBOW" lifeTime="15days" /> <!-- Valentine Crossbow -->
 	<appearance_stone id="37696" targetType="WEAPON" type="FIXED" visualId="37696" weaponType="SWORD" lifeTime="15days" /> <!-- Valentine One-handed Magic Sword -->
 	<appearance_stone id="37697" targetType="WEAPON" type="FIXED" visualId="37697" weaponType="BLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine One-handed Magic Blunt Weapon -->
-	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="DUALBLUNT" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
+	<appearance_stone id="37698" targetType="WEAPON" type="FIXED" visualId="37698" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="15days" /> <!-- Valentine Two-handed Magic Blunt Weapon -->
 	<appearance_stone id="37699" targetType="WEAPON" type="FIXED" visualId="37699" weaponType="DUAL" lifeTime="15days" /> <!-- Valentine Dualsword -->
 	<appearance_stone id="37700" targetType="WEAPON" type="FIXED" visualId="37700" weaponType="DUALDAGGER" lifeTime="15days" /> <!-- Valentine Dual Dagger -->
 	<appearance_stone id="37701" targetType="WEAPON" type="FIXED" visualId="37701" weaponType="DUALBLUNT" lifeTime="15days" /> <!-- Valentine Dual Blunt Weapon -->
@@ -3450,52 +3450,32 @@
 	<appearance_stone id="37908" targetType="WEAPON" type="FIXED" visualId="37945" weaponType="SWORD" /> <!-- Chrono Cithara Appearance Stone: One-handed Sword -->
 	<appearance_stone id="37909" targetType="WEAPON" type="FIXED" visualId="37946" weaponType="DUALFIST" /> <!-- Chrono Unitus Appearance Stone: Fist Weapon -->
 	<appearance_stone id="37910" targetType="WEAPON" type="FIXED" visualId="37947" weaponType="POLE" /> <!-- Chrono Campana Appearance Stone: Spear -->
-	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="DUALBLUNT" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
+	<appearance_stone id="37911" targetType="WEAPON" type="FIXED" visualId="37948" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Chrono Darbuka Appearance Stone: Two-handed Blunt Weapon -->
 	<appearance_stone id="37912" targetType="WEAPON" type="FIXED" visualId="37949" weaponType="DUAL" /> <!-- Chrono Maracas Appearance Stone: Dualsword -->
 	<appearance_stone id="37913" targetType="WEAPON" type="FIXED" visualId="37916" weaponType="DAGGER" /> <!-- Pumpkin Dagger Appearance Stone: Dagger -->
 	<appearance_stone id="37914" targetType="WEAPON" type="FIXED" visualId="37917" weaponType="DUALDAGGER" /> <!-- Pumpkin Dual Dagger Appearance Stone: Dual Dagger -->
 	<appearance_stone id="37915" targetType="WEAPON" type="FIXED" visualId="37918" weaponType="SWORD" magicType="MAGICAL" /> <!-- Scarecrow Sword Appearance Stone: One-handed Magic Sword -->
 
-	<!-- Monster Weapon Appearance Stone: Theor's Sword -->
-	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Sword of Corruption -->
-	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Octavis' Sword -->
-	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" />
-	<!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
-	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" />
-	<!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
-	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Axe -->
-	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
-	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" />
-	<!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
-	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
-	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" />
-	<!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
-	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/>
-	<!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
-	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
-	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
-	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" />
-	<!-- Monster Weapon Appearance Stone: Satyr's Staff -->
-	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/>
-	<!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
-	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" />
-	<!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
-	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Centaur's Bow -->
-	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" />
-	<!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
-	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" />
-	<!-- Monster Weapon Appearance Stone: Theor's Shield -->
-	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" />
-	<!-- Monster Weapon Appearance Stone: Shield of Corruption -->
-	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" />
+	<appearance_stone id="37067" targetType="WEAPON" type="FIXED" visualId="37047" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Theor's Sword -->
+	<appearance_stone id="37068" targetType="WEAPON" type="FIXED" visualId="37048" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Sword of Corruption -->
+	<appearance_stone id="37069" targetType="WEAPON" type="FIXED" visualId="37049" weaponType="SWORD" /> <!-- Monster Weapon Appearance Stone: Octavis' Sword -->
+	<appearance_stone id="37070" targetType="WEAPON" type="FIXED" visualId="37050" weaponType="DUAL" /> <!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
+	<appearance_stone id="37071" targetType="WEAPON" type="FIXED" visualId="37051" weaponType="SWORD" magicType="MAGICAL" /> <!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
+	<appearance_stone id="37072" targetType="WEAPON" type="FIXED" visualId="37052" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Axe -->
+	<appearance_stone id="37073" targetType="WEAPON" type="FIXED" visualId="37053" weaponType="BLUNT" /> <!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
+	<appearance_stone id="37074" targetType="WEAPON" type="FIXED" visualId="37054" weaponType="DUALBLUNT" /> <!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
+	<appearance_stone id="37075" targetType="WEAPON" type="FIXED" visualId="37055" weaponType="DAGGER" /> <!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
+	<appearance_stone id="37076" targetType="WEAPON" type="FIXED" visualId="37056" weaponType="DUALDAGGER"/> <!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
+	<appearance_stone id="37077" targetType="WEAPON" type="FIXED" visualId="37057" weaponType="SWORD"  bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
+	<appearance_stone id="37078" targetType="WEAPON" type="FIXED" visualId="37058" weaponType="POLE" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
+	<appearance_stone id="37079" targetType="WEAPON" type="FIXED" visualId="37059" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand" /> <!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
+	<appearance_stone id="37080" targetType="WEAPON" type="FIXED" visualId="37060" weaponType="BLUNT" magicType="MAGICAL" bodyPart="lrhand"/> <!-- Monster Weapon Appearance Stone: Satyr's Staff -->
+	<appearance_stone id="37081" targetType="WEAPON" type="FIXED" visualId="37061" weaponType="DUALFIST" /> <!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
+	<appearance_stone id="37082" targetType="WEAPON" type="FIXED" visualId="37062" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
+	<appearance_stone id="37083" targetType="WEAPON" type="FIXED" visualId="37063" weaponType="BOW" /> <!-- Monster Weapon Appearance Stone: Centaur's Bow -->
+	<appearance_stone id="37084" targetType="WEAPON" type="FIXED" visualId="37064" weaponType="CROSSBOW" /> <!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
+	<appearance_stone id="37085" targetType="ARMOR" type="FIXED" visualId="37065" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Theor's Shield -->
+	<appearance_stone id="37086" targetType="ARMOR" type="FIXED" visualId="37066" armorType="SHIELD" /> <!-- Monster Weapon Appearance Stone: Shield of Corruption -->
 
 	<appearance_stone id="40270" targetType="ARMOR" type="FIXED" visualId="40240"> <!-- Dark Assassin Appearance Stone -->
 		<bodyPart>chest</bodyPart>
@@ -3681,7 +3661,7 @@
 		<visual id="46383" weaponType="CROSSBOW" /> <!-- Frozen Crossbow -->
 		<visual id="46377" weaponType="SWORD" handType="ONE_HANDED" magicType="MAGICAL" /> <!-- Frozen One-handed Magic Sword (Not-retail) -->
 		<visual id="46386" weaponType="BLUNT" handType="ONE_HANDED" magicType="MAGICAL" /> <!-- Frozen One-handed Magic Blunt Weapon -->
-		<visual id="46387" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Frozen Two-handed Magic Blunt Weapon -->
+		<visual id="46387" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Frozen Two-handed Magic Blunt Weapon -->
 		<visual id="46388" weaponType="DUAL" /> <!-- Frozen Dualsword -->
 		<visual id="46389" weaponType="DUALDAGGER" /> <!-- Frozen Dual Dagger -->
 		<visual id="46390" weaponType="DUALBLUNT" /> <!-- Frozen Dual Blunt -->
@@ -3689,43 +3669,19 @@
 		<visual id="46392" armorType="SIGIL" /> <!-- Frozen Sigil -->
 	</appearance_stone>
 	
-	<appearance_stone id="46108" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Drake Maul Appearance Stone -->
-		<visual id="22775" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46109" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Freya's Staff Appearance Stone -->
-		<visual id="22791" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" />
-	</appearance_stone>
-	<appearance_stone id="46110" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Spezion's Claw Appearance Stone -->
-		<visual id="22807" weaponType="DUALFIST" />
-	</appearance_stone>
-	<appearance_stone id="46111" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Maliss Stormer Appearance Stone -->
-		<visual id="22814" weaponType="POLE" />
-	</appearance_stone>
-	<appearance_stone id="46112" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Steregos' Dagger Appearance Stone -->
-		<visual id="22821" weaponType="DAGGER" />
-	</appearance_stone>
-	<appearance_stone id="46113" targetType="ALL" type="FIXED" lifeTime="30days"> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
-		<visual id="22828" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46114" targetType="ALL" type="FIXED"> <!-- Drake Maul Appearance Stone -->
-		<visual id="22775" weaponType="DUALBLUNT" />
-	</appearance_stone>
-	<appearance_stone id="46115" targetType="ALL" type="FIXED"> <!-- Freya's Staff Appearance Stone -->
-		<visual id="22791" weaponType="DUALBLUNT" handType="TWO_HANDED" magicType="MAGICAL" />
-	</appearance_stone>
-	<appearance_stone id="46116" targetType="ALL" type="FIXED"> <!-- Spezion's Claw Appearance Stone -->
-		<visual id="22807" weaponType="DUALFIST" />
-	</appearance_stone>
-	<appearance_stone id="46117" targetType="ALL" type="FIXED"> <!-- Maliss Stormer Appearance Stone -->
-		<visual id="22814" weaponType="POLE" />
-	</appearance_stone>
-	<appearance_stone id="46118" targetType="ALL" type="FIXED"> <!-- Steregos' Dagger Appearance Stone -->
-		<visual id="22821" weaponType="DAGGER" />
-	</appearance_stone>
-	<appearance_stone id="46119" targetType="ALL" type="FIXED"> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
-		<visual id="22828" weaponType="DUALBLUNT" />
-	</appearance_stone>
-
+	<appearance_stone id="46108" targetType="WEAPON" type="FIXED" visualId="22775" weaponType="BLUNT" handType="TWO_HANDED" lifeTime="30days" /> <!-- Drake Maul Appearance Stone -->
+	<appearance_stone id="46109" targetType="WEAPON" type="FIXED" visualId="22791" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" lifeTime="30days" /> <!-- Freya's Staff Appearance Stone -->
+	<appearance_stone id="46110" targetType="WEAPON" type="FIXED" visualId="22807" weaponType="DUALFIST" lifeTime="30days" /> <!-- Spezion's Claw Appearance Stone -->
+	<appearance_stone id="46111" targetType="WEAPON" type="FIXED" visualId="22814" weaponType="POLE" lifeTime="30days" /> <!-- Maliss Stormer Appearance Stone -->
+	<appearance_stone id="46112" targetType="WEAPON" type="FIXED" visualId="22821" weaponType="DAGGER" lifeTime="30days" /> <!-- Steregos' Dagger Appearance Stone -->
+	<appearance_stone id="46113" targetType="WEAPON" type="FIXED" visualId="22828" weaponType="DUALBLUNT" lifeTime="30days" /> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
+	<appearance_stone id="46114" targetType="WEAPON" type="FIXED" visualId="22775" weaponType="BLUNT" handType="TWO_HANDED" /> <!-- Drake Maul Appearance Stone -->
+	<appearance_stone id="46115" targetType="WEAPON" type="FIXED" visualId="22791" weaponType="BLUNT" handType="TWO_HANDED" magicType="MAGICAL" /> <!-- Freya's Staff Appearance Stone -->
+	<appearance_stone id="46116" targetType="WEAPON" type="FIXED" visualId="22807" weaponType="DUALFIST" /> <!-- Spezion's Claw Appearance Stone -->
+	<appearance_stone id="46117" targetType="WEAPON" type="FIXED" visualId="22814" weaponType="POLE" /> <!-- Maliss Stormer Appearance Stone -->
+	<appearance_stone id="46118" targetType="WEAPON" type="FIXED" visualId="22821" weaponType="DAGGER" /> <!-- Steregos' Dagger Appearance Stone -->
+	<appearance_stone id="46119" targetType="WEAPON" type="FIXED" visualId="22828" weaponType="DUALBLUNT" /> <!-- Ron's Dual Blunt Weapon Appearance Stone -->
+	
 	<appearance_stone id="46120" targetType="ACCESSORY" type="FIXED" visualId="22169" lifeTime="30days"> <!-- Little Girls' Hat Appearance Stone -->
 		<bodyPart>hair</bodyPart>
 		<bodyPart>hair2</bodyPart>
@@ -3818,24 +3774,12 @@
 		<bodyPart>chest</bodyPart>
 		<bodyPart>fullarmor</bodyPart>
 	</appearance_stone>
-	<appearance_stone id="47591" targetType="ALL" type="FIXED" race="ERTHEIA"> <!-- Cat Fighter Appearance Stone - Ertheia Only -->
-		<visual id="39717" weaponType="DUALFIST"/>
-	</appearance_stone>
-	<appearance_stone id="47593" targetType="ALL" type="FIXED" race="ERTHEIA"> <!-- Boxing Glove Appearance Stone -->
-		<visual id="39718" weaponType="DUALFIST"/>
-	</appearance_stone>
-	<appearance_stone id="47592" targetType="ALL" type="FIXED"> <!-- Warm Bear Paws Appearance Stone -->
-		<visual id="47600" weaponType="DUALFIST"/>
-	</appearance_stone>
-	<appearance_stone id="47594" targetType="ALL" type="FIXED"> <!-- Cupid's Arrow Appearance Stone -->
-		<visual id="47597" weaponType="BOW"/>
-	</appearance_stone>
-	<appearance_stone id="47595" targetType="ALL" type="FIXED"> <!-- Wedding Bouquet Appearance Stone -->
-		<visual id="47598" weaponType="BLUNT" handType="ONE_HANDED"/>
-	</appearance_stone>
-	<appearance_stone id="47596" targetType="ALL" type="FIXED"> <!-- Pig Lollipop Appearance Stone -->
-		<visual id="47599" weaponType="DAGGER"/>
-	</appearance_stone>
+	<appearance_stone id="47591" targetType="WEAPON" type="FIXED" race="ERTHEIA" visualId="39717" weaponType="DUALFIST" /> <!-- Cat Fighter Appearance Stone - Ertheia Only -->
+	<appearance_stone id="47593" targetType="WEAPON" type="FIXED" race="ERTHEIA" visualId="39718" weaponType="DUALFIST" /> <!-- Boxing Glove Appearance Stone -->
+	<appearance_stone id="47592" targetType="WEAPON" type="FIXED" visualId="47600" weaponType="DUALFIST" /> <!-- Warm Bear Paws Appearance Stone -->
+	<appearance_stone id="47594" targetType="WEAPON" type="FIXED" visualId="47597" weaponType="BOW" /> <!-- Cupid's Arrow Appearance Stone -->
+	<appearance_stone id="47595" targetType="WEAPON" type="FIXED" visualId="47598" weaponType="BLUNT" handType="ONE_HANDED" /> <!-- Wedding Bouquet Appearance Stone -->
+	<appearance_stone id="47596" targetType="WEAPON" type="FIXED" visualId="47599" weaponType="DAGGER" /> <!-- Pig Lollipop Appearance Stone -->
 
 	<appearance_stone id="47672" targetType="ARMOR" type="FIXED" visualId="39379"> <!-- Formal Wear Appearance Stone -->
 		<bodyPart>chest</bodyPart>