Items cleanup

467 files changed, 748 insertions, 622 deletions

diff --git a/graphics/items/generic/clover-drawing.png b/graphics/items/generic/clover-drawing.png
new file mode 100644
index 00000000..dbff7d5e
--- /dev/null
+++ b/graphics/items/generic/clover-drawing.png
diff --git a/items.xml b/items.xml
index 145eb03d..4d91ea9f 100644
--- a/items.xml
+++ b/items.xml
@@ -17,233 +17,4 @@
     <include name="items/equip-charm/_include.xml"/>
     <include name="items/equip-ring/_include.xml"/>
     <!-- New items may go below this line -->
-	<item id="584"
-		image="equipment/weapon/sword-jackal.png"
-		name="Jackal"
-		description="Made to parry attacks from drakes, relic of a long forsaken war."
-		effect="HP +50 / HP Drain 5%"
-		attack="150"
-		attack-range="1"
-		defense="5"
-		str="1"
-		level="90"
-		type="equip-1hand"
-		attack-action="attack"
-		weight="1000">
-		<sprite>equipment/weapons/jackal.xml</sprite>
-		<sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
-		<sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
-		<sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
-		<sound event="miss">weapons/swords/sword-miss1.ogg</sound>
-	</item>
-	<item id="590"
-		image="equipment/weapon/sword-dragon.png"
-		name="Dragon Sword"
-		description="Empowered by demure's drakes, relic of a long forsaken war."
-		effect="HP -100 / Vanish HP by 1% of damage dealt"
-		attack="141"
-		attack-range="1"
-		defense="-2"
-		str="5"
-		level="90"
-		type="equip-1hand"
-		attack-action="attack"
-		weight="1000">
-        <sprite>equipment/weapons/dragon-sword.xml</sprite>
-		<sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
-		<sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
-		<sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
-		<sound event="miss">weapons/swords/sword-miss1.ogg</sound>
-	</item>
-  <item id="609"
-        image="equipment/weapon/bow-life.png"
-        name="Imperial Bow"
-        description="No one remember the emperor's name, though."
-		effect="HP Drain 4%"
-        attack="110"
-        criticaldefense="10"
-        flee="10"
-        req-dex="80+"
-        level="90"
-        type="equip-2hand"
-        weight="900"
-        missile-particle="graphics/particles/arrow.particle.xml"
-        attack-action="attack_bow"
-        attack-range="6">
-    <sprite>equipment/weapons/bow-life.xml</sprite>
-    <sound event="hit">weapons/bows/imperial/imperial-hit1.ogg</sound>
-    <sound event="hit">weapons/bows/imperial/imperial-hit2.ogg</sound>
-    <sound event="hit">weapons/bows/imperial/imperial-hit3.ogg</sound>
-    <sound event="hit">weapons/bows/imperial/imperial-hit4.ogg</sound>
-    <sound event="hit">weapons/bows/imperial/imperial-hit5.ogg</sound>
-    <sound event="hit">weapons/bows/imperial/imperial-hit6.ogg</sound>
-    <sound event="miss">weapons/bows/imperial/imperial-miss1.ogg</sound>
-  </item>
-  <item id="1170"
-        image="equipment/weapon/staff-woodstaff.png"
-        name="Sweet Tooth Staff"
-        description="Turning gore into cake which recovers your MP, it is the Grandmaster's favorite staff."
-        effect="Lvl 2 Wand / 5% MP Recovery when a monster is killed"
-        req-int="60+"
-        attack="50"
-        mattack="15"
-        type="equip-2hand"
-        attack-action="attack_wand"
-        attack-range="2"
-        weight="1000">
-    <sprite gender="unisex">equipment/weapons/staff.xml</sprite>
-    <sound event="miss">weapons/other/staff/staff-miss1.ogg</sound>
-    <sound event="miss">weapons/other/staff/staff-miss2.ogg</sound>
-    <sound event="miss">weapons/other/staff/staff-miss3.ogg</sound>
-    <sound event="hit">weapons/other/staff/staff-hit1.ogg</sound>
-    <sound event="hit">weapons/other/staff/staff-hit2.ogg</sound>
-    <sound event="hit">weapons/other/staff/staff-hit3.ogg</sound>
-  </item>
-
-  <item id="5141"
-        image="use/scrolls/scroll-alizarin.png"
-        name="Alizarin Scroll"
-        description="Scroll with natural power; summons a plant if read."
-        effect="Summons Alizarin Plant"
-        type="usable"
-        weight="2"
-        tag="Scrolls"
-  />
-  <item id="5142"
-        image="use/scrolls/scroll-cobalt.png"
-        name="Cobalt Scroll"
-        description="Scroll with natural power; summons a plant if read."
-        effect="Summons Cobalt Plant"
-        type="usable"
-        weight="2"
-        tag="Scrolls"
-  />
-  <item id="5143"
-        image="use/scrolls/scroll-gamboge.png"
-        name="Gamboge Scroll"
-        description="Scroll with natural power; summons a plant if read."
-        effect="Summons Gamboge Plant"
-        type="usable"
-        weight="2"
-        tag="Scrolls"
-  />
-  <item id="5144"
-        image="use/scrolls/scroll-mauve.png"
-        name="Mauve Scroll"
-        description="Scroll with natural power; summons a plant if read."
-        effect="Summons Mauve Plant"
-        type="usable"
-        weight="2"
-        tag="Scrolls"
-  />
-  <item id="5145"
-        image="use/scrolls/scroll-joy.png"
-        name="Joyplim Scroll"
-        description="A very funny scroll. Read it, and be amused!"
-        effect="Forces some Emote on players"
-        type="usable"
-        weight="2"
-        tag="Scrolls"
-  />
-
-  <item id="5280"
-        image="equipment/head/leprechaunhat.png"
-        name="Leprechaun Hat"
-        description="Have you found the gold pot yet?"
-        type="equip-head"
-        defense="5"
-        weight="20">
-    <sprite gender="unisex">equipment/head/leprechaunhat.xml</sprite>
-  </item>
-  <item id="5281"
-        image="equipment/head/party-red.png"
-        name="Party Hat (Red)"
-        description="You were invited to the celebration!"
-        type="equip-head"
-        defense="5"
-        weight="20">
-    <sprite gender="unisex">equipment/head/party-red.xml</sprite>
-  </item>
-  <item id="5282"
-        image="equipment/head/party-green.png"
-        name="Party Hat (Green)"
-        description="You were invited to the celebration!"
-        type="equip-head"
-        defense="5"
-        weight="20">
-    <sprite gender="unisex">equipment/head/party-green.xml</sprite>
-  </item>
-  <item id="5283"
-        image="equipment/head/party-blue.png"
-        name="Party Hat (Blue)"
-        description="You were invited to the celebration!"
-        type="equip-head"
-        defense="5"
-        weight="20">
-    <sprite gender="unisex">equipment/head/party-blue.xml</sprite>
-  </item>
-
-	<item id="5288"
-		image="generic/naftalin.png"
-		name="Naphthalene"
-		description="Used to produce powerful dyes and medicine, and usually produced from burning a special kind of Coal."
-		type="generic"
-		weight="1"/>
-   <item id="5289"
-		image="equipment/ammo/cursedarrow.png"
-		name="Armor Breaker Arrow"
-		description="Used against heavily armored targets."
-		effect="Critical +75"
-		type="equip-ammo"
-		attack="-150"
-		weight="2"/>
-   <item id="5290"
-		image="equipment/ammo/silverarrow.png"
-		name="Silver Arrow"
-		description="Traditionally used in holy crusades to kill undead."
-		effect="Range +2"
-		type="equip-ammo"
-		attack="65"
-		weight="1"/>
-   <item id="5291"
-		image="equipment/ammo/thornarrow.png"
-		name="Thorn Arrow"
-		description="A superior arrow which never misses."
-		effect="Critical +10 / Hit +25"
-		type="equip-ammo"
-		attack="65"
-		weight="12"/>
-  <item id="5292"
-        image="generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#1a1e1f,2f3739,4a575b,94a1a4,cad5d7,effafc"
-        name="Silver Ore"
-        description="Can be sold for a considerable amount of money."
-        type="generic"
-        weight="40" />
-  <item id="5293"
-        image="generic/crystalized-dragon-blood.png"
-        name="Crystallized Dragon Blood"
-        description="The blood of a slain dragon that seeped down to the earth's core and was formed into a crystal by the enormous pressure. It is still surrounded by an aura of incredible power that is almost as strong as it was during the dragon's lifetime."
-        type="generic"
-        weight="1111"/>
-  <item id="5294"
-        image="use/food/rum.png"
-        name="Rum"
-        description="Hohoho and a bottle of rum!"
-        effect="Hangover"
-        type="usable"
-        weight="2"/>
-  <item id="5295"
-        image="generic/pink-flower-seed.png"
-        name="Pink Flower Seed"
-        description="You could swear that this seed is watching you."
-        type="generic"
-        weight="10"/>
-  <item id="5297"
-        image="generic/golden-tooth.png"
-        name="Golden Tooth"
-        description="Somebody was very rich during his lifetime."
-        type="generic"
-        sellProtected="true"
-        weight="40"/>
-
 </items>
diff --git a/items/equip-1hand/_include.xml b/items/equip-1hand/_include.xml
index fc4e3007..e334c70c 100644
--- a/items/equip-1hand/_include.xml
+++ b/items/equip-1hand/_include.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-1hand/item521_Dagger.xml"/>
-  <include name="items/equip-1hand/item522_SharpKnife.xml"/>
-  <include name="items/equip-1hand/item536_ShortSword.xml"/>
-  <include name="items/equip-1hand/item549_Axe.xml"/>
-  <include name="items/equip-1hand/item570_BoneKnife.xml"/>
-  <include name="items/equip-1hand/item571_Setzer.xml"/>
-  <include name="items/equip-1hand/item576_Beheader.xml"/>
-  <include name="items/equip-1hand/item578_SandCutter.xml"/>
-  <include name="items/equip-1hand/item579_RockKnife.xml"/>
-  <include name="items/equip-1hand/item587_Sword.xml"/>
-  <include name="items/equip-1hand/item591_LongSword.xml"/>
-  <include name="items/equip-1hand/item599_FireSword.xml"/>
-  <include name="items/equip-1hand/item867_IceGladius.xml"/>
+  <include name="items/equip-1hand/item0521_Dagger.xml"/>
+  <include name="items/equip-1hand/item0522_SharpKnife.xml"/>
+  <include name="items/equip-1hand/item0536_ShortSword.xml"/>
+  <include name="items/equip-1hand/item0549_Axe.xml"/>
+  <include name="items/equip-1hand/item0570_BoneKnife.xml"/>
+  <include name="items/equip-1hand/item0571_Setzer.xml"/>
+  <include name="items/equip-1hand/item0576_Beheader.xml"/>
+  <include name="items/equip-1hand/item0578_SandCutter.xml"/>
+  <include name="items/equip-1hand/item0579_RockKnife.xml"/>
+  <include name="items/equip-1hand/item0584_Jackal.xml"/>
+  <include name="items/equip-1hand/item0587_Sword.xml"/>
+  <include name="items/equip-1hand/item0591_LongSword.xml"/>
+  <include name="items/equip-1hand/item0590_DragonSword.xml"/>
+  <include name="items/equip-1hand/item0599_FireSword.xml"/>
+  <include name="items/equip-1hand/item0867_IceGladius.xml"/>
   <include name="items/equip-1hand/item1171_Wand.xml"/>
   <include name="items/equip-1hand/item1201_Knife.xml"/>
   <include name="items/equip-1hand/item1215_ToySabre.xml"/>
diff --git a/items/equip-1hand/item521_Dagger.xml b/items/equip-1hand/item0521_Dagger.xml
index 3de9a3af..b855d30a 100644
--- a/items/equip-1hand/item521_Dagger.xml
+++ b/items/equip-1hand/item0521_Dagger.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="521" image="equipment/weapon/dagger-dagger.png" name="Dagger" description="A simple dagger." type="equip-1hand" attack-action="attack" attack="15" attack-range="2" weight="200">
+  <item id="521" image="equipment/weapon/dagger-dagger.png" name="Dagger" description="A simple dagger." effect="Weapon Level 1" type="equip-1hand" attack-action="attack" attack="15" attack-range="1" weight="200">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item522_SharpKnife.xml b/items/equip-1hand/item0522_SharpKnife.xml
index 451d4872..ec223b33 100644
--- a/items/equip-1hand/item522_SharpKnife.xml
+++ b/items/equip-1hand/item0522_SharpKnife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="522" image="equipment/weapon/dagger-sharpknife.png" name="Sharp Knife" description="A really sharp knife. Don't hurt yourself!" attack="10" type="equip-1hand" attack-action="attack" attack-range="2" weight="150">
+  <item id="522" image="equipment/weapon/dagger-sharpknife.png" name="Sharp Knife" description="A really sharp knife. Don't hurt yourself!" effect="Weapon Level 1" attack="10" type="equip-1hand" attack-action="attack" attack-range="1" weight="150">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item536_ShortSword.xml b/items/equip-1hand/item0536_ShortSword.xml
index a799c66e..7c858630 100644
--- a/items/equip-1hand/item536_ShortSword.xml
+++ b/items/equip-1hand/item0536_ShortSword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="536" image="equipment/weapon/dagger-shortsword.png" name="Short Sword" description="A small but sharp sword." type="equip-1hand" attack="100" attack-action="attack" attack-range="2" weight="2000">
+  <item id="536" image="equipment/weapon/dagger-shortsword.png" name="Short Sword" description="A small but sharp sword." effect="Weapon Level 1" type="equip-1hand" attack="110" attack-action="attack" attack-range="1" weight="1200" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item549_Axe.xml b/items/equip-1hand/item0549_Axe.xml
index 6937ca2e..ec8f72a1 100644
--- a/items/equip-1hand/item549_Axe.xml
+++ b/items/equip-1hand/item0549_Axe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="549" image="equipment/weapon/axe-axe.png" name="Axe" description="An axe." attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="2" weight="1200">
+  <item id="549" image="equipment/weapon/axe-axe.png" name="Axe" description="An axe." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="1" weight="1200" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/axe-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/axe-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
diff --git a/items/equip-1hand/item570_BoneKnife.xml b/items/equip-1hand/item0570_BoneKnife.xml
index 1301cc12..4cef4ae4 100644
--- a/items/equip-1hand/item570_BoneKnife.xml
+++ b/items/equip-1hand/item0570_BoneKnife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="570" image="equipment/weapon/dagger-boneknife.png" name="Bone Knife" description="A knife masterly carved out of a bone." attack="115" type="equip-1hand" attack-action="attack" attack-range="2" weight="450">
+  <item id="570" image="equipment/weapon/dagger-boneknife.png" name="Bone Knife" description="A knife masterly carved out of a bone." effect="Weapon Level 1" attack="115" type="equip-1hand" attack-action="attack" attack-range="1" weight="450" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item571_Setzer.xml b/items/equip-1hand/item0571_Setzer.xml
index b89b72c5..69b3e3e3 100644
--- a/items/equip-1hand/item571_Setzer.xml
+++ b/items/equip-1hand/item0571_Setzer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." attack="100" type="equip-1hand" attack-action="attack" attack-range="2" weight="900" sellProtected="true">
+  <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." effect="Base Attack Delay -25 / Weapon Level 1" attack="100" type="equip-1hand" attack-action="attack" attack-range="1" weight="900" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound>
diff --git a/items/equip-1hand/item576_Beheader.xml b/items/equip-1hand/item0576_Beheader.xml
index 77fd2292..fbd74d80 100644
--- a/items/equip-1hand/item576_Beheader.xml
+++ b/items/equip-1hand/item0576_Beheader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="576" image="equipment/weapon/sword-beheader.png" name="Beheader" description="The only sword capable of beheading a Terranite." effect="Double Damage +50% / No bow / 0 Int" criticalattack="-25" hit="-20" type="equip-1hand" attack="999" attack-action="attack" attack-range="2" weight="2000" sellProtected="true">
+  <item id="576" image="equipment/weapon/sword-beheader.png" name="Beheader" description="The only sword capable of beheading a Terranite." effect="Attack Speed +10% / Double Damage +50% / No bow / Base Attack Delay +1150 / Weapon Level 1" req-int="0" criticalattack="-25" hit="-20" type="equip-1hand" attack="999" attack-action="attack" attack-range="1" weight="2000" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/beheader.xml</sprite>
     <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
     <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
diff --git a/items/equip-1hand/item578_SandCutter.xml b/items/equip-1hand/item0578_SandCutter.xml
index 8e515d67..fc38f90e 100644
--- a/items/equip-1hand/item578_SandCutter.xml
+++ b/items/equip-1hand/item0578_SandCutter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="578" image="equipment/weapon/sword-sandcutter.png" name="Sand Cutter" description="An ancient longsword with moon-shaped blade, frequently used by desert night warriors." effect="Double Damage +5% / Accuracy +3%" attack="140" level="80" type="equip-1hand" attack-action="attack" attack-range="2" weight="1500" sellProtected="true">
+  <item id="578" image="equipment/weapon/sword-sandcutter.png" name="Sand Cutter" description="An ancient longsword with moon-shaped blade, frequently used by desert night warriors." effect="Double Damage +5% / Accuracy +3% / Weapon Level 2" attack="160" level="80" type="equip-1hand" attack-action="attack" attack-range="1" weight="1500" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sandcutter.xml</sprite>
     <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound>
     <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound>
diff --git a/items/equip-1hand/item579_RockKnife.xml b/items/equip-1hand/item0579_RockKnife.xml
index 6087eb3e..9d1debf7 100644
--- a/items/equip-1hand/item579_RockKnife.xml
+++ b/items/equip-1hand/item0579_RockKnife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="579" image="equipment/weapon/dagger-rockknive.png" name="Rock Knife" description="A knife made of stone." attack="110" type="equip-1hand" attack-action="attack" attack-range="2" vit="3" weight="500" sellProtected="true">
+  <item id="579" image="equipment/weapon/dagger-rockknive.png" name="Rock Knife" description="A knife made of stone." effect="Weapon Level 1" attack="110" type="equip-1hand" attack-action="attack" attack-range="1" vit="3" weight="500" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/miss1.ogg</sound>
diff --git a/items/equip-1hand/item0584_Jackal.xml b/items/equip-1hand/item0584_Jackal.xml
new file mode 100644
index 00000000..5376dfa1
--- /dev/null
+++ b/items/equip-1hand/item0584_Jackal.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<items>
+    <item id="584"
+	image="equipment/weapon/sword-jackal.png"
+	name="Jackal"
+	description="Made to parry attacks from drakes, relic of a long forsaken war."
+	effect="Attack Speed +1% / Accuracy +5% / HP +50 / HP Drain 5% / Weapon Level 1"
+	attack="150"
+	attack-range="1"
+	defense="5"
+	criticaldefense="2"
+	str="1"
+	level="90"
+	type="equip-1hand"
+	attack-action="attack"
+	hit-effect-id="32"
+	critical-hit-effect-id="30"
+	weight="1000"
+	sellProtected="true">
+	<sprite>equipment/weapons/jackal.xml</sprite>
+	<sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
+	<sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
+	<sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
+	<sound event="miss">weapons/swords/sword-miss1.ogg</sound>
+    </item>
+</items>
diff --git a/items/equip-1hand/item587_Sword.xml b/items/equip-1hand/item0587_Sword.xml
index 7383e3a0..824b1059 100644
--- a/items/equip-1hand/item587_Sword.xml
+++ b/items/equip-1hand/item0587_Sword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="587" image="equipment/weapon/sword-sword.png" name="Sword" description="A simple but reliable sword." attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="2" weight="200">
+  <item id="587" image="equipment/weapon/sword-sword.png" name="Sword" description="A simple but reliable sword." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="1" weight="200" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </item>
diff --git a/items/equip-1hand/item0590_DragonSword.xml b/items/equip-1hand/item0590_DragonSword.xml
new file mode 100644
index 00000000..699d228b
--- /dev/null
+++ b/items/equip-1hand/item0590_DragonSword.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<items>
+    <item id="590"
+	image="equipment/weapon/sword-dragon.png"
+	name="Dragon Sword"
+	description="Empowered by demure's drakes, relic of a long forsaken war."
+	effect="Attack Speed +2% / Accuracy +5% / Base Attack Delay -25 / Weapon Level 2"
+	req-str="50+"
+	req-agi="50+"
+	req-vit="50+"
+	req-dex="50+"
+	req-luk="50+"
+	attack="171"
+	attack-range="1"
+	str="5"
+	level="99"
+	type="equip-1hand"
+	attack-action="attack"
+	hit-effect-id="32"
+	critical-hit-effect-id="30"
+	weight="1000"
+	sellProtected="true">
+	<sprite>equipment/weapons/dragon-sword.xml</sprite>
+	<sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
+	<sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
+	<sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
+	<sound event="miss">weapons/swords/sword-miss1.ogg</sound>
+    </item>
+</items>
diff --git a/items/equip-1hand/item591_LongSword.xml b/items/equip-1hand/item0591_LongSword.xml
index 6d69692c..f81d18ad 100644
--- a/items/equip-1hand/item591_LongSword.xml
+++ b/items/equip-1hand/item0591_LongSword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="591" image="equipment/weapon/sword-longsword.png" name="Long Sword" description="A sword with a long and agile blade." attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="2" weight="10">
+  <item id="591" image="equipment/weapon/sword-longsword.png" name="Long Sword" description="A sword with a long and agile blade." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="1" weight="10" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </item>
diff --git a/items/equip-1hand/item599_FireSword.xml b/items/equip-1hand/item0599_FireSword.xml
index b42c0e4e..e6dd6108 100644
--- a/items/equip-1hand/item599_FireSword.xml
+++ b/items/equip-1hand/item0599_FireSword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="599" image="equipment/weapon/sword-firesword.png" name="Fire Sword" description="A magical sword enchanted with the power of fire." attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="2" weight="10">
+  <item id="599" image="equipment/weapon/sword-firesword.png" name="Fire Sword" description="A magical sword enchanted with the power of fire." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack_chop" attack-range="1" weight="10" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </item>
diff --git a/items/equip-1hand/item867_IceGladius.xml b/items/equip-1hand/item0867_IceGladius.xml
index 5d66ecfe..bc4da922 100644
--- a/items/equip-1hand/item867_IceGladius.xml
+++ b/items/equip-1hand/item0867_IceGladius.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="867" image="equipment/weapon/sword-ice.png" name="Ice Gladius" description="A sword with a shimmering blue blade." attack="110" type="equip-1hand" attack-action="attack" attack-range="2" luk="1" weight="1000">
+  <item id="867" image="equipment/weapon/sword-ice.png" name="Ice Gladius" description="A sword with a shimmering blue blade." effect="Weapon Level 1" attack="130" type="equip-1hand" attack-action="attack" attack-range="1" luk="1" weight="1000" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit1.ogg</sound>
diff --git a/items/equip-1hand/item1171_Wand.xml b/items/equip-1hand/item1171_Wand.xml
index 86e25608..8a07471b 100644
--- a/items/equip-1hand/item1171_Wand.xml
+++ b/items/equip-1hand/item1171_Wand.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="1171" image="equipment/weapon/wand.png" name="Wand" description="A basic magic wand." effect="Lvl 1 Wand" req-int="5+" attack="1" mattack="5" type="equip-1hand" attack-action="attack" attack-range="3" weight="100">
+  <item id="1171" image="equipment/weapon/wand.png" name="Wand" description="A basic magic wand." effect="Lvl 1 Wand / Weapon Level 1" req-int="5+" attack="1" mattack="5" type="equip-1hand" attack-action="attack" attack-range="1" weight="100" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/wand.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
diff --git a/items/equip-1hand/item1201_Knife.xml b/items/equip-1hand/item1201_Knife.xml
index 033ab28c..d4c33b27 100644
--- a/items/equip-1hand/item1201_Knife.xml
+++ b/items/equip-1hand/item1201_Knife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="1201" image="equipment/weapon/dagger-knive.png" name="Knife" description="A small knife; the perfect weapon for a beginner." attack="5" type="equip-1hand" weight="120" attack-action="attack" attack-range="2">
+  <item id="1201" image="equipment/weapon/dagger-knive.png" name="Knife" description="A small knife; the perfect weapon for a beginner." effect="Weapon Level 1" attack="5" type="equip-1hand" weight="120" attack-action="attack" attack-range="1">
     <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item1215_ToySabre.xml b/items/equip-1hand/item1215_ToySabre.xml
index 4b1de188..48a3ec2a 100644
--- a/items/equip-1hand/item1215_ToySabre.xml
+++ b/items/equip-1hand/item1215_ToySabre.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="1215" image="equipment/weapon/sword-sabre.png" name="Toy Sabre" description="A toy item, doesn't do much damage." attack="1" type="equip-1hand" attack-action="attack" attack-range="2" weight="1" sellProtected="true">
+  <item id="1215" image="equipment/weapon/sword-sabre.png" name="Toy Sabre" description="A toy item, doesn't do much damage." effect="Weapon Level 1" attack="1" type="equip-1hand" attack-action="attack" attack-range="1" weight="1" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </item>
diff --git a/items/equip-1hand/item5261_Launcher.xml b/items/equip-1hand/item5261_Launcher.xml
index e141f40e..9587d061 100644
--- a/items/equip-1hand/item5261_Launcher.xml
+++ b/items/equip-1hand/item5261_Launcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5261" image="equipment/weapon/xmas-slingshot-icon.png" name="Candy-Caned Anti-Grinch-Rifle 2020" description="The best way to shoot snowballs." type="equip-2hand" attack-action="attack_bow" attack="20" attack-range="3" weight="10" critical-hit-effect-id="55" missile-particle="graphics/particles/snowball.particle.xml">
+  <item id="5261" image="equipment/weapon/xmas-slingshot-icon.png" name="Candy-Caned Anti-Grinch-Rifle 2020" description="The best way to shoot snowballs." effect="Weapon Level 1" type="equip-2hand" attack-action="attack_bow" attack="20" attack-range="3" weight="10" critical-hit-effect-id="55" sellProtected="true" missile-particle="graphics/particles/snowball.particle.xml">
     <sprite gender="unisex">equipment/weapons/xmas-bow-slingshot.xml</sprite>
     <sprite gender="female">equipment/weapons/xmas-bow-slingshot.xml</sprite>
     <sound event="hit">weapons/projectiles/snowball/hit1.ogg</sound>
diff --git a/items/equip-1hand/item5284_Revolver.xml b/items/equip-1hand/item5284_Revolver.xml
index cd555faa..3a72610d 100644
--- a/items/equip-1hand/item5284_Revolver.xml
+++ b/items/equip-1hand/item5284_Revolver.xml
@@ -4,7 +4,7 @@
 		image="equipment/weapon/revolver.png"
 		name="Short Gunstaff"
 		description="A gunstaff, which is not produced in The Mana World. Brought from the Mirror Lake."
-		effect="Unobtainable."
+		effect="Unobtainable. / Weapon Level 1"
 		attack="120"
 		attack-range="5"
 		missile-particle="graphics/particles/flame.particle.xml"
@@ -14,8 +14,8 @@
 		missile-diedistance="3"
 		type="equip-1hand"
 		attack-action="attack_bow"
-		sellProtected="true"
-		weight="3000">
+		weight="3000"
+		sellProtected="true">
 		<sprite>equipment/weapons/gun.xml</sprite>
 		<sound event="hit">weapons/gun/gun-hit1.ogg</sound>
 		<sound event="miss">weapons/gun/gun-miss1.ogg</sound>
diff --git a/items/equip-2hand/_include.xml b/items/equip-2hand/_include.xml
index f8bfbbf9..68aae96d 100644
--- a/items/equip-2hand/_include.xml
+++ b/items/equip-2hand/_include.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-2hand/item530_ShortBow.xml"/>
-  <include name="items/equip-2hand/item545_ForestBow.xml"/>
-  <include name="items/equip-2hand/item548_Halberd.xml"/>
-  <include name="items/equip-2hand/item588_BastardSword.xml"/>
-  <include name="items/equip-2hand/item594_Spear.xml"/>
-  <include name="items/equip-2hand/item595_HeavySpear.xml"/>
-  <include name="items/equip-2hand/item596_Pike.xml"/>
-  <include name="items/equip-2hand/item597_HeavyPike.xml"/>
-  <include name="items/equip-2hand/item623_Scythe.xml"/>
-  <include name="items/equip-2hand/item758_WoodenStaff.xml"/>
-  <include name="items/equip-2hand/item878_BansheeBow.xml"/>
-  <include name="items/equip-2hand/item903_SlingShot.xml"/>
-  <include name="items/equip-2hand/item906_KidBook.xml"/>
-  <include name="items/equip-2hand/item907_FloydBook.xml"/>
+  <include name="items/equip-2hand/item0530_ShortBow.xml"/>
+  <include name="items/equip-2hand/item0545_ForestBow.xml"/>
+  <include name="items/equip-2hand/item0548_Halberd.xml"/>
+  <include name="items/equip-2hand/item0588_BastardSword.xml"/>
+  <include name="items/equip-2hand/item0594_Spear.xml"/>
+  <include name="items/equip-2hand/item0595_HeavySpear.xml"/>
+  <include name="items/equip-2hand/item0596_Pike.xml"/>
+  <include name="items/equip-2hand/item0597_HeavyPike.xml"/>
+  <include name="items/equip-2hand/item0609_ImperialBow.xml"/>
+  <include name="items/equip-2hand/item0623_Scythe.xml"/>
+  <include name="items/equip-2hand/item0758_WoodenStaff.xml"/>
+  <include name="items/equip-2hand/item0878_BansheeBow.xml"/>
+  <include name="items/equip-2hand/item0903_SlingShot.xml"/>
+  <include name="items/equip-2hand/item0906_KidBook.xml"/>
+  <include name="items/equip-2hand/item0907_FloydBook.xml"/>
+  <include name="items/equip-2hand/item1170_SweetToothStaff.xml"/>
   <include name="items/equip-2hand/item1200_Bow.xml"/>
 </items>
diff --git a/items/equip-2hand/item530_ShortBow.xml b/items/equip-2hand/item0530_ShortBow.xml
index 0defa8af..6b9cbe68 100644
--- a/items/equip-2hand/item530_ShortBow.xml
+++ b/items/equip-2hand/item0530_ShortBow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="530" image="equipment/weapon/bow-shortbow.png" name="Short Bow" description="A bow for short distances." type="equip-2hand" attack="50" attack-action="attack_bow" attack-range="5" weight="600" missile-particle="graphics/particles/arrow.particle.xml">
+  <item id="530" image="equipment/weapon/bow-shortbow.png" name="Short Bow" description="A bow for short distances." effect="Weapon Level 1" type="equip-2hand" attack="50" mattack="-5" attack-action="attack_bow" attack-range="5" weight="600" missile-particle="graphics/particles/arrow.particle.xml">
     <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sound event="strike">weapons/bows/short/short-miss1.ogg</sound>
diff --git a/items/equip-2hand/item545_ForestBow.xml b/items/equip-2hand/item0545_ForestBow.xml
index 791ba3a4..890dacf4 100644
--- a/items/equip-2hand/item545_ForestBow.xml
+++ b/items/equip-2hand/item0545_ForestBow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="545" image="equipment/weapon/bow-forestbow.png" name="Forest Bow" description="A bow usually used for hunting." attack="70" type="equip-2hand" attack-action="attack_bow" attack-range="5" weight="1200" missile-particle="graphics/particles/arrow.particle.xml">
+  <item id="545" image="equipment/weapon/bow-forestbow.png" name="Forest Bow" description="A bow usually used for hunting." effect="Weapon Level 1" attack="70" mattack="-7" type="equip-2hand" attack-action="attack_bow" attack-range="5" weight="1200" sellProtected="true" missile-particle="graphics/particles/arrow.particle.xml">
     <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sound event="strike">weapons/bows/forest/forest-miss1.ogg</sound>
diff --git a/items/equip-2hand/item548_Halberd.xml b/items/equip-2hand/item0548_Halberd.xml
index 5df9008f..3e3ba60c 100644
--- a/items/equip-2hand/item548_Halberd.xml
+++ b/items/equip-2hand/item0548_Halberd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="548" image="equipment/weapon/polearm-halberd.png" name="Halberd" description="A weapon usually carried by guards." attack="1" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1400">
+  <item id="548" image="equipment/weapon/polearm-halberd.png" name="Halberd" description="A weapon usually carried by guards." effect="Weapon Level 2" attack="1" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1400" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/polearm-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
diff --git a/items/equip-2hand/item588_BastardSword.xml b/items/equip-2hand/item0588_BastardSword.xml
index 2e49acca..4584560f 100644
--- a/items/equip-2hand/item588_BastardSword.xml
+++ b/items/equip-2hand/item0588_BastardSword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="588" image="equipment/weapon/sword-bastardsword.png" name="Bastard Sword" description="A large two handed sword." attack="1" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="10">
+  <item id="588" image="equipment/weapon/sword-bastardsword.png" name="Bastard Sword" description="A large two handed sword." effect="Weapon Level 1" attack="1" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="10" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
   </item>
diff --git a/items/equip-2hand/item594_Spear.xml b/items/equip-2hand/item0594_Spear.xml
index 985f39e6..2dbc4b80 100644
--- a/items/equip-2hand/item594_Spear.xml
+++ b/items/equip-2hand/item0594_Spear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="594" image="equipment/weapon/polearm-spear.png" name="Spear" description="A light spear with a wooden pole." attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="700">
+  <item id="594" image="equipment/weapon/polearm-spear.png" name="Spear" description="A light spear with a wooden pole." effect="Weapon Level 1" attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="1" weight="700" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
diff --git a/items/equip-2hand/item595_HeavySpear.xml b/items/equip-2hand/item0595_HeavySpear.xml
index af46c51d..ac896423 100644
--- a/items/equip-2hand/item595_HeavySpear.xml
+++ b/items/equip-2hand/item0595_HeavySpear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="595" image="equipment/weapon/polearm-heavyspear.png" name="Heavy Spear" description="A heavy spear with a wooden pole." attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1000">
+  <item id="595" image="equipment/weapon/polearm-heavyspear.png" name="Heavy Spear" description="A heavy spear with a wooden pole." effect="Weapon Level 1" attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1000" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
diff --git a/items/equip-2hand/item596_Pike.xml b/items/equip-2hand/item0596_Pike.xml
index 8e24ec34..c7414fda 100644
--- a/items/equip-2hand/item596_Pike.xml
+++ b/items/equip-2hand/item0596_Pike.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="596" image="equipment/weapon/polearm-pike.png" name="Pike" description="A light spear with an iron pole." attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1200">
+  <item id="596" image="equipment/weapon/polearm-pike.png" name="Pike" description="A light spear with an iron pole." effect="Weapon Level 2" attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1200" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
diff --git a/items/equip-2hand/item597_HeavyPike.xml b/items/equip-2hand/item0597_HeavyPike.xml
index 88e50e66..31cfdc9d 100644
--- a/items/equip-2hand/item597_HeavyPike.xml
+++ b/items/equip-2hand/item0597_HeavyPike.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="597" image="equipment/weapon/polearm-heavypike.png" name="Heavy Pike" description="A heavy spear with an iron pole." attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1500">
+  <item id="597" image="equipment/weapon/polearm-heavypike.png" name="Heavy Pike" description="A heavy spear with an iron pole." effect="Weapon Level 1" attack="1" type="equip-2hand" attack-action="attack_spear" attack-range="2" weight="1500" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
diff --git a/items/equip-2hand/item0609_ImperialBow.xml b/items/equip-2hand/item0609_ImperialBow.xml
new file mode 100644
index 00000000..6ea71da1
--- /dev/null
+++ b/items/equip-2hand/item0609_ImperialBow.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<items>
+    <item id="609"
+	image="equipment/weapon/bow-life.png"
+	name="Imperial Bow"
+	description="No one remembers the emperor's name, though."
+	effect="Attack Speed +10% / HP Drain 4% / Weapon Level 1"
+	attack="110"
+	mattack="-9"
+	criticaldefense="10"
+	flee="10"
+	req-dex="80+"
+	level="90"
+	type="equip-2hand"
+	weight="900"
+	missile-particle="graphics/particles/arrow.particle.xml"
+	attack-action="attack_bow"
+	attack-range="6"
+	sellProtected="true">
+	<sprite>equipment/weapons/bow-life.xml</sprite>
+	<sound event="hit">weapons/bows/imperial/imperial-hit1.ogg</sound>
+	<sound event="hit">weapons/bows/imperial/imperial-hit2.ogg</sound>
+	<sound event="hit">weapons/bows/imperial/imperial-hit3.ogg</sound>
+	<sound event="hit">weapons/bows/imperial/imperial-hit4.ogg</sound>
+	<sound event="hit">weapons/bows/imperial/imperial-hit5.ogg</sound>
+	<sound event="hit">weapons/bows/imperial/imperial-hit6.ogg</sound>
+	<sound event="miss">weapons/bows/imperial/imperial-miss1.ogg</sound>
+    </item>
+</items>
diff --git a/items/equip-2hand/item623_Scythe.xml b/items/equip-2hand/item0623_Scythe.xml
index fc1f0098..37b11e3c 100644
--- a/items/equip-2hand/item623_Scythe.xml
+++ b/items/equip-2hand/item0623_Scythe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="623" image="equipment/weapon/polearm-scythe.png" name="Scythe" description="Usually used for farming but also usable as a weapon. Slow but deadly." attack="75" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1200" sellProtected="true">
+  <item id="623" image="equipment/weapon/polearm-scythe.png" name="Scythe" description="Usually used for farming but also usable as a weapon. Slow but deadly." effect="Weapon Level 2" attack="100" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1200" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
diff --git a/items/equip-2hand/item758_WoodenStaff.xml b/items/equip-2hand/item0758_WoodenStaff.xml
index 596d6b19..a0ca7e78 100644
--- a/items/equip-2hand/item758_WoodenStaff.xml
+++ b/items/equip-2hand/item0758_WoodenStaff.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="758" image="equipment/weapon/staff-woodstaff.png" name="Wooden Staff" description="A basic wooden staff." effect="Lvl 2 Wand" req-int="60+" attack="50" mattack="10" type="equip-2hand" attack-action="attack_sword_stab" attack-range="2" weight="1000">
+  <item id="758" image="equipment/weapon/staff-woodstaff.png" name="Wooden Staff" description="A basic wooden staff." effect="Lvl 2 Wand / Weapon Level 1" req-int="60+" attack="50" mattack="10" type="equip-2hand" attack-action="attack_sword_stab" attack-range="2" weight="1000" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
diff --git a/items/equip-2hand/item878_BansheeBow.xml b/items/equip-2hand/item0878_BansheeBow.xml
index 3d5aec60..d6d57e0c 100644
--- a/items/equip-2hand/item878_BansheeBow.xml
+++ b/items/equip-2hand/item0878_BansheeBow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="878" image="equipment/weapon/bow-bansheebow.png" name="Banshee Bow" description="A bow that has been enchanted by the dark powers of a witch." effect="Attack Speed +20% / Defense -40% / VIT Defense -35% / Vanishes HP by 2% of damages dealt / Walk Speed +10%" type="equip-2hand" req-dex="80+" maxhp="-150" mattack="-9" attack-action="attack_bow" attack-range="6" attack="140" level="90" weight="900" missile-particle="graphics/particles/arrow-banshee.particle.xml" sellProtected="true">
+  <item id="878" image="equipment/weapon/bow-bansheebow.png" name="Banshee Bow" description="A bow that has been enchanted by the dark powers of a witch." effect="Attack Speed +20% / Defense -40% / VIT Defense -35% / Vanishes HP by 2% of damages dealt / Walk Speed +10% / Weapon Level 1" type="equip-2hand" req-dex="80+" maxhp="-150" attack-action="attack_bow" attack-range="6" attack="140" mattack="-9" level="90" weight="900" missile-particle="graphics/particles/arrow-banshee.particle.xml" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1</sprite>
     <sprite gender="female">equipment/weapons/bow-banshee-female.xml|#27113e,7442a7,b498d1</sprite>
     <sound event="strike">weapons/bows/banshee/banshee-miss1.ogg</sound>
diff --git a/items/equip-2hand/item903_SlingShot.xml b/items/equip-2hand/item0903_SlingShot.xml
index a17ca411..f625fef8 100644
--- a/items/equip-2hand/item903_SlingShot.xml
+++ b/items/equip-2hand/item0903_SlingShot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="903" image="equipment/weapon/slingshot-icon.png|G:#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;R:#332c19,443a20,453b1e,61532d,87733d,a58d4d" name="Sling Shot" description="In the right hands, everything is a weapon." type="equip-2hand" attack-action="attack_bow" attack="5" attack-range="3" weight="10" missile-particle="graphics/particles/stoneprojectile.particle.xml">
+  <item id="903" image="equipment/weapon/slingshot-icon.png|G:#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;R:#332c19,443a20,453b1e,61532d,87733d,a58d4d" name="Sling Shot" description="In the right hands, everything is a weapon." effect="Weapon Level 1" type="equip-2hand" attack-action="attack_bow" attack="5" attack-range="4" weight="10" missile-particle="graphics/particles/stoneprojectile.particle.xml">
     <sprite gender="unisex">equipment/weapons/bow-slingshot.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/bow-slingshot-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
   </item>
diff --git a/items/equip-2hand/item906_KidBook.xml b/items/equip-2hand/item0906_KidBook.xml
index ab0f4178..a6f7cbe7 100644
--- a/items/equip-2hand/item906_KidBook.xml
+++ b/items/equip-2hand/item0906_KidBook.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="906" image="equipment/weapon/kidbook.png" name="Kid Book" description="A big spell book used to transform humans into Trolls." attack="1" type="equip-2hand" weight="100" missile-particle="graphics/particles/monster-troll-foefire.particle.xml" sellProtected="true">
+  <item id="906" image="equipment/weapon/kidbook.png" name="Kid Book" description="A big spell book used to transform humans into Trolls." effect="Weapon Level 1" attack="1" attack-range="3" type="equip-2hand" weight="100" missile-particle="graphics/particles/monster-troll-foefire.particle.xml" sellProtected="true">
     <replace/>
     <replace sprite="race">
       <item to="-99054"/>
diff --git a/items/equip-2hand/item0907_FloydBook.xml b/items/equip-2hand/item0907_FloydBook.xml
new file mode 100644
index 00000000..21b0acb0
--- /dev/null
+++ b/items/equip-2hand/item0907_FloydBook.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<items>
+  <item id="907" image="equipment/weapon/floydbook.png" name="Book of Floyd" description="Beep boop. Boop beep?" effect="Weapon Level 1" level="135" attack="1" attack-range="3" type="equip-2hand" weight="100" missile-particle="graphics/particles/monster-goblin-firebreath.particle.xml" sellProtected="true">
+    <replace/>
+    <replace sprite="race">
+      <item to="-99168"/>
+    </replace>
+  </item>
+</items>
diff --git a/items/equip-2hand/item1170_SweetToothStaff.xml b/items/equip-2hand/item1170_SweetToothStaff.xml
new file mode 100644
index 00000000..c2a60f8e
--- /dev/null
+++ b/items/equip-2hand/item1170_SweetToothStaff.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<items>
+    <item id="1170"
+	image="equipment/weapon/staff-woodstaff.png"
+	name="Sweet Tooth Staff"
+	description="Turning gore into cake which recovers your MP, it is the Grandmaster's favorite staff."
+	effect="Lvl 2 Wand / 5% MP Recovery when a monster is killed / Weapon Level 1"
+	req-int="60+"
+	attack="50"
+	mattack="15"
+	type="equip-2hand"
+	attack-action="attack_wand"
+	attack-range="2"
+	weight="1000"
+	sellProtected="true">
+	<sprite gender="unisex">equipment/weapons/staff.xml</sprite>
+	<sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
+	<sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
+	<sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
+	<sound event="hit">weapons/other/staff/staff-hit1.ogg</sound>
+	<sound event="hit">weapons/other/staff/staff-hit2.ogg</sound>
+	<sound event="hit">weapons/other/staff/staff-hit3.ogg</sound>
+    </item>
+</items>
diff --git a/items/equip-2hand/item1200_Bow.xml b/items/equip-2hand/item1200_Bow.xml
index 2e44d2e3..02d1e593 100644
--- a/items/equip-2hand/item1200_Bow.xml
+++ b/items/equip-2hand/item1200_Bow.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="1200" image="equipment/weapon/bow-bow.png" name="Bow" description="A distance weapon." attack="20" type="equip-2hand" weight="20" missile-particle="graphics/particles/arrow.particle.xml" attack-action="attack_bow" attack-range="5">
+  <item id="1200" image="equipment/weapon/bow-bow.png" name="Bow" description="A distance weapon." effect="Weapon Level 1" attack="20" mattack="-2" type="equip-2hand" weight="20" missile-particle="graphics/particles/arrow.particle.xml" attack-action="attack_bow" attack-range="5">
     <sprite gender="unisex">equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sprite gender="female">equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
     <sound event="strike">weapons/bows/bow-miss1.ogg</sound>
diff --git a/items/equip-2hand/item907_FloydBook.xml b/items/equip-2hand/item907_FloydBook.xml
deleted file mode 100644
index 6fefdb88..00000000
--- a/items/equip-2hand/item907_FloydBook.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <item id="907" image="equipment/weapon/floydbook.png" name="Book of Floyd" description="Beep boop. Boop beep?" level="135" type="equip-arms" weight="100" missile-particle="graphics/particles/monster-goblin-firebreath.particle.xml" sellProtected="true">
-    <replace/>
-    <replace sprite="race">
-      <item to="-99168"/>
-    </replace>
-  </item>
-</items>
diff --git a/items/equip-ammo/_include.xml b/items/equip-ammo/_include.xml
index a442407c..22e92869 100644
--- a/items/equip-ammo/_include.xml
+++ b/items/equip-ammo/_include.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-ammo/item529_IronArrow.xml"/>
-  <include name="items/equip-ammo/item762_TerraniteArrow.xml"/>
-  <include name="items/equip-ammo/item904_SlingBullet.xml"/>
+  <include name="items/equip-ammo/item0529_IronArrow.xml"/>
+  <include name="items/equip-ammo/item0762_TerraniteArrow.xml"/>
+  <include name="items/equip-ammo/item0904_SlingBullet.xml"/>
   <include name="items/equip-ammo/item1199_Arrow.xml"/>
   <include name="items/equip-ammo/item1282_BoneArrows.xml"/>
   <include name="items/equip-ammo/item5260_Snowball.xml"/>
+  <include name="items/equip-ammo/item5289_ArmorBreakerArrow.xml"/>
+  <include name="items/equip-ammo/item5290_SilverArrow.xml"/>
+  <include name="items/equip-ammo/item5291_ThornArrow.xml"/>
 </items>
diff --git a/items/equip-ammo/item529_IronArrow.xml b/items/equip-ammo/item0529_IronArrow.xml
index 70eaf434..70eaf434 100644
--- a/items/equip-ammo/item529_IronArrow.xml
+++ b/items/equip-ammo/item0529_IronArrow.xml
diff --git a/items/equip-ammo/item762_TerraniteArrow.xml b/items/equip-ammo/item0762_TerraniteArrow.xml
index bb87fa48..bb87fa48 100644
--- a/items/equip-ammo/item762_TerraniteArrow.xml
+++ b/items/equip-ammo/item0762_TerraniteArrow.xml
diff --git a/items/equip-ammo/item904_SlingBullet.xml b/items/equip-ammo/item0904_SlingBullet.xml
index 74e3fabc..74e3fabc 100644
--- a/items/equip-ammo/item904_SlingBullet.xml
+++ b/items/equip-ammo/item0904_SlingBullet.xml
diff --git a/items/equip-ammo/item5289_ArmorBreakerArrow.xml b/items/equip-ammo/item5289_ArmorBreakerArrow.xml
new file mode 100644
index 00000000..4345b202
--- /dev/null
+++ b/items/equip-ammo/item5289_ArmorBreakerArrow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+   <item id="5289"
+	image="equipment/ammo/cursedarrow.png"
+	name="Armor Breaker Arrow"
+	description="Used against heavily armored targets."
+	effect="Critical +75"
+	type="equip-ammo"
+	attack="-150"
+	weight="2"
+    />
+</items>
diff --git a/items/equip-ammo/item5290_SilverArrow.xml b/items/equip-ammo/item5290_SilverArrow.xml
new file mode 100644
index 00000000..ceba8f26
--- /dev/null
+++ b/items/equip-ammo/item5290_SilverArrow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+   <item id="5290"
+	image="equipment/ammo/silverarrow.png"
+	name="Silver Arrow"
+	description="Traditionally used in holy crusades to kill undead."
+	effect="Range +2"
+	type="equip-ammo"
+	attack="65"
+	weight="1"
+    />
+</items>
diff --git a/items/equip-ammo/item5291_ThornArrow.xml b/items/equip-ammo/item5291_ThornArrow.xml
new file mode 100644
index 00000000..7b6aa1e5
--- /dev/null
+++ b/items/equip-ammo/item5291_ThornArrow.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+   <item id="5291"
+	image="equipment/ammo/thornarrow.png"
+	name="Thorn Arrow"
+	description="A superior arrow which never misses."
+	effect="Critical +10 / Hit +25"
+	type="equip-ammo"
+	attack="65"
+	weight="12"
+    />
+</items>
diff --git a/items/equip-arms/_include.xml b/items/equip-arms/_include.xml
index 3e568e73..38bbdf1b 100644
--- a/items/equip-arms/_include.xml
+++ b/items/equip-arms/_include.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-arms/item531_MinerGloves.xml"/>
-  <include name="items/equip-arms/item532_LeatherGloves.xml"/>
-  <include name="items/equip-arms/item563_WinterGloves.xml"/>
-  <include name="items/equip-arms/item585_ScarabArmlet.xml"/>
-  <include name="items/equip-arms/item741_CottonGloves.xml"/>
-  <include name="items/equip-arms/item756_AssassinGloves.xml"/>
-  <include name="items/equip-arms/item794_BromenalGloves.xml"/>
-  <include name="items/equip-arms/item868_SilkGloves.xml"/>
+  <include name="items/equip-arms/item0531_MinerGloves.xml"/>
+  <include name="items/equip-arms/item0532_LeatherGloves.xml"/>
+  <include name="items/equip-arms/item0563_WinterGloves.xml"/>
+  <include name="items/equip-arms/item0585_ScarabArmlet.xml"/>
+  <include name="items/equip-arms/item0741_CottonGloves.xml"/>
+  <include name="items/equip-arms/item0756_AssassinGloves.xml"/>
+  <include name="items/equip-arms/item0794_BromenalGloves.xml"/>
+  <include name="items/equip-arms/item0868_SilkGloves.xml"/>
   <include name="items/equip-arms/item2160_RedCottonGloves.xml"/>
   <include name="items/equip-arms/item2161_GreenCottonGloves.xml"/>
   <include name="items/equip-arms/item2162_DarkBlueCottonGloves.xml"/>
diff --git a/items/equip-arms/item531_MinerGloves.xml b/items/equip-arms/item0531_MinerGloves.xml
index db72ecd8..db72ecd8 100644
--- a/items/equip-arms/item531_MinerGloves.xml
+++ b/items/equip-arms/item0531_MinerGloves.xml
diff --git a/items/equip-arms/item532_LeatherGloves.xml b/items/equip-arms/item0532_LeatherGloves.xml
index 74ff6969..74ff6969 100644
--- a/items/equip-arms/item532_LeatherGloves.xml
+++ b/items/equip-arms/item0532_LeatherGloves.xml
diff --git a/items/equip-arms/item563_WinterGloves.xml b/items/equip-arms/item0563_WinterGloves.xml
index b7c6e0da..b7c6e0da 100644
--- a/items/equip-arms/item563_WinterGloves.xml
+++ b/items/equip-arms/item0563_WinterGloves.xml
diff --git a/items/equip-arms/item585_ScarabArmlet.xml b/items/equip-arms/item0585_ScarabArmlet.xml
index c867e8e4..c867e8e4 100644
--- a/items/equip-arms/item585_ScarabArmlet.xml
+++ b/items/equip-arms/item0585_ScarabArmlet.xml
diff --git a/items/equip-arms/item741_CottonGloves.xml b/items/equip-arms/item0741_CottonGloves.xml
index be66bae7..be66bae7 100644
--- a/items/equip-arms/item741_CottonGloves.xml
+++ b/items/equip-arms/item0741_CottonGloves.xml
diff --git a/items/equip-arms/item756_AssassinGloves.xml b/items/equip-arms/item0756_AssassinGloves.xml
index 349d6e4f..349d6e4f 100644
--- a/items/equip-arms/item756_AssassinGloves.xml
+++ b/items/equip-arms/item0756_AssassinGloves.xml
diff --git a/items/equip-arms/item794_BromenalGloves.xml b/items/equip-arms/item0794_BromenalGloves.xml
index fdddc2d6..fdddc2d6 100644
--- a/items/equip-arms/item794_BromenalGloves.xml
+++ b/items/equip-arms/item0794_BromenalGloves.xml
diff --git a/items/equip-arms/item868_SilkGloves.xml b/items/equip-arms/item0868_SilkGloves.xml
index bfeb432f..bfeb432f 100644
--- a/items/equip-arms/item868_SilkGloves.xml
+++ b/items/equip-arms/item0868_SilkGloves.xml
diff --git a/items/equip-charm/_include.xml b/items/equip-charm/_include.xml
index 0fc214aa..5c4d622a 100644
--- a/items/equip-charm/_include.xml
+++ b/items/equip-charm/_include.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-charm/item677_HeartNecklace.xml"/>
-  <include name="items/equip-charm/item742_FourLeafClover.xml"/>
-  <include name="items/equip-charm/item749_Towel.xml"/>
-  <include name="items/equip-charm/item829_CrozeniteFourLeafAmulet.xml"/>
-  <include name="items/equip-charm/item830_BromenalFourLeafAmulet.xml"/>
-  <include name="items/equip-charm/item831_SilverFourLeafAmulet.xml"/>
-  <include name="items/equip-charm/item832_GoldenFourLeafAmulet.xml"/>
-  <include name="items/equip-charm/item865_Grimoire.xml"/>
-  <include name="items/equip-charm/item879_HeartofIsis.xml"/>
+  <include name="items/equip-charm/item0677_HeartNecklace.xml"/>
+  <include name="items/equip-charm/item0742_FourLeafClover.xml"/>
+  <include name="items/equip-charm/item0749_Towel.xml"/>
+  <include name="items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml"/>
+  <include name="items/equip-charm/item0830_BromenalFourLeafAmulet.xml"/>
+  <include name="items/equip-charm/item0831_SilverFourLeafAmulet.xml"/>
+  <include name="items/equip-charm/item0832_GoldenFourLeafAmulet.xml"/>
+  <include name="items/equip-charm/item0865_Grimoire.xml"/>
+  <include name="items/equip-charm/item0879_HeartofIsis.xml"/>
   <include name="items/equip-charm/item1227_EnchantersAmulet.xml"/>
   <include name="items/equip-charm/item1244_DarkTalisman.xml"/>
   <include name="items/equip-charm/item5269_AssassinAmulet.xml"/>
diff --git a/items/equip-charm/item677_HeartNecklace.xml b/items/equip-charm/item0677_HeartNecklace.xml
index 8437197f..8437197f 100644
--- a/items/equip-charm/item677_HeartNecklace.xml
+++ b/items/equip-charm/item0677_HeartNecklace.xml
diff --git a/items/equip-charm/item742_FourLeafClover.xml b/items/equip-charm/item0742_FourLeafClover.xml
index 0a320ad1..0a320ad1 100644
--- a/items/equip-charm/item742_FourLeafClover.xml
+++ b/items/equip-charm/item0742_FourLeafClover.xml
diff --git a/items/equip-charm/item749_Towel.xml b/items/equip-charm/item0749_Towel.xml
index 72952a0a..72952a0a 100644
--- a/items/equip-charm/item749_Towel.xml
+++ b/items/equip-charm/item0749_Towel.xml
diff --git a/items/equip-charm/item829_CrozeniteFourLeafAmulet.xml b/items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml
index 29d60d62..29d60d62 100644
--- a/items/equip-charm/item829_CrozeniteFourLeafAmulet.xml
+++ b/items/equip-charm/item0829_CrozeniteFourLeafAmulet.xml
diff --git a/items/equip-charm/item830_BromenalFourLeafAmulet.xml b/items/equip-charm/item0830_BromenalFourLeafAmulet.xml
index 79394b97..79394b97 100644
--- a/items/equip-charm/item830_BromenalFourLeafAmulet.xml
+++ b/items/equip-charm/item0830_BromenalFourLeafAmulet.xml
diff --git a/items/equip-charm/item831_SilverFourLeafAmulet.xml b/items/equip-charm/item0831_SilverFourLeafAmulet.xml
index 379d3635..379d3635 100644
--- a/items/equip-charm/item831_SilverFourLeafAmulet.xml
+++ b/items/equip-charm/item0831_SilverFourLeafAmulet.xml
diff --git a/items/equip-charm/item832_GoldenFourLeafAmulet.xml b/items/equip-charm/item0832_GoldenFourLeafAmulet.xml
index a1a5a12b..a1a5a12b 100644
--- a/items/equip-charm/item832_GoldenFourLeafAmulet.xml
+++ b/items/equip-charm/item0832_GoldenFourLeafAmulet.xml
diff --git a/items/equip-charm/item865_Grimoire.xml b/items/equip-charm/item0865_Grimoire.xml
index 6181962b..6181962b 100644
--- a/items/equip-charm/item865_Grimoire.xml
+++ b/items/equip-charm/item0865_Grimoire.xml
diff --git a/items/equip-charm/item879_HeartofIsis.xml b/items/equip-charm/item0879_HeartofIsis.xml
index 1435ada7..1435ada7 100644
--- a/items/equip-charm/item879_HeartofIsis.xml
+++ b/items/equip-charm/item0879_HeartofIsis.xml
diff --git a/items/equip-charm/item5270_ManaPearl.xml b/items/equip-charm/item5270_ManaPearl.xml
index 134dcce4..d4e0dab7 100644
--- a/items/equip-charm/item5270_ManaPearl.xml
+++ b/items/equip-charm/item5270_ManaPearl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5270" image="equipment/charms/manapearl.png" name="Mana Pearl" description="This pearl resonates with a natural mana flow and channels some power from the Mana Seed to the user." int="1" mattack="22" mdefense="22" maxsp="55" sprecover="33" type="equip-charm" weight="0" sellProtected="true">
+  <item id="5270" image="equipment/charms/manapearl.png" name="Mana Pearl" description="This pearl resonates with a natural mana flow and channels some power from the Mana Seed to the user." int="1" mattack="22" mdefense="22" maxmp="55" effect="SP Recovery Rate +33%" type="equip-charm" weight="0" sellProtected="true">
     <particlefx>graphics/particles/manapearl.particle.xml</particlefx>
   </item>
 </items>
diff --git a/items/equip-feet/_include.xml b/items/equip-feet/_include.xml
index 6c06d202..84c81a9c 100644
--- a/items/equip-feet/_include.xml
+++ b/items/equip-feet/_include.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-feet/item528_Boots.xml"/>
-  <include name="items/equip-feet/item655_FurBoots.xml"/>
-  <include name="items/equip-feet/item734_BlackBoots.xml"/>
-  <include name="items/equip-feet/item757_AssassinBoots.xml"/>
-  <include name="items/equip-feet/item792_BromenalBoots.xml"/>
-  <include name="items/equip-feet/item876_WarlordBoots.xml"/>
+  <include name="items/equip-feet/item0528_Boots.xml"/>
+  <include name="items/equip-feet/item0655_FurBoots.xml"/>
+  <include name="items/equip-feet/item0734_BlackBoots.xml"/>
+  <include name="items/equip-feet/item0757_AssassinBoots.xml"/>
+  <include name="items/equip-feet/item0792_BromenalBoots.xml"/>
+  <include name="items/equip-feet/item0876_WarlordBoots.xml"/>
   <include name="items/equip-feet/item1188_RedStockings.xml"/>
   <include name="items/equip-feet/item2150_RedCottonBoots.xml"/>
   <include name="items/equip-feet/item2151_GreenCottonBoots.xml"/>
diff --git a/items/equip-feet/item528_Boots.xml b/items/equip-feet/item0528_Boots.xml
index 8d32a99a..8d32a99a 100644
--- a/items/equip-feet/item528_Boots.xml
+++ b/items/equip-feet/item0528_Boots.xml
diff --git a/items/equip-feet/item655_FurBoots.xml b/items/equip-feet/item0655_FurBoots.xml
index b661f5c8..b661f5c8 100644
--- a/items/equip-feet/item655_FurBoots.xml
+++ b/items/equip-feet/item0655_FurBoots.xml
diff --git a/items/equip-feet/item734_BlackBoots.xml b/items/equip-feet/item0734_BlackBoots.xml
index 9b93bc5c..9b93bc5c 100644
--- a/items/equip-feet/item734_BlackBoots.xml
+++ b/items/equip-feet/item0734_BlackBoots.xml
diff --git a/items/equip-feet/item757_AssassinBoots.xml b/items/equip-feet/item0757_AssassinBoots.xml
index 8a2bff95..8a2bff95 100644
--- a/items/equip-feet/item757_AssassinBoots.xml
+++ b/items/equip-feet/item0757_AssassinBoots.xml
diff --git a/items/equip-feet/item792_BromenalBoots.xml b/items/equip-feet/item0792_BromenalBoots.xml
index ac1f349d..ac1f349d 100644
--- a/items/equip-feet/item792_BromenalBoots.xml
+++ b/items/equip-feet/item0792_BromenalBoots.xml
diff --git a/items/equip-feet/item876_WarlordBoots.xml b/items/equip-feet/item0876_WarlordBoots.xml
index 097f482c..097f482c 100644
--- a/items/equip-feet/item876_WarlordBoots.xml
+++ b/items/equip-feet/item0876_WarlordBoots.xml
diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml
index f592b50b..6ccd4f49 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -1,78 +1,78 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-head/item511_SantaHat.xml"/>
-  <include name="items/equip-head/item524_FancyHat.xml"/>
-  <include name="items/equip-head/item525_MinersHat.xml"/>
-  <include name="items/equip-head/item543_StandardHeadband.xml"/>
-  <include name="items/equip-head/item544_SilkHeadband.xml"/>
-  <include name="items/equip-head/item615_PumpkinHelmet.xml"/>
-  <include name="items/equip-head/item616_AxeHat.xml"/>
-  <include name="items/equip-head/item617_PirateHat.xml"/>
-  <include name="items/equip-head/item618_Goggles.xml"/>
-  <include name="items/equip-head/item619_LeatherGoggles.xml"/>
-  <include name="items/equip-head/item620_Circlet.xml"/>
-  <include name="items/equip-head/item621_Eyepatch.xml"/>
-  <include name="items/equip-head/item622_Bandana.xml"/>
-  <include name="items/equip-head/item627_TopHat.xml"/>
-  <include name="items/equip-head/item628_FunkyHat.xml"/>
-  <include name="items/equip-head/item629_MushHat.xml"/>
-  <include name="items/equip-head/item630_ShroomHat.xml"/>
-  <include name="items/equip-head/item633_ChristmasElfHat.xml"/>
-  <include name="items/equip-head/item634_FaceMask.xml"/>
-  <include name="items/equip-head/item636_WarlordHelmet.xml"/>
-  <include name="items/equip-head/item637_KnightsHelmet.xml"/>
-  <include name="items/equip-head/item638_InfantryHelmet.xml"/>
-  <include name="items/equip-head/item639_CrusadeHelmet.xml"/>
-  <include name="items/equip-head/item643_WhiteCowboyHat.xml"/>
-  <include name="items/equip-head/item644_BlackCowboyHat.xml"/>
-  <include name="items/equip-head/item646_Crown.xml"/>
-  <include name="items/equip-head/item647_DevelopersCap.xml"/>
-  <include name="items/equip-head/item654_Cap.xml"/>
-  <include name="items/equip-head/item656_SerfHat.xml"/>
-  <include name="items/equip-head/item675_GraduationCap.xml"/>
-  <include name="items/equip-head/item678_NohMask.xml"/>
-  <include name="items/equip-head/item679_DemonMask.xml"/>
-  <include name="items/equip-head/item721_HighPriestCrown.xml"/>
-  <include name="items/equip-head/item722_MonsterSkullHelmet.xml"/>
-  <include name="items/equip-head/item723_DesertHat.xml"/>
-  <include name="items/equip-head/item724_CottonHeadband.xml"/>
-  <include name="items/equip-head/item725_GMCap.xml"/>
-  <include name="items/equip-head/item735_CottonBoots.xml"/>
-  <include name="items/equip-head/item751_PinkieHat.xml"/>
-  <include name="items/equip-head/item752_FluffyHat.xml"/>
-  <include name="items/equip-head/item759_PaladinsHelmet.xml"/>
-  <include name="items/equip-head/item760_OverlordsHelmet.xml"/>
-  <include name="items/equip-head/item761_DesertHelmet.xml"/>
-  <include name="items/equip-head/item764_SailorHat.xml"/>
-  <include name="items/equip-head/item765_CaptainsHat.xml"/>
-  <include name="items/equip-head/item766_TerraniteHelmet.xml"/>
-  <include name="items/equip-head/item769_GuyFawkesMask.xml"/>
-  <include name="items/equip-head/item770_FairyHat.xml"/>
-  <include name="items/equip-head/item781_WitchDoctorsMask.xml"/>
-  <include name="items/equip-head/item795_BromenalHelmet.xml"/>
-  <include name="items/equip-head/item800_BowlerHatBrown.xml"/>
-  <include name="items/equip-head/item801_PinkieHelmet.xml"/>
-  <include name="items/equip-head/item848_Earmuffs.xml"/>
-  <include name="items/equip-head/item854_ElfNightcap.xml"/>
-  <include name="items/equip-head/item855_Sunglasses.xml"/>
-  <include name="items/equip-head/item856_KnitCap.xml"/>
-  <include name="items/equip-head/item877_BullHelmet.xml"/>
-  <include name="items/equip-head/item882_RedEggshellHat.xml"/>
-  <include name="items/equip-head/item883_BlueEggshellHat.xml"/>
-  <include name="items/equip-head/item884_YellowEggshellHat.xml"/>
-  <include name="items/equip-head/item885_GreenEggshellHat.xml"/>
-  <include name="items/equip-head/item886_OrangeEggshellHat.xml"/>
-  <include name="items/equip-head/item887_DarkEggshellHat.xml"/>
-  <include name="items/equip-head/item888_MagicGMTopHat.xml"/>
-  <include name="items/equip-head/item889_MurdererCrown.xml"/>
-  <include name="items/equip-head/item890_BeanieCopter.xml"/>
-  <include name="items/equip-head/item897_RedRoseHat.xml"/>
-  <include name="items/equip-head/item898_WhiteRoseHat.xml"/>
-  <include name="items/equip-head/item899_PinkRoseHat.xml"/>
-  <include name="items/equip-head/item900_YellowRoseHat.xml"/>
-  <include name="items/equip-head/item901_OrangeRoseHat.xml"/>
-  <include name="items/equip-head/item902_BlueRoseHat.xml"/>
-  <include name="items/equip-head/item905_BucketHat.xml"/>
+  <include name="items/equip-head/item0511_SantaHat.xml"/>
+  <include name="items/equip-head/item0524_FancyHat.xml"/>
+  <include name="items/equip-head/item0525_MinersHat.xml"/>
+  <include name="items/equip-head/item0543_StandardHeadband.xml"/>
+  <include name="items/equip-head/item0544_SilkHeadband.xml"/>
+  <include name="items/equip-head/item0615_PumpkinHelmet.xml"/>
+  <include name="items/equip-head/item0616_AxeHat.xml"/>
+  <include name="items/equip-head/item0617_PirateHat.xml"/>
+  <include name="items/equip-head/item0618_Goggles.xml"/>
+  <include name="items/equip-head/item0619_LeatherGoggles.xml"/>
+  <include name="items/equip-head/item0620_Circlet.xml"/>
+  <include name="items/equip-head/item0621_Eyepatch.xml"/>
+  <include name="items/equip-head/item0622_Bandana.xml"/>
+  <include name="items/equip-head/item0627_TopHat.xml"/>
+  <include name="items/equip-head/item0628_FunkyHat.xml"/>
+  <include name="items/equip-head/item0629_MushHat.xml"/>
+  <include name="items/equip-head/item0630_ShroomHat.xml"/>
+  <include name="items/equip-head/item0633_ChristmasElfHat.xml"/>
+  <include name="items/equip-head/item0634_FaceMask.xml"/>
+  <include name="items/equip-head/item0636_WarlordHelmet.xml"/>
+  <include name="items/equip-head/item0637_KnightsHelmet.xml"/>
+  <include name="items/equip-head/item0638_InfantryHelmet.xml"/>
+  <include name="items/equip-head/item0639_CrusadeHelmet.xml"/>
+  <include name="items/equip-head/item0643_WhiteCowboyHat.xml"/>
+  <include name="items/equip-head/item0644_BlackCowboyHat.xml"/>
+  <include name="items/equip-head/item0646_Crown.xml"/>
+  <include name="items/equip-head/item0647_DevelopersCap.xml"/>
+  <include name="items/equip-head/item0654_Cap.xml"/>
+  <include name="items/equip-head/item0656_SerfHat.xml"/>
+  <include name="items/equip-head/item0675_GraduationCap.xml"/>
+  <include name="items/equip-head/item0678_NohMask.xml"/>
+  <include name="items/equip-head/item0679_DemonMask.xml"/>
+  <include name="items/equip-head/item0721_HighPriestCrown.xml"/>
+  <include name="items/equip-head/item0722_MonsterSkullHelmet.xml"/>
+  <include name="items/equip-head/item0723_DesertHat.xml"/>
+  <include name="items/equip-head/item0724_CottonHeadband.xml"/>
+  <include name="items/equip-head/item0725_GMCap.xml"/>
+  <include name="items/equip-head/item0735_CottonBoots.xml"/>
+  <include name="items/equip-head/item0751_PinkieHat.xml"/>
+  <include name="items/equip-head/item0752_FluffyHat.xml"/>
+  <include name="items/equip-head/item0759_PaladinsHelmet.xml"/>
+  <include name="items/equip-head/item0760_OverlordsHelmet.xml"/>
+  <include name="items/equip-head/item0761_DesertHelmet.xml"/>
+  <include name="items/equip-head/item0764_SailorHat.xml"/>
+  <include name="items/equip-head/item0765_CaptainsHat.xml"/>
+  <include name="items/equip-head/item0766_TerraniteHelmet.xml"/>
+  <include name="items/equip-head/item0769_GuyFawkesMask.xml"/>
+  <include name="items/equip-head/item0770_FairyHat.xml"/>
+  <include name="items/equip-head/item0781_WitchDoctorsMask.xml"/>
+  <include name="items/equip-head/item0795_BromenalHelmet.xml"/>
+  <include name="items/equip-head/item0800_BowlerHatBrown.xml"/>
+  <include name="items/equip-head/item0801_PinkieHelmet.xml"/>
+  <include name="items/equip-head/item0848_Earmuffs.xml"/>
+  <include name="items/equip-head/item0854_ElfNightcap.xml"/>
+  <include name="items/equip-head/item0855_Sunglasses.xml"/>
+  <include name="items/equip-head/item0856_KnitCap.xml"/>
+  <include name="items/equip-head/item0877_BullHelmet.xml"/>
+  <include name="items/equip-head/item0882_RedEggshellHat.xml"/>
+  <include name="items/equip-head/item0883_BlueEggshellHat.xml"/>
+  <include name="items/equip-head/item0884_YellowEggshellHat.xml"/>
+  <include name="items/equip-head/item0885_GreenEggshellHat.xml"/>
+  <include name="items/equip-head/item0886_OrangeEggshellHat.xml"/>
+  <include name="items/equip-head/item0887_DarkEggshellHat.xml"/>
+  <include name="items/equip-head/item0888_MagicGMTopHat.xml"/>
+  <include name="items/equip-head/item0889_MurdererCrown.xml"/>
+  <include name="items/equip-head/item0890_BeanieCopter.xml"/>
+  <include name="items/equip-head/item0897_RedRoseHat.xml"/>
+  <include name="items/equip-head/item0898_WhiteRoseHat.xml"/>
+  <include name="items/equip-head/item0899_PinkRoseHat.xml"/>
+  <include name="items/equip-head/item0900_YellowRoseHat.xml"/>
+  <include name="items/equip-head/item0901_OrangeRoseHat.xml"/>
+  <include name="items/equip-head/item0902_BlueRoseHat.xml"/>
+  <include name="items/equip-head/item0905_BucketHat.xml"/>
   <include name="items/equip-head/item1173_TamOShanter.xml"/>
   <include name="items/equip-head/item1174_CashiersShade.xml"/>
   <include name="items/equip-head/item1175_AutumnMask.xml"/>
@@ -221,5 +221,9 @@
   <include name="items/equip-head/item5264_BlueWolfHelmet.xml"/>
   <include name="items/equip-head/item5266_CloverHat.xml"/>
   <include name="items/equip-head/item5267_AssassinMask.xml"/>
+  <include name="items/equip-head/item5280_LeprechaunHat.xml"/>
+  <include name="items/equip-head/item5281_PartyHatRed.xml"/>
+  <include name="items/equip-head/item5282_PartyHatGreen.xml"/>
+  <include name="items/equip-head/item5283_PartyHatBlue.xml"/>
   <include name="items/equip-head/item5287_CorsairHat.xml"/>
 </items>
diff --git a/items/equip-head/item511_SantaHat.xml b/items/equip-head/item0511_SantaHat.xml
index a3755124..a3755124 100644
--- a/items/equip-head/item511_SantaHat.xml
+++ b/items/equip-head/item0511_SantaHat.xml
diff --git a/items/equip-head/item524_FancyHat.xml b/items/equip-head/item0524_FancyHat.xml
index 4b9243df..4b9243df 100644
--- a/items/equip-head/item524_FancyHat.xml
+++ b/items/equip-head/item0524_FancyHat.xml
diff --git a/items/equip-head/item525_MinersHat.xml b/items/equip-head/item0525_MinersHat.xml
index 4ffe686d..4ffe686d 100644
--- a/items/equip-head/item525_MinersHat.xml
+++ b/items/equip-head/item0525_MinersHat.xml
diff --git a/items/equip-head/item543_StandardHeadband.xml b/items/equip-head/item0543_StandardHeadband.xml
index cd198b54..cd198b54 100644
--- a/items/equip-head/item543_StandardHeadband.xml
+++ b/items/equip-head/item0543_StandardHeadband.xml
diff --git a/items/equip-head/item544_SilkHeadband.xml b/items/equip-head/item0544_SilkHeadband.xml
index 84923108..84923108 100644
--- a/items/equip-head/item544_SilkHeadband.xml
+++ b/items/equip-head/item0544_SilkHeadband.xml
diff --git a/items/equip-head/item615_PumpkinHelmet.xml b/items/equip-head/item0615_PumpkinHelmet.xml
index 34fc92eb..34fc92eb 100644
--- a/items/equip-head/item615_PumpkinHelmet.xml
+++ b/items/equip-head/item0615_PumpkinHelmet.xml
diff --git a/items/equip-head/item616_AxeHat.xml b/items/equip-head/item0616_AxeHat.xml
index 19c28300..19c28300 100644
--- a/items/equip-head/item616_AxeHat.xml
+++ b/items/equip-head/item0616_AxeHat.xml
diff --git a/items/equip-head/item617_PirateHat.xml b/items/equip-head/item0617_PirateHat.xml
index 8fef4196..8fef4196 100644
--- a/items/equip-head/item617_PirateHat.xml
+++ b/items/equip-head/item0617_PirateHat.xml
diff --git a/items/equip-head/item618_Goggles.xml b/items/equip-head/item0618_Goggles.xml
index cf296b9f..cf296b9f 100644
--- a/items/equip-head/item618_Goggles.xml
+++ b/items/equip-head/item0618_Goggles.xml
diff --git a/items/equip-head/item619_LeatherGoggles.xml b/items/equip-head/item0619_LeatherGoggles.xml
index 73dea66d..73dea66d 100644
--- a/items/equip-head/item619_LeatherGoggles.xml
+++ b/items/equip-head/item0619_LeatherGoggles.xml
diff --git a/items/equip-head/item620_Circlet.xml b/items/equip-head/item0620_Circlet.xml
index 9cb11ebe..9cb11ebe 100644
--- a/items/equip-head/item620_Circlet.xml
+++ b/items/equip-head/item0620_Circlet.xml
diff --git a/items/equip-head/item621_Eyepatch.xml b/items/equip-head/item0621_Eyepatch.xml
index 30079e82..30079e82 100644
--- a/items/equip-head/item621_Eyepatch.xml
+++ b/items/equip-head/item0621_Eyepatch.xml
diff --git a/items/equip-head/item622_Bandana.xml b/items/equip-head/item0622_Bandana.xml
index a47926f9..a47926f9 100644
--- a/items/equip-head/item622_Bandana.xml
+++ b/items/equip-head/item0622_Bandana.xml
diff --git a/items/equip-head/item627_TopHat.xml b/items/equip-head/item0627_TopHat.xml
index a085661b..a085661b 100644
--- a/items/equip-head/item627_TopHat.xml
+++ b/items/equip-head/item0627_TopHat.xml
diff --git a/items/equip-head/item628_FunkyHat.xml b/items/equip-head/item0628_FunkyHat.xml
index 6a9d4cd1..6a9d4cd1 100644
--- a/items/equip-head/item628_FunkyHat.xml
+++ b/items/equip-head/item0628_FunkyHat.xml
diff --git a/items/equip-head/item629_MushHat.xml b/items/equip-head/item0629_MushHat.xml
index 406c218a..406c218a 100644
--- a/items/equip-head/item629_MushHat.xml
+++ b/items/equip-head/item0629_MushHat.xml
diff --git a/items/equip-head/item630_ShroomHat.xml b/items/equip-head/item0630_ShroomHat.xml
index 2aa70645..2aa70645 100644
--- a/items/equip-head/item630_ShroomHat.xml
+++ b/items/equip-head/item0630_ShroomHat.xml
diff --git a/items/equip-head/item633_ChristmasElfHat.xml b/items/equip-head/item0633_ChristmasElfHat.xml
index 3af7602c..3af7602c 100644
--- a/items/equip-head/item633_ChristmasElfHat.xml
+++ b/items/equip-head/item0633_ChristmasElfHat.xml
diff --git a/items/equip-head/item634_FaceMask.xml b/items/equip-head/item0634_FaceMask.xml
index 04a1fc2f..04a1fc2f 100644
--- a/items/equip-head/item634_FaceMask.xml
+++ b/items/equip-head/item0634_FaceMask.xml
diff --git a/items/equip-head/item636_WarlordHelmet.xml b/items/equip-head/item0636_WarlordHelmet.xml
index d48f7abd..d48f7abd 100644
--- a/items/equip-head/item636_WarlordHelmet.xml
+++ b/items/equip-head/item0636_WarlordHelmet.xml
diff --git a/items/equip-head/item637_KnightsHelmet.xml b/items/equip-head/item0637_KnightsHelmet.xml
index 29c6bdc0..29c6bdc0 100644
--- a/items/equip-head/item637_KnightsHelmet.xml
+++ b/items/equip-head/item0637_KnightsHelmet.xml
diff --git a/items/equip-head/item638_InfantryHelmet.xml b/items/equip-head/item0638_InfantryHelmet.xml
index fe98275f..fe98275f 100644
--- a/items/equip-head/item638_InfantryHelmet.xml
+++ b/items/equip-head/item0638_InfantryHelmet.xml
diff --git a/items/equip-head/item639_CrusadeHelmet.xml b/items/equip-head/item0639_CrusadeHelmet.xml
index d680cdb2..d680cdb2 100644
--- a/items/equip-head/item639_CrusadeHelmet.xml
+++ b/items/equip-head/item0639_CrusadeHelmet.xml
diff --git a/items/equip-head/item643_WhiteCowboyHat.xml b/items/equip-head/item0643_WhiteCowboyHat.xml
index da5204a0..da5204a0 100644
--- a/items/equip-head/item643_WhiteCowboyHat.xml
+++ b/items/equip-head/item0643_WhiteCowboyHat.xml
diff --git a/items/equip-head/item644_BlackCowboyHat.xml b/items/equip-head/item0644_BlackCowboyHat.xml
index da12e51d..da12e51d 100644
--- a/items/equip-head/item644_BlackCowboyHat.xml
+++ b/items/equip-head/item0644_BlackCowboyHat.xml
diff --git a/items/equip-head/item646_Crown.xml b/items/equip-head/item0646_Crown.xml
index f3440cfb..f3440cfb 100644
--- a/items/equip-head/item646_Crown.xml
+++ b/items/equip-head/item0646_Crown.xml
diff --git a/items/equip-head/item647_DevelopersCap.xml b/items/equip-head/item0647_DevelopersCap.xml
index 1690dafd..1690dafd 100644
--- a/items/equip-head/item647_DevelopersCap.xml
+++ b/items/equip-head/item0647_DevelopersCap.xml
diff --git a/items/equip-head/item654_Cap.xml b/items/equip-head/item0654_Cap.xml
index eac60119..eac60119 100644
--- a/items/equip-head/item654_Cap.xml
+++ b/items/equip-head/item0654_Cap.xml
diff --git a/items/equip-head/item656_SerfHat.xml b/items/equip-head/item0656_SerfHat.xml
index 4751ae55..4751ae55 100644
--- a/items/equip-head/item656_SerfHat.xml
+++ b/items/equip-head/item0656_SerfHat.xml
diff --git a/items/equip-head/item675_GraduationCap.xml b/items/equip-head/item0675_GraduationCap.xml
index 2b70d6be..8d3b911c 100644
--- a/items/equip-head/item675_GraduationCap.xml
+++ b/items/equip-head/item0675_GraduationCap.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="675" image="equipment/head/gradcap.png" name="Graduation Cap" description="A traditional cap which a university student may wear upon graduating." type="equip-head" defense="2" weight="20">
+  <item id="675" image="equipment/head/gradcap.png" name="Graduation Cap" description="A traditional cap which a university student may wear upon graduating." type="equip-head" defense="2" int="1" weight="20">
     <sprite gender="unisex">equipment/head/gradcap.xml</sprite>
     <sprite gender="female">equipment/head/gradcap-female.xml</sprite>
   </item>
diff --git a/items/equip-head/item678_NohMask.xml b/items/equip-head/item0678_NohMask.xml
index 61d90d0c..61d90d0c 100644
--- a/items/equip-head/item678_NohMask.xml
+++ b/items/equip-head/item0678_NohMask.xml
diff --git a/items/equip-head/item679_DemonMask.xml b/items/equip-head/item0679_DemonMask.xml
index b0ef0bca..b0ef0bca 100644
--- a/items/equip-head/item679_DemonMask.xml
+++ b/items/equip-head/item0679_DemonMask.xml
diff --git a/items/equip-head/item721_HighPriestCrown.xml b/items/equip-head/item0721_HighPriestCrown.xml
index 55486251..55486251 100644
--- a/items/equip-head/item721_HighPriestCrown.xml
+++ b/items/equip-head/item0721_HighPriestCrown.xml
diff --git a/items/equip-head/item722_MonsterSkullHelmet.xml b/items/equip-head/item0722_MonsterSkullHelmet.xml
index 534ef968..534ef968 100644
--- a/items/equip-head/item722_MonsterSkullHelmet.xml
+++ b/items/equip-head/item0722_MonsterSkullHelmet.xml
diff --git a/items/equip-head/item723_DesertHat.xml b/items/equip-head/item0723_DesertHat.xml
index f5562a47..f5562a47 100644
--- a/items/equip-head/item723_DesertHat.xml
+++ b/items/equip-head/item0723_DesertHat.xml
diff --git a/items/equip-head/item724_CottonHeadband.xml b/items/equip-head/item0724_CottonHeadband.xml
index ab187fc5..ab187fc5 100644
--- a/items/equip-head/item724_CottonHeadband.xml
+++ b/items/equip-head/item0724_CottonHeadband.xml
diff --git a/items/equip-head/item725_GMCap.xml b/items/equip-head/item0725_GMCap.xml
index f61e175d..f61e175d 100644
--- a/items/equip-head/item725_GMCap.xml
+++ b/items/equip-head/item0725_GMCap.xml
diff --git a/items/equip-head/item735_CottonBoots.xml b/items/equip-head/item0735_CottonBoots.xml
index ed9f57d7..ed9f57d7 100644
--- a/items/equip-head/item735_CottonBoots.xml
+++ b/items/equip-head/item0735_CottonBoots.xml
diff --git a/items/equip-head/item751_PinkieHat.xml b/items/equip-head/item0751_PinkieHat.xml
index 7b0b0211..7b0b0211 100644
--- a/items/equip-head/item751_PinkieHat.xml
+++ b/items/equip-head/item0751_PinkieHat.xml
diff --git a/items/equip-head/item752_FluffyHat.xml b/items/equip-head/item0752_FluffyHat.xml
index 503112a8..503112a8 100644
--- a/items/equip-head/item752_FluffyHat.xml
+++ b/items/equip-head/item0752_FluffyHat.xml
diff --git a/items/equip-head/item759_PaladinsHelmet.xml b/items/equip-head/item0759_PaladinsHelmet.xml
index 8acb5750..8acb5750 100644
--- a/items/equip-head/item759_PaladinsHelmet.xml
+++ b/items/equip-head/item0759_PaladinsHelmet.xml
diff --git a/items/equip-head/item760_OverlordsHelmet.xml b/items/equip-head/item0760_OverlordsHelmet.xml
index d80588ad..16d5a7f9 100644
--- a/items/equip-head/item760_OverlordsHelmet.xml
+++ b/items/equip-head/item0760_OverlordsHelmet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="760" image="equipment/head/overlord-helm.png" name="Overlord's Helmet" description="Worn by the greatest warriors." mattack="-60" type="equip-head" defense="49" weight="4000" sellProtected="true">
+  <item id="760" image="equipment/head/overlord-helm.png" name="Overlord's Helmet" description="Worn by the greatest warriors." type="equip-head" defense="44" mattack="-60" mdefense="-60" effect="Walk Speed Cap 150" flee="-20" weight="1800" sellProtected="true">
     <sprite gender="unisex">equipment/head/overlordhelm.xml</sprite>
     <sprite gender="female">equipment/head/overlordhelm-female.xml</sprite>
     <replace sprite="hair">
diff --git a/items/equip-head/item761_DesertHelmet.xml b/items/equip-head/item0761_DesertHelmet.xml
index c50639a2..c50639a2 100644
--- a/items/equip-head/item761_DesertHelmet.xml
+++ b/items/equip-head/item0761_DesertHelmet.xml
diff --git a/items/equip-head/item764_SailorHat.xml b/items/equip-head/item0764_SailorHat.xml
index 13962835..13962835 100644
--- a/items/equip-head/item764_SailorHat.xml
+++ b/items/equip-head/item0764_SailorHat.xml
diff --git a/items/equip-head/item765_CaptainsHat.xml b/items/equip-head/item0765_CaptainsHat.xml
index 3f77644e..3f77644e 100644
--- a/items/equip-head/item765_CaptainsHat.xml
+++ b/items/equip-head/item0765_CaptainsHat.xml
diff --git a/items/equip-head/item766_TerraniteHelmet.xml b/items/equip-head/item0766_TerraniteHelmet.xml
index afffe1e9..afffe1e9 100644
--- a/items/equip-head/item766_TerraniteHelmet.xml
+++ b/items/equip-head/item0766_TerraniteHelmet.xml
diff --git a/items/equip-head/item769_GuyFawkesMask.xml b/items/equip-head/item0769_GuyFawkesMask.xml
index 612c882d..612c882d 100644
--- a/items/equip-head/item769_GuyFawkesMask.xml
+++ b/items/equip-head/item0769_GuyFawkesMask.xml
diff --git a/items/equip-head/item770_FairyHat.xml b/items/equip-head/item0770_FairyHat.xml
index 38c14512..38c14512 100644
--- a/items/equip-head/item770_FairyHat.xml
+++ b/items/equip-head/item0770_FairyHat.xml
diff --git a/items/equip-head/item781_WitchDoctorsMask.xml b/items/equip-head/item0781_WitchDoctorsMask.xml
index 3bce5e7f..3bce5e7f 100644
--- a/items/equip-head/item781_WitchDoctorsMask.xml
+++ b/items/equip-head/item0781_WitchDoctorsMask.xml
diff --git a/items/equip-head/item795_BromenalHelmet.xml b/items/equip-head/item0795_BromenalHelmet.xml
index 5ca66fcb..5ca66fcb 100644
--- a/items/equip-head/item795_BromenalHelmet.xml
+++ b/items/equip-head/item0795_BromenalHelmet.xml
diff --git a/items/equip-head/item800_BowlerHatBrown.xml b/items/equip-head/item0800_BowlerHatBrown.xml
index d586c9de..d586c9de 100644
--- a/items/equip-head/item800_BowlerHatBrown.xml
+++ b/items/equip-head/item0800_BowlerHatBrown.xml
diff --git a/items/equip-head/item801_PinkieHelmet.xml b/items/equip-head/item0801_PinkieHelmet.xml
index 00c1d8f5..00c1d8f5 100644
--- a/items/equip-head/item801_PinkieHelmet.xml
+++ b/items/equip-head/item0801_PinkieHelmet.xml
diff --git a/items/equip-head/item848_Earmuffs.xml b/items/equip-head/item0848_Earmuffs.xml
index 44016128..44016128 100644
--- a/items/equip-head/item848_Earmuffs.xml
+++ b/items/equip-head/item0848_Earmuffs.xml
diff --git a/items/equip-head/item854_ElfNightcap.xml b/items/equip-head/item0854_ElfNightcap.xml
index bcbbd293..bcbbd293 100644
--- a/items/equip-head/item854_ElfNightcap.xml
+++ b/items/equip-head/item0854_ElfNightcap.xml
diff --git a/items/equip-head/item855_Sunglasses.xml b/items/equip-head/item0855_Sunglasses.xml
index 4d698dec..4d698dec 100644
--- a/items/equip-head/item855_Sunglasses.xml
+++ b/items/equip-head/item0855_Sunglasses.xml
diff --git a/items/equip-head/item856_KnitCap.xml b/items/equip-head/item0856_KnitCap.xml
index 52bea928..52bea928 100644
--- a/items/equip-head/item856_KnitCap.xml
+++ b/items/equip-head/item0856_KnitCap.xml
diff --git a/items/equip-head/item877_BullHelmet.xml b/items/equip-head/item0877_BullHelmet.xml
index cd579b99..cd579b99 100644
--- a/items/equip-head/item877_BullHelmet.xml
+++ b/items/equip-head/item0877_BullHelmet.xml
diff --git a/items/equip-head/item882_RedEggshellHat.xml b/items/equip-head/item0882_RedEggshellHat.xml
index 8b0f38c9..8b0f38c9 100644
--- a/items/equip-head/item882_RedEggshellHat.xml
+++ b/items/equip-head/item0882_RedEggshellHat.xml
diff --git a/items/equip-head/item883_BlueEggshellHat.xml b/items/equip-head/item0883_BlueEggshellHat.xml
index fff44d98..fff44d98 100644
--- a/items/equip-head/item883_BlueEggshellHat.xml
+++ b/items/equip-head/item0883_BlueEggshellHat.xml
diff --git a/items/equip-head/item884_YellowEggshellHat.xml b/items/equip-head/item0884_YellowEggshellHat.xml
index 0d45e89e..0d45e89e 100644
--- a/items/equip-head/item884_YellowEggshellHat.xml
+++ b/items/equip-head/item0884_YellowEggshellHat.xml
diff --git a/items/equip-head/item885_GreenEggshellHat.xml b/items/equip-head/item0885_GreenEggshellHat.xml
index d274e1fd..d274e1fd 100644
--- a/items/equip-head/item885_GreenEggshellHat.xml
+++ b/items/equip-head/item0885_GreenEggshellHat.xml
diff --git a/items/equip-head/item886_OrangeEggshellHat.xml b/items/equip-head/item0886_OrangeEggshellHat.xml
index cafcc157..cafcc157 100644
--- a/items/equip-head/item886_OrangeEggshellHat.xml
+++ b/items/equip-head/item0886_OrangeEggshellHat.xml
diff --git a/items/equip-head/item887_DarkEggshellHat.xml b/items/equip-head/item0887_DarkEggshellHat.xml
index 201ac664..201ac664 100644
--- a/items/equip-head/item887_DarkEggshellHat.xml
+++ b/items/equip-head/item0887_DarkEggshellHat.xml
diff --git a/items/equip-head/item888_MagicGMTopHat.xml b/items/equip-head/item0888_MagicGMTopHat.xml
index a4bb7765..a4bb7765 100644
--- a/items/equip-head/item888_MagicGMTopHat.xml
+++ b/items/equip-head/item0888_MagicGMTopHat.xml
diff --git a/items/equip-head/item889_MurdererCrown.xml b/items/equip-head/item0889_MurdererCrown.xml
index e1665d8e..e1665d8e 100644
--- a/items/equip-head/item889_MurdererCrown.xml
+++ b/items/equip-head/item0889_MurdererCrown.xml
diff --git a/items/equip-head/item890_BeanieCopter.xml b/items/equip-head/item0890_BeanieCopter.xml
index a367963b..a367963b 100644
--- a/items/equip-head/item890_BeanieCopter.xml
+++ b/items/equip-head/item0890_BeanieCopter.xml
diff --git a/items/equip-head/item897_RedRoseHat.xml b/items/equip-head/item0897_RedRoseHat.xml
index 9d17099b..9d17099b 100644
--- a/items/equip-head/item897_RedRoseHat.xml
+++ b/items/equip-head/item0897_RedRoseHat.xml
diff --git a/items/equip-head/item898_WhiteRoseHat.xml b/items/equip-head/item0898_WhiteRoseHat.xml
index b418fa5f..b418fa5f 100644
--- a/items/equip-head/item898_WhiteRoseHat.xml
+++ b/items/equip-head/item0898_WhiteRoseHat.xml
diff --git a/items/equip-head/item899_PinkRoseHat.xml b/items/equip-head/item0899_PinkRoseHat.xml
index 8cd2a109..8cd2a109 100644
--- a/items/equip-head/item899_PinkRoseHat.xml
+++ b/items/equip-head/item0899_PinkRoseHat.xml
diff --git a/items/equip-head/item900_YellowRoseHat.xml b/items/equip-head/item0900_YellowRoseHat.xml
index 5a027833..5a027833 100644
--- a/items/equip-head/item900_YellowRoseHat.xml
+++ b/items/equip-head/item0900_YellowRoseHat.xml
diff --git a/items/equip-head/item901_OrangeRoseHat.xml b/items/equip-head/item0901_OrangeRoseHat.xml
index 460371e2..460371e2 100644
--- a/items/equip-head/item901_OrangeRoseHat.xml
+++ b/items/equip-head/item0901_OrangeRoseHat.xml
diff --git a/items/equip-head/item902_BlueRoseHat.xml b/items/equip-head/item0902_BlueRoseHat.xml
index 04eb42ac..04eb42ac 100644
--- a/items/equip-head/item902_BlueRoseHat.xml
+++ b/items/equip-head/item0902_BlueRoseHat.xml
diff --git a/items/equip-head/item905_BucketHat.xml b/items/equip-head/item0905_BucketHat.xml
index 70160ee1..70160ee1 100644
--- a/items/equip-head/item905_BucketHat.xml
+++ b/items/equip-head/item0905_BucketHat.xml
diff --git a/items/equip-head/item5129_UnderworldMask.xml b/items/equip-head/item5129_UnderworldMask.xml
index fc585cb4..3ef5b055 100644
--- a/items/equip-head/item5129_UnderworldMask.xml
+++ b/items/equip-head/item5129_UnderworldMask.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5129" image="equipment/head/underworld-mask.png" name="Underworld Mask" description="Surely, you don't think I jest." effect="0 Int" attack-range="2" dex="2" agi="3" type="equip-head" defense="5" weight="100" sellProtected="true">
+  <item id="5129" image="equipment/head/underworld-mask.png" name="Underworld Mask" description="Surely, you don't think I jest. (Troll only: Attack range +1 / Strength +10)" effect="0 Int" attack-range="2" dex="2" agi="3" type="equip-head" defense="5" weight="100" sellProtected="true">
     <sprite gender="unisex">equipment/head/underworld-mask.xml</sprite>
     <sprite gender="female">equipment/head/underworld-mask-female.xml</sprite>
     <replace sprite="hair">
diff --git a/items/equip-head/item5130_Phylactery.xml b/items/equip-head/item5130_Phylactery.xml
index 2a2cd8bf..6f40f372 100644
--- a/items/equip-head/item5130_Phylactery.xml
+++ b/items/equip-head/item5130_Phylactery.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="5130" image="equipment/head/phylactery.png" name="Phylactery" description="This phylactery glows with power" atkspeed="30%" dex="-50%" type="equip-head" defense="1" weight="20" sellProtected="true">
+  <item id="5130" image="equipment/head/phylactery.png" name="Phylactery" description="This phylactery glows with power." atkspeed="30%" dex="-50%" type="equip-head" defense="1" weight="20" sellProtected="true">
     <sprite gender="unisex">equipment/head/phylactery.xml</sprite>
     <sprite gender="female">equipment/head/phylactery-female.xml</sprite>
   </item>
diff --git a/items/equip-head/item5280_LeprechaunHat.xml b/items/equip-head/item5280_LeprechaunHat.xml
new file mode 100644
index 00000000..7965edce
--- /dev/null
+++ b/items/equip-head/item5280_LeprechaunHat.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5280"
+	image="equipment/head/leprechaunhat.png"
+	name="Leprechaun Hat"
+	description="Have you found the gold pot yet?"
+	type="equip-head"
+	defense="5"
+	weight="20">
+	<sprite gender="unisex">equipment/head/leprechaunhat.xml</sprite>
+    </item>
+</items>
diff --git a/items/equip-head/item5281_PartyHatRed.xml b/items/equip-head/item5281_PartyHatRed.xml
new file mode 100644
index 00000000..3248f33d
--- /dev/null
+++ b/items/equip-head/item5281_PartyHatRed.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5281"
+	image="equipment/head/party-red.png"
+	name="Party Hat (Red)"
+	description="You were invited to the celebration!"
+	type="equip-head"
+	defense="5"
+	weight="20">
+	<sprite gender="unisex">equipment/head/party-red.xml</sprite>
+    </item>
+</items>
diff --git a/items/equip-head/item5282_PartyHatGreen.xml b/items/equip-head/item5282_PartyHatGreen.xml
new file mode 100644
index 00000000..8087ec8a
--- /dev/null
+++ b/items/equip-head/item5282_PartyHatGreen.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5282"
+	image="equipment/head/party-green.png"
+	name="Party Hat (Green)"
+	description="You were invited to the celebration!"
+	type="equip-head"
+	defense="5"
+	weight="20">
+	<sprite gender="unisex">equipment/head/party-green.xml</sprite>
+    </item>
+</items>
diff --git a/items/equip-head/item5283_PartyHatBlue.xml b/items/equip-head/item5283_PartyHatBlue.xml
new file mode 100644
index 00000000..16d41287
--- /dev/null
+++ b/items/equip-head/item5283_PartyHatBlue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5283"
+	image="equipment/head/party-blue.png"
+	name="Party Hat (Blue)"
+	description="You were invited to the celebration!"
+	type="equip-head"
+	defense="5"
+	weight="20">
+	<sprite gender="unisex">equipment/head/party-blue.xml</sprite>
+    </item>
+</items>
diff --git a/items/equip-legs/_include.xml b/items/equip-legs/_include.xml
index bed2022f..28da0c09 100644
--- a/items/equip-legs/_include.xml
+++ b/items/equip-legs/_include.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-legs/item586_CottonShorts.xml"/>
-  <include name="items/equip-legs/item610_JeansShorts.xml"/>
-  <include name="items/equip-legs/item632_CottonSkirt.xml"/>
-  <include name="items/equip-legs/item642_JeansChaps.xml"/>
-  <include name="items/equip-legs/item648_CottonTrousers.xml"/>
-  <include name="items/equip-legs/item731_AssassinPants.xml"/>
-  <include name="items/equip-legs/item768_TerraniteLegs.xml"/>
-  <include name="items/equip-legs/item771_Miniskirt.xml"/>
-  <include name="items/equip-legs/item796_BromenalLegs.xml"/>
-  <include name="items/equip-legs/item857_LeatherTrousers.xml"/>
-  <include name="items/equip-legs/item881_RaggedShorts.xml"/>
+  <include name="items/equip-legs/item0586_CottonShorts.xml"/>
+  <include name="items/equip-legs/item0610_JeansShorts.xml"/>
+  <include name="items/equip-legs/item0632_CottonSkirt.xml"/>
+  <include name="items/equip-legs/item0642_JeansChaps.xml"/>
+  <include name="items/equip-legs/item0648_CottonTrousers.xml"/>
+  <include name="items/equip-legs/item0731_AssassinPants.xml"/>
+  <include name="items/equip-legs/item0768_TerraniteLegs.xml"/>
+  <include name="items/equip-legs/item0771_Miniskirt.xml"/>
+  <include name="items/equip-legs/item0796_BromenalLegs.xml"/>
+  <include name="items/equip-legs/item0857_LeatherTrousers.xml"/>
+  <include name="items/equip-legs/item0881_RaggedShorts.xml"/>
   <include name="items/equip-legs/item1172_SilkPants.xml"/>
   <include name="items/equip-legs/item2100_RedCottonSkirt.xml"/>
   <include name="items/equip-legs/item2101_GreenCottonSkirt.xml"/>
diff --git a/items/equip-legs/item586_CottonShorts.xml b/items/equip-legs/item0586_CottonShorts.xml
index 9b9a492f..9b9a492f 100644
--- a/items/equip-legs/item586_CottonShorts.xml
+++ b/items/equip-legs/item0586_CottonShorts.xml
diff --git a/items/equip-legs/item610_JeansShorts.xml b/items/equip-legs/item0610_JeansShorts.xml
index f3d87088..f3d87088 100644
--- a/items/equip-legs/item610_JeansShorts.xml
+++ b/items/equip-legs/item0610_JeansShorts.xml
diff --git a/items/equip-legs/item632_CottonSkirt.xml b/items/equip-legs/item0632_CottonSkirt.xml
index 65f2572a..65f2572a 100644
--- a/items/equip-legs/item632_CottonSkirt.xml
+++ b/items/equip-legs/item0632_CottonSkirt.xml
diff --git a/items/equip-legs/item642_JeansChaps.xml b/items/equip-legs/item0642_JeansChaps.xml
index e5b1cb28..e5b1cb28 100644
--- a/items/equip-legs/item642_JeansChaps.xml
+++ b/items/equip-legs/item0642_JeansChaps.xml
diff --git a/items/equip-legs/item648_CottonTrousers.xml b/items/equip-legs/item0648_CottonTrousers.xml
index a3330f23..a3330f23 100644
--- a/items/equip-legs/item648_CottonTrousers.xml
+++ b/items/equip-legs/item0648_CottonTrousers.xml
diff --git a/items/equip-legs/item731_AssassinPants.xml b/items/equip-legs/item0731_AssassinPants.xml
index 4161a867..4161a867 100644
--- a/items/equip-legs/item731_AssassinPants.xml
+++ b/items/equip-legs/item0731_AssassinPants.xml
diff --git a/items/equip-legs/item768_TerraniteLegs.xml b/items/equip-legs/item0768_TerraniteLegs.xml
index 6b768c6d..6b768c6d 100644
--- a/items/equip-legs/item768_TerraniteLegs.xml
+++ b/items/equip-legs/item0768_TerraniteLegs.xml
diff --git a/items/equip-legs/item771_Miniskirt.xml b/items/equip-legs/item0771_Miniskirt.xml
index c29dab16..c29dab16 100644
--- a/items/equip-legs/item771_Miniskirt.xml
+++ b/items/equip-legs/item0771_Miniskirt.xml
diff --git a/items/equip-legs/item796_BromenalLegs.xml b/items/equip-legs/item0796_BromenalLegs.xml
index 8fe6fb8a..8fe6fb8a 100644
--- a/items/equip-legs/item796_BromenalLegs.xml
+++ b/items/equip-legs/item0796_BromenalLegs.xml
diff --git a/items/equip-legs/item857_LeatherTrousers.xml b/items/equip-legs/item0857_LeatherTrousers.xml
index 905cf4ea..905cf4ea 100644
--- a/items/equip-legs/item857_LeatherTrousers.xml
+++ b/items/equip-legs/item0857_LeatherTrousers.xml
diff --git a/items/equip-legs/item881_RaggedShorts.xml b/items/equip-legs/item0881_RaggedShorts.xml
index 4884d5db..4884d5db 100644
--- a/items/equip-legs/item881_RaggedShorts.xml
+++ b/items/equip-legs/item0881_RaggedShorts.xml
diff --git a/items/equip-ring/_include.xml b/items/equip-ring/_include.xml
index 71518519..20fc0c07 100644
--- a/items/equip-ring/_include.xml
+++ b/items/equip-ring/_include.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-ring/item702_WeddingRing.xml"/>
+  <include name="items/equip-ring/item0702_WeddingRing.xml"/>
   <include name="items/equip-ring/item4008_DiamondRing.xml"/>
   <include name="items/equip-ring/item4009_RubyRing.xml"/>
   <include name="items/equip-ring/item4010_EmeraldRing.xml"/>
diff --git a/items/equip-ring/item702_WeddingRing.xml b/items/equip-ring/item0702_WeddingRing.xml
index a027fcb6..a027fcb6 100644
--- a/items/equip-ring/item702_WeddingRing.xml
+++ b/items/equip-ring/item0702_WeddingRing.xml
diff --git a/items/equip-shield/_include.xml b/items/equip-shield/_include.xml
index 2ff019f2..2c287fc5 100644
--- a/items/equip-shield/_include.xml
+++ b/items/equip-shield/_include.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-shield/item601_SteelShield.xml"/>
-  <include name="items/equip-shield/item602_WoodenShield.xml"/>
-  <include name="items/equip-shield/item603_LeatherShield.xml"/>
+  <include name="items/equip-shield/item0601_SteelShield.xml"/>
+  <include name="items/equip-shield/item0602_WoodenShield.xml"/>
+  <include name="items/equip-shield/item0603_LeatherShield.xml"/>
   <include name="items/equip-shield/item5285_DragonShield.xml"/>
 </items>
diff --git a/items/equip-shield/item601_SteelShield.xml b/items/equip-shield/item0601_SteelShield.xml
index 82b3f031..82b3f031 100644
--- a/items/equip-shield/item601_SteelShield.xml
+++ b/items/equip-shield/item0601_SteelShield.xml
diff --git a/items/equip-shield/item602_WoodenShield.xml b/items/equip-shield/item0602_WoodenShield.xml
index c0f9a8eb..c0f9a8eb 100644
--- a/items/equip-shield/item602_WoodenShield.xml
+++ b/items/equip-shield/item0602_WoodenShield.xml
diff --git a/items/equip-shield/item603_LeatherShield.xml b/items/equip-shield/item0603_LeatherShield.xml
index 77920c1a..77920c1a 100644
--- a/items/equip-shield/item603_LeatherShield.xml
+++ b/items/equip-shield/item0603_LeatherShield.xml
diff --git a/items/equip-torso/_include.xml b/items/equip-torso/_include.xml
index f8dab8ab..46932a82 100644
--- a/items/equip-torso/_include.xml
+++ b/items/equip-torso/_include.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/equip-torso/item523_LeatherShirt.xml"/>
-  <include name="items/equip-torso/item546_DesertShirt.xml"/>
-  <include name="items/equip-torso/item564_TurtleneckSweater.xml"/>
-  <include name="items/equip-torso/item624_VNeckSweater.xml"/>
-  <include name="items/equip-torso/item625_ChainmailShirt.xml"/>
-  <include name="items/equip-torso/item626_LightPlatemail.xml"/>
-  <include name="items/equip-torso/item645_GoldenPlatemail.xml"/>
-  <include name="items/equip-torso/item649_WhiteEvokersRobeBlue.xml"/>
-  <include name="items/equip-torso/item650_BlackEvokersRobeBlue.xml"/>
-  <include name="items/equip-torso/item651_WhiteWizardRobe.xml"/>
-  <include name="items/equip-torso/item652_BlackWizardRobe.xml"/>
-  <include name="items/equip-torso/item653_ApprenticeRobe.xml"/>
-  <include name="items/equip-torso/item658_WarlordPlate.xml"/>
-  <include name="items/equip-torso/item659_GoldenWarlordPlate.xml"/>
-  <include name="items/equip-torso/item688_TankTop.xml"/>
-  <include name="items/equip-torso/item689_ShortTankTop.xml"/>
-  <include name="items/equip-torso/item720_SilkRobe.xml"/>
-  <include name="items/equip-torso/item726_GMRobe.xml"/>
-  <include name="items/equip-torso/item755_AssassinShirt.xml"/>
-  <include name="items/equip-torso/item767_TerraniteChestArmor.xml"/>
-  <include name="items/equip-torso/item782_ForestArmor.xml"/>
-  <include name="items/equip-torso/item783_ValentineDress.xml"/>
-  <include name="items/equip-torso/item791_YetiSkinShirt.xml"/>
-  <include name="items/equip-torso/item793_BromenalChest.xml"/>
-  <include name="items/equip-torso/item798_SorcererRobeRed.xml"/>
-  <include name="items/equip-torso/item870_FineDress.xml"/>
-  <include name="items/equip-torso/item880_LazuriteRobe.xml"/>
+  <include name="items/equip-torso/item0523_LeatherShirt.xml"/>
+  <include name="items/equip-torso/item0546_DesertShirt.xml"/>
+  <include name="items/equip-torso/item0564_TurtleneckSweater.xml"/>
+  <include name="items/equip-torso/item0624_VNeckSweater.xml"/>
+  <include name="items/equip-torso/item0625_ChainmailShirt.xml"/>
+  <include name="items/equip-torso/item0626_LightPlatemail.xml"/>
+  <include name="items/equip-torso/item0645_GoldenPlatemail.xml"/>
+  <include name="items/equip-torso/item0649_WhiteEvokersRobeBlue.xml"/>
+  <include name="items/equip-torso/item0650_BlackEvokersRobeBlue.xml"/>
+  <include name="items/equip-torso/item0651_WhiteWizardRobe.xml"/>
+  <include name="items/equip-torso/item0652_BlackWizardRobe.xml"/>
+  <include name="items/equip-torso/item0653_ApprenticeRobe.xml"/>
+  <include name="items/equip-torso/item0658_WarlordPlate.xml"/>
+  <include name="items/equip-torso/item0659_GoldenWarlordPlate.xml"/>
+  <include name="items/equip-torso/item0688_TankTop.xml"/>
+  <include name="items/equip-torso/item0689_ShortTankTop.xml"/>
+  <include name="items/equip-torso/item0720_SilkRobe.xml"/>
+  <include name="items/equip-torso/item0726_GMRobe.xml"/>
+  <include name="items/equip-torso/item0755_AssassinShirt.xml"/>
+  <include name="items/equip-torso/item0767_TerraniteChestArmor.xml"/>
+  <include name="items/equip-torso/item0782_ForestArmor.xml"/>
+  <include name="items/equip-torso/item0783_ValentineDress.xml"/>
+  <include name="items/equip-torso/item0791_YetiSkinShirt.xml"/>
+  <include name="items/equip-torso/item0793_BromenalChest.xml"/>
+  <include name="items/equip-torso/item0798_SorcererRobeRed.xml"/>
+  <include name="items/equip-torso/item0870_FineDress.xml"/>
+  <include name="items/equip-torso/item0880_LazuriteRobe.xml"/>
   <include name="items/equip-torso/item1178_ContributorShirt.xml"/>
   <include name="items/equip-torso/item1183_AmberChristmasSweater.xml"/>
   <include name="items/equip-torso/item1184_FunkyChristmasSweater.xml"/>
diff --git a/items/equip-torso/item523_LeatherShirt.xml b/items/equip-torso/item0523_LeatherShirt.xml
index 86773f2f..86773f2f 100644
--- a/items/equip-torso/item523_LeatherShirt.xml
+++ b/items/equip-torso/item0523_LeatherShirt.xml
diff --git a/items/equip-torso/item546_DesertShirt.xml b/items/equip-torso/item0546_DesertShirt.xml
index 60dd7fe9..60dd7fe9 100644
--- a/items/equip-torso/item546_DesertShirt.xml
+++ b/items/equip-torso/item0546_DesertShirt.xml
diff --git a/items/equip-torso/item564_TurtleneckSweater.xml b/items/equip-torso/item0564_TurtleneckSweater.xml
index c99f9973..c99f9973 100644
--- a/items/equip-torso/item564_TurtleneckSweater.xml
+++ b/items/equip-torso/item0564_TurtleneckSweater.xml
diff --git a/items/equip-torso/item624_VNeckSweater.xml b/items/equip-torso/item0624_VNeckSweater.xml
index 463e9b6c..463e9b6c 100644
--- a/items/equip-torso/item624_VNeckSweater.xml
+++ b/items/equip-torso/item0624_VNeckSweater.xml
diff --git a/items/equip-torso/item625_ChainmailShirt.xml b/items/equip-torso/item0625_ChainmailShirt.xml
index cabc534f..cabc534f 100644
--- a/items/equip-torso/item625_ChainmailShirt.xml
+++ b/items/equip-torso/item0625_ChainmailShirt.xml
diff --git a/items/equip-torso/item626_LightPlatemail.xml b/items/equip-torso/item0626_LightPlatemail.xml
index dd27a0fa..dd27a0fa 100644
--- a/items/equip-torso/item626_LightPlatemail.xml
+++ b/items/equip-torso/item0626_LightPlatemail.xml
diff --git a/items/equip-torso/item645_GoldenPlatemail.xml b/items/equip-torso/item0645_GoldenPlatemail.xml
index f754bcdb..f754bcdb 100644
--- a/items/equip-torso/item645_GoldenPlatemail.xml
+++ b/items/equip-torso/item0645_GoldenPlatemail.xml
diff --git a/items/equip-torso/item649_WhiteEvokersRobeBlue.xml b/items/equip-torso/item0649_WhiteEvokersRobeBlue.xml
index 60e15687..60e15687 100644
--- a/items/equip-torso/item649_WhiteEvokersRobeBlue.xml
+++ b/items/equip-torso/item0649_WhiteEvokersRobeBlue.xml
diff --git a/items/equip-torso/item650_BlackEvokersRobeBlue.xml b/items/equip-torso/item0650_BlackEvokersRobeBlue.xml
index 0482e875..0482e875 100644
--- a/items/equip-torso/item650_BlackEvokersRobeBlue.xml
+++ b/items/equip-torso/item0650_BlackEvokersRobeBlue.xml
diff --git a/items/equip-torso/item651_WhiteWizardRobe.xml b/items/equip-torso/item0651_WhiteWizardRobe.xml
index 164b2b0a..164b2b0a 100644
--- a/items/equip-torso/item651_WhiteWizardRobe.xml
+++ b/items/equip-torso/item0651_WhiteWizardRobe.xml
diff --git a/items/equip-torso/item652_BlackWizardRobe.xml b/items/equip-torso/item0652_BlackWizardRobe.xml
index e1027c83..e1027c83 100644
--- a/items/equip-torso/item652_BlackWizardRobe.xml
+++ b/items/equip-torso/item0652_BlackWizardRobe.xml
diff --git a/items/equip-torso/item653_ApprenticeRobe.xml b/items/equip-torso/item0653_ApprenticeRobe.xml
index 6d2b7adb..6d2b7adb 100644
--- a/items/equip-torso/item653_ApprenticeRobe.xml
+++ b/items/equip-torso/item0653_ApprenticeRobe.xml
diff --git a/items/equip-torso/item658_WarlordPlate.xml b/items/equip-torso/item0658_WarlordPlate.xml
index 9521feff..9521feff 100644
--- a/items/equip-torso/item658_WarlordPlate.xml
+++ b/items/equip-torso/item0658_WarlordPlate.xml
diff --git a/items/equip-torso/item659_GoldenWarlordPlate.xml b/items/equip-torso/item0659_GoldenWarlordPlate.xml
index e11fed4b..e11fed4b 100644
--- a/items/equip-torso/item659_GoldenWarlordPlate.xml
+++ b/items/equip-torso/item0659_GoldenWarlordPlate.xml
diff --git a/items/equip-torso/item688_TankTop.xml b/items/equip-torso/item0688_TankTop.xml
index 359f9b67..359f9b67 100644
--- a/items/equip-torso/item688_TankTop.xml
+++ b/items/equip-torso/item0688_TankTop.xml
diff --git a/items/equip-torso/item689_ShortTankTop.xml b/items/equip-torso/item0689_ShortTankTop.xml
index 7889f832..7889f832 100644
--- a/items/equip-torso/item689_ShortTankTop.xml
+++ b/items/equip-torso/item0689_ShortTankTop.xml
diff --git a/items/equip-torso/item720_SilkRobe.xml b/items/equip-torso/item0720_SilkRobe.xml
index d5a4fdfd..d5a4fdfd 100644
--- a/items/equip-torso/item720_SilkRobe.xml
+++ b/items/equip-torso/item0720_SilkRobe.xml
diff --git a/items/equip-torso/item726_GMRobe.xml b/items/equip-torso/item0726_GMRobe.xml
index b8588642..b8588642 100644
--- a/items/equip-torso/item726_GMRobe.xml
+++ b/items/equip-torso/item0726_GMRobe.xml
diff --git a/items/equip-torso/item755_AssassinShirt.xml b/items/equip-torso/item0755_AssassinShirt.xml
index a44a88ae..a44a88ae 100644
--- a/items/equip-torso/item755_AssassinShirt.xml
+++ b/items/equip-torso/item0755_AssassinShirt.xml
diff --git a/items/equip-torso/item767_TerraniteChestArmor.xml b/items/equip-torso/item0767_TerraniteChestArmor.xml
index 323b555d..323b555d 100644
--- a/items/equip-torso/item767_TerraniteChestArmor.xml
+++ b/items/equip-torso/item0767_TerraniteChestArmor.xml
diff --git a/items/equip-torso/item782_ForestArmor.xml b/items/equip-torso/item0782_ForestArmor.xml
index f35d7817..f35d7817 100644
--- a/items/equip-torso/item782_ForestArmor.xml
+++ b/items/equip-torso/item0782_ForestArmor.xml
diff --git a/items/equip-torso/item783_ValentineDress.xml b/items/equip-torso/item0783_ValentineDress.xml
index cd04b9ac..cd04b9ac 100644
--- a/items/equip-torso/item783_ValentineDress.xml
+++ b/items/equip-torso/item0783_ValentineDress.xml
diff --git a/items/equip-torso/item791_YetiSkinShirt.xml b/items/equip-torso/item0791_YetiSkinShirt.xml
index 260ec740..260ec740 100644
--- a/items/equip-torso/item791_YetiSkinShirt.xml
+++ b/items/equip-torso/item0791_YetiSkinShirt.xml
diff --git a/items/equip-torso/item793_BromenalChest.xml b/items/equip-torso/item0793_BromenalChest.xml
index efefec54..efefec54 100644
--- a/items/equip-torso/item793_BromenalChest.xml
+++ b/items/equip-torso/item0793_BromenalChest.xml
diff --git a/items/equip-torso/item798_SorcererRobeRed.xml b/items/equip-torso/item0798_SorcererRobeRed.xml
index 4ec06f42..4ec06f42 100644
--- a/items/equip-torso/item798_SorcererRobeRed.xml
+++ b/items/equip-torso/item0798_SorcererRobeRed.xml
diff --git a/items/equip-torso/item870_FineDress.xml b/items/equip-torso/item0870_FineDress.xml
index 919d5602..919d5602 100644
--- a/items/equip-torso/item870_FineDress.xml
+++ b/items/equip-torso/item0870_FineDress.xml
diff --git a/items/equip-torso/item880_LazuriteRobe.xml b/items/equip-torso/item0880_LazuriteRobe.xml
index 9ef34667..ed8088ad 100644
--- a/items/equip-torso/item880_LazuriteRobe.xml
+++ b/items/equip-torso/item0880_LazuriteRobe.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="880" image="equipment/chest/sorcerer-robe.png|W:#2470BF,C9EAFF,D9D244;R:#cc7722" name="Lazurite Robe" description="A robe overflowing of magical aura." mattack="60" mdefense="60" level="90" effect="Move Speed -15% / VIT Defense -40%" req-int="70" req-vit="40" type="equip-torso" defense="7" vit="-1" int="7" luk="-1" dex="-1" str="-1" weight="30" sellProtected="true">
+  <item id="880" image="equipment/chest/sorcerer-robe.png|W:#2470BF,C9EAFF,D9D244;R:#cc7722" name="Lazurite Robe" description="A robe overflowing of magical aura." mattack="60" mdefense="60" level="90" effect="VIT Defense -40%" req-int="70" req-vit="40" type="equip-torso" defense="7" vit="-1" int="7" luk="-1" dex="-1" str="-1" weight="30" sellProtected="true">
     <sprite gender="unisex">equipment/chest/sorcerer-robe.xml|#2470BF,C9EAFF,D9D244;#cc7722</sprite>
     <sprite gender="female">equipment/chest/sorcerer-robe-female.xml|#2470BF,C9EAFF,D9D244;#cc7722</sprite>
     <replace sprite="race">
diff --git a/items/generic/_include.xml b/items/generic/_include.xml
index 8b450b61..915d00ea 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -1,147 +1,147 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/generic/item503_CasinoCoins.xml"/>
-  <include name="items/generic/item504_DecorCandy.xml"/>
-  <include name="items/generic/item505_MaggotSlime.xml"/>
-  <include name="items/generic/item507_ScorpionStinger.xml"/>
-  <include name="items/generic/item515_PurplePresentBox.xml"/>
-  <include name="items/generic/item516_BluePresentBox.xml"/>
-  <include name="items/generic/item517_RedScorpionStinger.xml"/>
-  <include name="items/generic/item518_BugLeg.xml"/>
-  <include name="items/generic/item526_CoinBag.xml"/>
-  <include name="items/generic/item537_TreasureKey.xml"/>
-  <include name="items/generic/item538_GreenPresentBox.xml"/>
-  <include name="items/generic/item540_EmptyBottle.xml"/>
-  <include name="items/generic/item542_BottleofSand.xml"/>
-  <include name="items/generic/item551_AquaHint.xml"/>
-  <include name="items/generic/item552_MagentaHint.xml"/>
-  <include name="items/generic/item553_YellowHint.xml"/>
-  <include name="items/generic/item554_GreenHint.xml"/>
-  <include name="items/generic/item555_TealHint.xml"/>
-  <include name="items/generic/item556_PurpleHint.xml"/>
-  <include name="items/generic/item557_RedHint.xml"/>
-  <include name="items/generic/item558_BlueHint.xml"/>
-  <include name="items/generic/item559_OrangeHint.xml"/>
-  <include name="items/generic/item560_GrayHint.xml"/>
-  <include name="items/generic/item569_RawLog.xml"/>
-  <include name="items/generic/item589_Toothbrush.xml"/>
-  <include name="items/generic/item611_WhiteFur.xml"/>
-  <include name="items/generic/item612_CaveSnakeLamp.xml"/>
-  <include name="items/generic/item613_HardSpike.xml"/>
-  <include name="items/generic/item614_PinkAntenna.xml"/>
-  <include name="items/generic/item631_DarkCrystal.xml"/>
-  <include name="items/generic/item635_SantaCookie.xml"/>
-  <include name="items/generic/item640_IronOre.xml"/>
-  <include name="items/generic/item641_SnakeSkin.xml"/>
-  <include name="items/generic/item660_CottonCloth.xml"/>
-  <include name="items/generic/item661_RedRose.xml"/>
-  <include name="items/generic/item662_WhiteRose.xml"/>
-  <include name="items/generic/item663_DarkRedRose.xml"/>
-  <include name="items/generic/item664_PinkRose.xml"/>
-  <include name="items/generic/item665_YellowRose.xml"/>
-  <include name="items/generic/item666_BlackRose.xml"/>
-  <include name="items/generic/item667_OrangeRose.xml"/>
-  <include name="items/generic/item668_BlueRose.xml"/>
-  <include name="items/generic/item669_YellowTulip.xml"/>
-  <include name="items/generic/item670_PurpleTulip.xml"/>
-  <include name="items/generic/item671_RedTulip.xml"/>
-  <include name="items/generic/item672_WhiteTulip.xml"/>
-  <include name="items/generic/item673_PinkTulip.xml"/>
-  <include name="items/generic/item674_OrangeTulip.xml"/>
-  <include name="items/generic/item680_MauveHerb.xml"/>
-  <include name="items/generic/item681_CobaltHerb.xml"/>
-  <include name="items/generic/item682_GambogeHerb.xml"/>
-  <include name="items/generic/item683_AlizarinHerb.xml"/>
-  <include name="items/generic/item690_RedDye.xml"/>
-  <include name="items/generic/item691_GreenDye.xml"/>
-  <include name="items/generic/item692_DarkBlueDye.xml"/>
-  <include name="items/generic/item693_YellowDye.xml"/>
-  <include name="items/generic/item694_LightBlueDye.xml"/>
-  <include name="items/generic/item695_PinkDye.xml"/>
-  <include name="items/generic/item696_BlackDye.xml"/>
-  <include name="items/generic/item697_OrangeDye.xml"/>
-  <include name="items/generic/item698_PurpleDye.xml"/>
-  <include name="items/generic/item699_DarkGreenDye.xml"/>
-  <include name="items/generic/item700_Pearl.xml"/>
-  <include name="items/generic/item701_PileofAsh.xml"/>
-  <include name="items/generic/item703_SulphurPowder.xml"/>
-  <include name="items/generic/item704_IronPowder.xml"/>
-  <include name="items/generic/item706_GoldenScorpionStinger.xml"/>
-  <include name="items/generic/item707_MonsterOilPotion.xml"/>
-  <include name="items/generic/item708_LeatherPatch.xml"/>
-  <include name="items/generic/item709_BlackScorpionStinger.xml"/>
-  <include name="items/generic/item710_SnakeTongue.xml"/>
-  <include name="items/generic/item711_MountainSnakeTongue.xml"/>
-  <include name="items/generic/item712_GrassSnakeTongue.xml"/>
-  <include name="items/generic/item713_CaveSnakeTongue.xml"/>
-  <include name="items/generic/item718_SilkCocoon.xml"/>
-  <include name="items/generic/item727_Iten.xml"/>
-  <include name="items/generic/item728_MoubooFigurine.xml"/>
-  <include name="items/generic/item729_WarpedLog.xml"/>
-  <include name="items/generic/item730_Lifestone.xml"/>
-  <include name="items/generic/item732_DruidTreeBranch.xml"/>
-  <include name="items/generic/item740_Root.xml"/>
-  <include name="items/generic/item753_BatWing.xml"/>
-  <include name="items/generic/item754_BatTeeth.xml"/>
-  <include name="items/generic/item763_TerraniteOre.xml"/>
-  <include name="items/generic/item772_WispPowder.xml"/>
-  <include name="items/generic/item773_SpectrePowder.xml"/>
-  <include name="items/generic/item774_PoltergeistPowder.xml"/>
-  <include name="items/generic/item775_Bone.xml"/>
-  <include name="items/generic/item776_Skull.xml"/>
-  <include name="items/generic/item777_RottenRags.xml"/>
-  <include name="items/generic/item778_DiseasedHeart.xml"/>
-  <include name="items/generic/item779_UndeadEar.xml"/>
-  <include name="items/generic/item780_UndeadEye.xml"/>
-  <include name="items/generic/item799_MylarinDust.xml"/>
-  <include name="items/generic/item802_EasterBasket.xml"/>
-  <include name="items/generic/item803_GrassLiner.xml"/>
-  <include name="items/generic/item804_JellyBeans.xml"/>
-  <include name="items/generic/item805_ChocolateMouboo.xml"/>
-  <include name="items/generic/item806_ReedBundle.xml"/>
-  <include name="items/generic/item807_GrassSeeds.xml"/>
-  <include name="items/generic/item819_DiamondPowder.xml"/>
-  <include name="items/generic/item820_RubyPowder.xml"/>
-  <include name="items/generic/item821_EmeraldPowder.xml"/>
-  <include name="items/generic/item822_SapphirePowder.xml"/>
-  <include name="items/generic/item823_TopazPowder.xml"/>
-  <include name="items/generic/item824_AmethystPowder.xml"/>
-  <include name="items/generic/item833_BrokenFourLeafAmulet.xml"/>
-  <include name="items/generic/item834_BrokenDoll.xml"/>
-  <include name="items/generic/item835_HyvernStinger.xml"/>
-  <include name="items/generic/item836_GrubSlime.xml"/>
-  <include name="items/generic/item841_RedDottedWrap.xml"/>
-  <include name="items/generic/item842_YellowDottedWrap.xml"/>
-  <include name="items/generic/item843_BlueDottedWrap.xml"/>
-  <include name="items/generic/item844_PurpleStripedWrap.xml"/>
-  <include name="items/generic/item845_RedGoldenStripedWrap.xml"/>
-  <include name="items/generic/item846_GreenRedStripedWrap.xml"/>
-  <include name="items/generic/item847_PlushMouboo.xml"/>
-  <include name="items/generic/item849_OpenPresentBox.xml"/>
-  <include name="items/generic/item850_ClosedChristmasBox.xml"/>
-  <include name="items/generic/item851_StickReinboo.xml"/>
-  <include name="items/generic/item852_LeatherBall.xml"/>
-  <include name="items/generic/item853_Doll.xml"/>
-  <include name="items/generic/item858_WolvernTooth.xml"/>
-  <include name="items/generic/item859_WolvernPelt.xml"/>
-  <include name="items/generic/item860_SquirrelPelt.xml"/>
-  <include name="items/generic/item861_WhiteBellTuber.xml"/>
-  <include name="items/generic/item862_IcedWater.xml"/>
-  <include name="items/generic/item863_SilverMirror.xml"/>
-  <include name="items/generic/item864_BookPage.xml"/>
-  <include name="items/generic/item866_LeatherSuitcase.xml"/>
-  <include name="items/generic/item869_Antlers.xml"/>
-  <include name="items/generic/item871_SealedSoul.xml"/>
-  <include name="items/generic/item872_LockPicks.xml"/>
-  <include name="items/generic/item873_LazuriteShard.xml"/>
-  <include name="items/generic/item874_LazuriteCrystal.xml"/>
-  <include name="items/generic/item875_HeartofLazurite.xml"/>
-  <include name="items/generic/item891_SilkSheet.xml"/>
-  <include name="items/generic/item892_OrangeSummonFlower.xml"/>
-  <include name="items/generic/item893_PurpleSummonFlower.xml"/>
-  <include name="items/generic/item894_WhiteSummonFlower.xml"/>
-  <include name="items/generic/item895_YellowSummonFlower.xml"/>
-  <include name="items/generic/item896_RedSummonFlower.xml"/>
+  <include name="items/generic/item0503_CasinoCoins.xml"/>
+  <include name="items/generic/item0504_DecorCandy.xml"/>
+  <include name="items/generic/item0505_MaggotSlime.xml"/>
+  <include name="items/generic/item0507_ScorpionStinger.xml"/>
+  <include name="items/generic/item0515_PurplePresentBox.xml"/>
+  <include name="items/generic/item0516_BluePresentBox.xml"/>
+  <include name="items/generic/item0517_RedScorpionStinger.xml"/>
+  <include name="items/generic/item0518_BugLeg.xml"/>
+  <include name="items/generic/item0526_CoinBag.xml"/>
+  <include name="items/generic/item0537_TreasureKey.xml"/>
+  <include name="items/generic/item0538_GreenPresentBox.xml"/>
+  <include name="items/generic/item0540_EmptyBottle.xml"/>
+  <include name="items/generic/item0542_BottleofSand.xml"/>
+  <include name="items/generic/item0551_AquaHint.xml"/>
+  <include name="items/generic/item0552_MagentaHint.xml"/>
+  <include name="items/generic/item0553_YellowHint.xml"/>
+  <include name="items/generic/item0554_GreenHint.xml"/>
+  <include name="items/generic/item0555_TealHint.xml"/>
+  <include name="items/generic/item0556_PurpleHint.xml"/>
+  <include name="items/generic/item0557_RedHint.xml"/>
+  <include name="items/generic/item0558_BlueHint.xml"/>
+  <include name="items/generic/item0559_OrangeHint.xml"/>
+  <include name="items/generic/item0560_GrayHint.xml"/>
+  <include name="items/generic/item0569_RawLog.xml"/>
+  <include name="items/generic/item0589_Toothbrush.xml"/>
+  <include name="items/generic/item0611_WhiteFur.xml"/>
+  <include name="items/generic/item0612_CaveSnakeLamp.xml"/>
+  <include name="items/generic/item0613_HardSpike.xml"/>
+  <include name="items/generic/item0614_PinkAntenna.xml"/>
+  <include name="items/generic/item0631_DarkCrystal.xml"/>
+  <include name="items/generic/item0635_SantaCookie.xml"/>
+  <include name="items/generic/item0640_IronOre.xml"/>
+  <include name="items/generic/item0641_SnakeSkin.xml"/>
+  <include name="items/generic/item0660_CottonCloth.xml"/>
+  <include name="items/generic/item0661_RedRose.xml"/>
+  <include name="items/generic/item0662_WhiteRose.xml"/>
+  <include name="items/generic/item0663_DarkRedRose.xml"/>
+  <include name="items/generic/item0664_PinkRose.xml"/>
+  <include name="items/generic/item0665_YellowRose.xml"/>
+  <include name="items/generic/item0666_BlackRose.xml"/>
+  <include name="items/generic/item0667_OrangeRose.xml"/>
+  <include name="items/generic/item0668_BlueRose.xml"/>
+  <include name="items/generic/item0669_YellowTulip.xml"/>
+  <include name="items/generic/item0670_PurpleTulip.xml"/>
+  <include name="items/generic/item0671_RedTulip.xml"/>
+  <include name="items/generic/item0672_WhiteTulip.xml"/>
+  <include name="items/generic/item0673_PinkTulip.xml"/>
+  <include name="items/generic/item0674_OrangeTulip.xml"/>
+  <include name="items/generic/item0680_MauveHerb.xml"/>
+  <include name="items/generic/item0681_CobaltHerb.xml"/>
+  <include name="items/generic/item0682_GambogeHerb.xml"/>
+  <include name="items/generic/item0683_AlizarinHerb.xml"/>
+  <include name="items/generic/item0690_RedDye.xml"/>
+  <include name="items/generic/item0691_GreenDye.xml"/>
+  <include name="items/generic/item0692_DarkBlueDye.xml"/>
+  <include name="items/generic/item0693_YellowDye.xml"/>
+  <include name="items/generic/item0694_LightBlueDye.xml"/>
+  <include name="items/generic/item0695_PinkDye.xml"/>
+  <include name="items/generic/item0696_BlackDye.xml"/>
+  <include name="items/generic/item0697_OrangeDye.xml"/>
+  <include name="items/generic/item0698_PurpleDye.xml"/>
+  <include name="items/generic/item0699_DarkGreenDye.xml"/>
+  <include name="items/generic/item0700_Pearl.xml"/>
+  <include name="items/generic/item0701_PileofAsh.xml"/>
+  <include name="items/generic/item0703_SulphurPowder.xml"/>
+  <include name="items/generic/item0704_IronPowder.xml"/>
+  <include name="items/generic/item0706_GoldenScorpionStinger.xml"/>
+  <include name="items/generic/item0707_MonsterOilPotion.xml"/>
+  <include name="items/generic/item0708_LeatherPatch.xml"/>
+  <include name="items/generic/item0709_BlackScorpionStinger.xml"/>
+  <include name="items/generic/item0710_SnakeTongue.xml"/>
+  <include name="items/generic/item0711_MountainSnakeTongue.xml"/>
+  <include name="items/generic/item0712_GrassSnakeTongue.xml"/>
+  <include name="items/generic/item0713_CaveSnakeTongue.xml"/>
+  <include name="items/generic/item0718_SilkCocoon.xml"/>
+  <include name="items/generic/item0727_Iten.xml"/>
+  <include name="items/generic/item0728_MoubooFigurine.xml"/>
+  <include name="items/generic/item0729_WarpedLog.xml"/>
+  <include name="items/generic/item0730_Lifestone.xml"/>
+  <include name="items/generic/item0732_DruidTreeBranch.xml"/>
+  <include name="items/generic/item0740_Root.xml"/>
+  <include name="items/generic/item0753_BatWing.xml"/>
+  <include name="items/generic/item0754_BatTeeth.xml"/>
+  <include name="items/generic/item0763_TerraniteOre.xml"/>
+  <include name="items/generic/item0772_WispPowder.xml"/>
+  <include name="items/generic/item0773_SpectrePowder.xml"/>
+  <include name="items/generic/item0774_PoltergeistPowder.xml"/>
+  <include name="items/generic/item0775_Bone.xml"/>
+  <include name="items/generic/item0776_Skull.xml"/>
+  <include name="items/generic/item0777_RottenRags.xml"/>
+  <include name="items/generic/item0778_DiseasedHeart.xml"/>
+  <include name="items/generic/item0779_UndeadEar.xml"/>
+  <include name="items/generic/item0780_UndeadEye.xml"/>
+  <include name="items/generic/item0799_MylarinDust.xml"/>
+  <include name="items/generic/item0802_EasterBasket.xml"/>
+  <include name="items/generic/item0803_GrassLiner.xml"/>
+  <include name="items/generic/item0804_JellyBeans.xml"/>
+  <include name="items/generic/item0805_ChocolateMouboo.xml"/>
+  <include name="items/generic/item0806_ReedBundle.xml"/>
+  <include name="items/generic/item0807_GrassSeeds.xml"/>
+  <include name="items/generic/item0819_DiamondPowder.xml"/>
+  <include name="items/generic/item0820_RubyPowder.xml"/>
+  <include name="items/generic/item0821_EmeraldPowder.xml"/>
+  <include name="items/generic/item0822_SapphirePowder.xml"/>
+  <include name="items/generic/item0823_TopazPowder.xml"/>
+  <include name="items/generic/item0824_AmethystPowder.xml"/>
+  <include name="items/generic/item0833_BrokenFourLeafAmulet.xml"/>
+  <include name="items/generic/item0834_BrokenDoll.xml"/>
+  <include name="items/generic/item0835_HyvernStinger.xml"/>
+  <include name="items/generic/item0836_GrubSlime.xml"/>
+  <include name="items/generic/item0841_RedDottedWrap.xml"/>
+  <include name="items/generic/item0842_YellowDottedWrap.xml"/>
+  <include name="items/generic/item0843_BlueDottedWrap.xml"/>
+  <include name="items/generic/item0844_PurpleStripedWrap.xml"/>
+  <include name="items/generic/item0845_RedGoldenStripedWrap.xml"/>
+  <include name="items/generic/item0846_GreenRedStripedWrap.xml"/>
+  <include name="items/generic/item0847_PlushMouboo.xml"/>
+  <include name="items/generic/item0849_OpenPresentBox.xml"/>
+  <include name="items/generic/item0850_ClosedChristmasBox.xml"/>
+  <include name="items/generic/item0851_StickReinboo.xml"/>
+  <include name="items/generic/item0852_LeatherBall.xml"/>
+  <include name="items/generic/item0853_Doll.xml"/>
+  <include name="items/generic/item0858_WolvernTooth.xml"/>
+  <include name="items/generic/item0859_WolvernPelt.xml"/>
+  <include name="items/generic/item0860_SquirrelPelt.xml"/>
+  <include name="items/generic/item0861_WhiteBellTuber.xml"/>
+  <include name="items/generic/item0862_IcedWater.xml"/>
+  <include name="items/generic/item0863_SilverMirror.xml"/>
+  <include name="items/generic/item0864_BookPage.xml"/>
+  <include name="items/generic/item0866_LeatherSuitcase.xml"/>
+  <include name="items/generic/item0869_Antlers.xml"/>
+  <include name="items/generic/item0871_SealedSoul.xml"/>
+  <include name="items/generic/item0872_LockPicks.xml"/>
+  <include name="items/generic/item0873_LazuriteShard.xml"/>
+  <include name="items/generic/item0874_LazuriteCrystal.xml"/>
+  <include name="items/generic/item0875_HeartofLazurite.xml"/>
+  <include name="items/generic/item0891_SilkSheet.xml"/>
+  <include name="items/generic/item0892_OrangeSummonFlower.xml"/>
+  <include name="items/generic/item0893_PurpleSummonFlower.xml"/>
+  <include name="items/generic/item0894_WhiteSummonFlower.xml"/>
+  <include name="items/generic/item0895_YellowSummonFlower.xml"/>
+  <include name="items/generic/item0896_RedSummonFlower.xml"/>
   <include name="items/generic/item1191_WhiteWrap.xml"/>
   <include name="items/generic/item1192_YellowWrap.xml"/>
   <include name="items/generic/item1193_BlueWrap.xml"/>
@@ -251,4 +251,11 @@
   <include name="items/generic/item5256_PVPCoin.xml"/>
   <include name="items/generic/item5265_LoveLetter.xml"/>
   <include name="items/generic/item5279_Carrot.xml"/>
+  <include name="items/generic/item5288_Naphthalene.xml"/>
+  <include name="items/generic/item5292_SilverOre.xml"/>
+  <include name="items/generic/item5293_CrystallizedDragonBlood.xml"/>
+  <include name="items/generic/item5295_PinkFlowerSeed.xml"/>
+  <include name="items/generic/item5296_SilverIngot.xml"/>
+  <include name="items/generic/item5297_GoldenTooth.xml"/>
+  <include name="items/generic/item5298_CloverDrawing.xml"/>
 </items>
diff --git a/items/generic/item503_CasinoCoins.xml b/items/generic/item0503_CasinoCoins.xml
index 8e3e12ac..8e3e12ac 100644
--- a/items/generic/item503_CasinoCoins.xml
+++ b/items/generic/item0503_CasinoCoins.xml
diff --git a/items/generic/item504_DecorCandy.xml b/items/generic/item0504_DecorCandy.xml
index f7f52204..f7f52204 100644
--- a/items/generic/item504_DecorCandy.xml
+++ b/items/generic/item0504_DecorCandy.xml
diff --git a/items/generic/item505_MaggotSlime.xml b/items/generic/item0505_MaggotSlime.xml
index e5c98a00..e5c98a00 100644
--- a/items/generic/item505_MaggotSlime.xml
+++ b/items/generic/item0505_MaggotSlime.xml
diff --git a/items/generic/item507_ScorpionStinger.xml b/items/generic/item0507_ScorpionStinger.xml
index 0e5fd160..0e5fd160 100644
--- a/items/generic/item507_ScorpionStinger.xml
+++ b/items/generic/item0507_ScorpionStinger.xml
diff --git a/items/generic/item515_PurplePresentBox.xml b/items/generic/item0515_PurplePresentBox.xml
index 35f4ba96..35f4ba96 100644
--- a/items/generic/item515_PurplePresentBox.xml
+++ b/items/generic/item0515_PurplePresentBox.xml
diff --git a/items/generic/item516_BluePresentBox.xml b/items/generic/item0516_BluePresentBox.xml
index 03a3721b..03a3721b 100644
--- a/items/generic/item516_BluePresentBox.xml
+++ b/items/generic/item0516_BluePresentBox.xml
diff --git a/items/generic/item517_RedScorpionStinger.xml b/items/generic/item0517_RedScorpionStinger.xml
index 82b848d3..82b848d3 100644
--- a/items/generic/item517_RedScorpionStinger.xml
+++ b/items/generic/item0517_RedScorpionStinger.xml
diff --git a/items/generic/item518_BugLeg.xml b/items/generic/item0518_BugLeg.xml
index 419dd335..419dd335 100644
--- a/items/generic/item518_BugLeg.xml
+++ b/items/generic/item0518_BugLeg.xml
diff --git a/items/generic/item526_CoinBag.xml b/items/generic/item0526_CoinBag.xml
index c3638fda..c3638fda 100644
--- a/items/generic/item526_CoinBag.xml
+++ b/items/generic/item0526_CoinBag.xml
diff --git a/items/generic/item537_TreasureKey.xml b/items/generic/item0537_TreasureKey.xml
index 9e223b36..9e223b36 100644
--- a/items/generic/item537_TreasureKey.xml
+++ b/items/generic/item0537_TreasureKey.xml
diff --git a/items/generic/item538_GreenPresentBox.xml b/items/generic/item0538_GreenPresentBox.xml
index 705ff377..705ff377 100644
--- a/items/generic/item538_GreenPresentBox.xml
+++ b/items/generic/item0538_GreenPresentBox.xml
diff --git a/items/generic/item540_EmptyBottle.xml b/items/generic/item0540_EmptyBottle.xml
index 7168acad..7168acad 100644
--- a/items/generic/item540_EmptyBottle.xml
+++ b/items/generic/item0540_EmptyBottle.xml
diff --git a/items/generic/item542_BottleofSand.xml b/items/generic/item0542_BottleofSand.xml
index 58e8a693..58e8a693 100644
--- a/items/generic/item542_BottleofSand.xml
+++ b/items/generic/item0542_BottleofSand.xml
diff --git a/items/generic/item551_AquaHint.xml b/items/generic/item0551_AquaHint.xml
index f92a5ce5..f92a5ce5 100644
--- a/items/generic/item551_AquaHint.xml
+++ b/items/generic/item0551_AquaHint.xml
diff --git a/items/generic/item552_MagentaHint.xml b/items/generic/item0552_MagentaHint.xml
index 15f1377a..15f1377a 100644
--- a/items/generic/item552_MagentaHint.xml
+++ b/items/generic/item0552_MagentaHint.xml
diff --git a/items/generic/item553_YellowHint.xml b/items/generic/item0553_YellowHint.xml
index 803d5236..803d5236 100644
--- a/items/generic/item553_YellowHint.xml
+++ b/items/generic/item0553_YellowHint.xml
diff --git a/items/generic/item554_GreenHint.xml b/items/generic/item0554_GreenHint.xml
index c76532d6..c76532d6 100644
--- a/items/generic/item554_GreenHint.xml
+++ b/items/generic/item0554_GreenHint.xml
diff --git a/items/generic/item555_TealHint.xml b/items/generic/item0555_TealHint.xml
index 14e7c0a9..14e7c0a9 100644
--- a/items/generic/item555_TealHint.xml
+++ b/items/generic/item0555_TealHint.xml
diff --git a/items/generic/item556_PurpleHint.xml b/items/generic/item0556_PurpleHint.xml
index 895dd836..895dd836 100644
--- a/items/generic/item556_PurpleHint.xml
+++ b/items/generic/item0556_PurpleHint.xml
diff --git a/items/generic/item557_RedHint.xml b/items/generic/item0557_RedHint.xml
index 931f7f27..931f7f27 100644
--- a/items/generic/item557_RedHint.xml
+++ b/items/generic/item0557_RedHint.xml
diff --git a/items/generic/item558_BlueHint.xml b/items/generic/item0558_BlueHint.xml
index 5e909f06..5e909f06 100644
--- a/items/generic/item558_BlueHint.xml
+++ b/items/generic/item0558_BlueHint.xml
diff --git a/items/generic/item559_OrangeHint.xml b/items/generic/item0559_OrangeHint.xml
index 9ba6496a..9ba6496a 100644
--- a/items/generic/item559_OrangeHint.xml
+++ b/items/generic/item0559_OrangeHint.xml
diff --git a/items/generic/item560_GrayHint.xml b/items/generic/item0560_GrayHint.xml
index 030d9b40..030d9b40 100644
--- a/items/generic/item560_GrayHint.xml
+++ b/items/generic/item0560_GrayHint.xml
diff --git a/items/generic/item569_RawLog.xml b/items/generic/item0569_RawLog.xml
index 586066be..586066be 100644
--- a/items/generic/item569_RawLog.xml
+++ b/items/generic/item0569_RawLog.xml
diff --git a/items/generic/item589_Toothbrush.xml b/items/generic/item0589_Toothbrush.xml
index 9453f6bf..9453f6bf 100644
--- a/items/generic/item589_Toothbrush.xml
+++ b/items/generic/item0589_Toothbrush.xml
diff --git a/items/generic/item611_WhiteFur.xml b/items/generic/item0611_WhiteFur.xml
index c00c02c3..c00c02c3 100644
--- a/items/generic/item611_WhiteFur.xml
+++ b/items/generic/item0611_WhiteFur.xml
diff --git a/items/generic/item612_CaveSnakeLamp.xml b/items/generic/item0612_CaveSnakeLamp.xml
index f965ce4d..f965ce4d 100644
--- a/items/generic/item612_CaveSnakeLamp.xml
+++ b/items/generic/item0612_CaveSnakeLamp.xml
diff --git a/items/generic/item613_HardSpike.xml b/items/generic/item0613_HardSpike.xml
index 584d197d..584d197d 100644
--- a/items/generic/item613_HardSpike.xml
+++ b/items/generic/item0613_HardSpike.xml
diff --git a/items/generic/item614_PinkAntenna.xml b/items/generic/item0614_PinkAntenna.xml
index 14d5dcd8..14d5dcd8 100644
--- a/items/generic/item614_PinkAntenna.xml
+++ b/items/generic/item0614_PinkAntenna.xml
diff --git a/items/generic/item631_DarkCrystal.xml b/items/generic/item0631_DarkCrystal.xml
index a7d98e0f..a7d98e0f 100644
--- a/items/generic/item631_DarkCrystal.xml
+++ b/items/generic/item0631_DarkCrystal.xml
diff --git a/items/generic/item635_SantaCookie.xml b/items/generic/item0635_SantaCookie.xml
index 1d4cd76d..1d4cd76d 100644
--- a/items/generic/item635_SantaCookie.xml
+++ b/items/generic/item0635_SantaCookie.xml
diff --git a/items/generic/item640_IronOre.xml b/items/generic/item0640_IronOre.xml
index 8486dd90..8486dd90 100644
--- a/items/generic/item640_IronOre.xml
+++ b/items/generic/item0640_IronOre.xml
diff --git a/items/generic/item641_SnakeSkin.xml b/items/generic/item0641_SnakeSkin.xml
index e158bda3..e158bda3 100644
--- a/items/generic/item641_SnakeSkin.xml
+++ b/items/generic/item0641_SnakeSkin.xml
diff --git a/items/generic/item660_CottonCloth.xml b/items/generic/item0660_CottonCloth.xml
index 5a8ea1a1..5a8ea1a1 100644
--- a/items/generic/item660_CottonCloth.xml
+++ b/items/generic/item0660_CottonCloth.xml
diff --git a/items/generic/item661_RedRose.xml b/items/generic/item0661_RedRose.xml
index f7c61d59..f7c61d59 100644
--- a/items/generic/item661_RedRose.xml
+++ b/items/generic/item0661_RedRose.xml
diff --git a/items/generic/item662_WhiteRose.xml b/items/generic/item0662_WhiteRose.xml
index 4daddc06..4daddc06 100644
--- a/items/generic/item662_WhiteRose.xml
+++ b/items/generic/item0662_WhiteRose.xml
diff --git a/items/generic/item663_DarkRedRose.xml b/items/generic/item0663_DarkRedRose.xml
index 5206915e..5206915e 100644
--- a/items/generic/item663_DarkRedRose.xml
+++ b/items/generic/item0663_DarkRedRose.xml
diff --git a/items/generic/item664_PinkRose.xml b/items/generic/item0664_PinkRose.xml
index 8ef0672c..8ef0672c 100644
--- a/items/generic/item664_PinkRose.xml
+++ b/items/generic/item0664_PinkRose.xml
diff --git a/items/generic/item665_YellowRose.xml b/items/generic/item0665_YellowRose.xml
index dcce569d..dcce569d 100644
--- a/items/generic/item665_YellowRose.xml
+++ b/items/generic/item0665_YellowRose.xml
diff --git a/items/generic/item666_BlackRose.xml b/items/generic/item0666_BlackRose.xml
index b45cf764..b45cf764 100644
--- a/items/generic/item666_BlackRose.xml
+++ b/items/generic/item0666_BlackRose.xml
diff --git a/items/generic/item667_OrangeRose.xml b/items/generic/item0667_OrangeRose.xml
index af5ce3e3..af5ce3e3 100644
--- a/items/generic/item667_OrangeRose.xml
+++ b/items/generic/item0667_OrangeRose.xml
diff --git a/items/generic/item668_BlueRose.xml b/items/generic/item0668_BlueRose.xml
index 6fc7bbdb..6fc7bbdb 100644
--- a/items/generic/item668_BlueRose.xml
+++ b/items/generic/item0668_BlueRose.xml
diff --git a/items/generic/item669_YellowTulip.xml b/items/generic/item0669_YellowTulip.xml
index b8dd9782..b8dd9782 100644
--- a/items/generic/item669_YellowTulip.xml
+++ b/items/generic/item0669_YellowTulip.xml
diff --git a/items/generic/item670_PurpleTulip.xml b/items/generic/item0670_PurpleTulip.xml
index 8d6ba7a1..8d6ba7a1 100644
--- a/items/generic/item670_PurpleTulip.xml
+++ b/items/generic/item0670_PurpleTulip.xml
diff --git a/items/generic/item671_RedTulip.xml b/items/generic/item0671_RedTulip.xml
index 6d4d46ab..6d4d46ab 100644
--- a/items/generic/item671_RedTulip.xml
+++ b/items/generic/item0671_RedTulip.xml
diff --git a/items/generic/item672_WhiteTulip.xml b/items/generic/item0672_WhiteTulip.xml
index 41d7239e..41d7239e 100644
--- a/items/generic/item672_WhiteTulip.xml
+++ b/items/generic/item0672_WhiteTulip.xml
diff --git a/items/generic/item673_PinkTulip.xml b/items/generic/item0673_PinkTulip.xml
index 0d640104..0d640104 100644
--- a/items/generic/item673_PinkTulip.xml
+++ b/items/generic/item0673_PinkTulip.xml
diff --git a/items/generic/item674_OrangeTulip.xml b/items/generic/item0674_OrangeTulip.xml
index f4a070d0..f4a070d0 100644
--- a/items/generic/item674_OrangeTulip.xml
+++ b/items/generic/item0674_OrangeTulip.xml
diff --git a/items/generic/item680_MauveHerb.xml b/items/generic/item0680_MauveHerb.xml
index 9e899f75..9e899f75 100644
--- a/items/generic/item680_MauveHerb.xml
+++ b/items/generic/item0680_MauveHerb.xml
diff --git a/items/generic/item681_CobaltHerb.xml b/items/generic/item0681_CobaltHerb.xml
index 370d747e..370d747e 100644
--- a/items/generic/item681_CobaltHerb.xml
+++ b/items/generic/item0681_CobaltHerb.xml
diff --git a/items/generic/item682_GambogeHerb.xml b/items/generic/item0682_GambogeHerb.xml
index 1aa75a1a..1aa75a1a 100644
--- a/items/generic/item682_GambogeHerb.xml
+++ b/items/generic/item0682_GambogeHerb.xml
diff --git a/items/generic/item683_AlizarinHerb.xml b/items/generic/item0683_AlizarinHerb.xml
index 721fc8bf..721fc8bf 100644
--- a/items/generic/item683_AlizarinHerb.xml
+++ b/items/generic/item0683_AlizarinHerb.xml
diff --git a/items/generic/item690_RedDye.xml b/items/generic/item0690_RedDye.xml
index 5fef5588..5fef5588 100644
--- a/items/generic/item690_RedDye.xml
+++ b/items/generic/item0690_RedDye.xml
diff --git a/items/generic/item691_GreenDye.xml b/items/generic/item0691_GreenDye.xml
index c7975427..c7975427 100644
--- a/items/generic/item691_GreenDye.xml
+++ b/items/generic/item0691_GreenDye.xml
diff --git a/items/generic/item692_DarkBlueDye.xml b/items/generic/item0692_DarkBlueDye.xml
index f7c4f108..f7c4f108 100644
--- a/items/generic/item692_DarkBlueDye.xml
+++ b/items/generic/item0692_DarkBlueDye.xml
diff --git a/items/generic/item693_YellowDye.xml b/items/generic/item0693_YellowDye.xml
index a13cfa33..a13cfa33 100644
--- a/items/generic/item693_YellowDye.xml
+++ b/items/generic/item0693_YellowDye.xml
diff --git a/items/generic/item694_LightBlueDye.xml b/items/generic/item0694_LightBlueDye.xml
index 7f7892fe..7f7892fe 100644
--- a/items/generic/item694_LightBlueDye.xml
+++ b/items/generic/item0694_LightBlueDye.xml
diff --git a/items/generic/item695_PinkDye.xml b/items/generic/item0695_PinkDye.xml
index ecea366e..ecea366e 100644
--- a/items/generic/item695_PinkDye.xml
+++ b/items/generic/item0695_PinkDye.xml
diff --git a/items/generic/item696_BlackDye.xml b/items/generic/item0696_BlackDye.xml
index 21ab3953..21ab3953 100644
--- a/items/generic/item696_BlackDye.xml
+++ b/items/generic/item0696_BlackDye.xml
diff --git a/items/generic/item697_OrangeDye.xml b/items/generic/item0697_OrangeDye.xml
index 5d6e1549..5d6e1549 100644
--- a/items/generic/item697_OrangeDye.xml
+++ b/items/generic/item0697_OrangeDye.xml
diff --git a/items/generic/item698_PurpleDye.xml b/items/generic/item0698_PurpleDye.xml
index 6b12a95c..6b12a95c 100644
--- a/items/generic/item698_PurpleDye.xml
+++ b/items/generic/item0698_PurpleDye.xml
diff --git a/items/generic/item699_DarkGreenDye.xml b/items/generic/item0699_DarkGreenDye.xml
index b8dc8ae4..b8dc8ae4 100644
--- a/items/generic/item699_DarkGreenDye.xml
+++ b/items/generic/item0699_DarkGreenDye.xml
diff --git a/items/generic/item700_Pearl.xml b/items/generic/item0700_Pearl.xml
index 19ab3d42..19ab3d42 100644
--- a/items/generic/item700_Pearl.xml
+++ b/items/generic/item0700_Pearl.xml
diff --git a/items/generic/item701_PileofAsh.xml b/items/generic/item0701_PileofAsh.xml
index 6deb36e6..6deb36e6 100644
--- a/items/generic/item701_PileofAsh.xml
+++ b/items/generic/item0701_PileofAsh.xml
diff --git a/items/generic/item703_SulphurPowder.xml b/items/generic/item0703_SulphurPowder.xml
index 8fb408df..8fb408df 100644
--- a/items/generic/item703_SulphurPowder.xml
+++ b/items/generic/item0703_SulphurPowder.xml
diff --git a/items/generic/item704_IronPowder.xml b/items/generic/item0704_IronPowder.xml
index e86daac3..e86daac3 100644
--- a/items/generic/item704_IronPowder.xml
+++ b/items/generic/item0704_IronPowder.xml
diff --git a/items/generic/item706_GoldenScorpionStinger.xml b/items/generic/item0706_GoldenScorpionStinger.xml
index d7ba5df9..d7ba5df9 100644
--- a/items/generic/item706_GoldenScorpionStinger.xml
+++ b/items/generic/item0706_GoldenScorpionStinger.xml
diff --git a/items/generic/item707_MonsterOilPotion.xml b/items/generic/item0707_MonsterOilPotion.xml
index 6742479b..6742479b 100644
--- a/items/generic/item707_MonsterOilPotion.xml
+++ b/items/generic/item0707_MonsterOilPotion.xml
diff --git a/items/generic/item708_LeatherPatch.xml b/items/generic/item0708_LeatherPatch.xml
index efbbc313..efbbc313 100644
--- a/items/generic/item708_LeatherPatch.xml
+++ b/items/generic/item0708_LeatherPatch.xml
diff --git a/items/generic/item709_BlackScorpionStinger.xml b/items/generic/item0709_BlackScorpionStinger.xml
index eb390172..eb390172 100644
--- a/items/generic/item709_BlackScorpionStinger.xml
+++ b/items/generic/item0709_BlackScorpionStinger.xml
diff --git a/items/generic/item710_SnakeTongue.xml b/items/generic/item0710_SnakeTongue.xml
index e3bfc233..e3bfc233 100644
--- a/items/generic/item710_SnakeTongue.xml
+++ b/items/generic/item0710_SnakeTongue.xml
diff --git a/items/generic/item711_MountainSnakeTongue.xml b/items/generic/item0711_MountainSnakeTongue.xml
index 28988cca..28988cca 100644
--- a/items/generic/item711_MountainSnakeTongue.xml
+++ b/items/generic/item0711_MountainSnakeTongue.xml
diff --git a/items/generic/item712_GrassSnakeTongue.xml b/items/generic/item0712_GrassSnakeTongue.xml
index d8064f7e..d8064f7e 100644
--- a/items/generic/item712_GrassSnakeTongue.xml
+++ b/items/generic/item0712_GrassSnakeTongue.xml
diff --git a/items/generic/item713_CaveSnakeTongue.xml b/items/generic/item0713_CaveSnakeTongue.xml
index be9b98f6..be9b98f6 100644
--- a/items/generic/item713_CaveSnakeTongue.xml
+++ b/items/generic/item0713_CaveSnakeTongue.xml
diff --git a/items/generic/item718_SilkCocoon.xml b/items/generic/item0718_SilkCocoon.xml
index 2a6428e6..2a6428e6 100644
--- a/items/generic/item718_SilkCocoon.xml
+++ b/items/generic/item0718_SilkCocoon.xml
diff --git a/items/generic/item727_Iten.xml b/items/generic/item0727_Iten.xml
index 12f8bf95..12f8bf95 100644
--- a/items/generic/item727_Iten.xml
+++ b/items/generic/item0727_Iten.xml
diff --git a/items/generic/item728_MoubooFigurine.xml b/items/generic/item0728_MoubooFigurine.xml
index b0c561d2..b0c561d2 100644
--- a/items/generic/item728_MoubooFigurine.xml
+++ b/items/generic/item0728_MoubooFigurine.xml
diff --git a/items/generic/item729_WarpedLog.xml b/items/generic/item0729_WarpedLog.xml
index e226b127..e226b127 100644
--- a/items/generic/item729_WarpedLog.xml
+++ b/items/generic/item0729_WarpedLog.xml
diff --git a/items/generic/item730_Lifestone.xml b/items/generic/item0730_Lifestone.xml
index 1475d980..1475d980 100644
--- a/items/generic/item730_Lifestone.xml
+++ b/items/generic/item0730_Lifestone.xml
diff --git a/items/generic/item732_DruidTreeBranch.xml b/items/generic/item0732_DruidTreeBranch.xml
index 2561548c..2561548c 100644
--- a/items/generic/item732_DruidTreeBranch.xml
+++ b/items/generic/item0732_DruidTreeBranch.xml
diff --git a/items/generic/item740_Root.xml b/items/generic/item0740_Root.xml
index bcb64910..bcb64910 100644
--- a/items/generic/item740_Root.xml
+++ b/items/generic/item0740_Root.xml
diff --git a/items/generic/item753_BatWing.xml b/items/generic/item0753_BatWing.xml
index d00b6d73..d00b6d73 100644
--- a/items/generic/item753_BatWing.xml
+++ b/items/generic/item0753_BatWing.xml
diff --git a/items/generic/item754_BatTeeth.xml b/items/generic/item0754_BatTeeth.xml
index 56bdfc6b..56bdfc6b 100644
--- a/items/generic/item754_BatTeeth.xml
+++ b/items/generic/item0754_BatTeeth.xml
diff --git a/items/generic/item763_TerraniteOre.xml b/items/generic/item0763_TerraniteOre.xml
index f659abaa..f659abaa 100644
--- a/items/generic/item763_TerraniteOre.xml
+++ b/items/generic/item0763_TerraniteOre.xml
diff --git a/items/generic/item772_WispPowder.xml b/items/generic/item0772_WispPowder.xml
index f89bafec..f89bafec 100644
--- a/items/generic/item772_WispPowder.xml
+++ b/items/generic/item0772_WispPowder.xml
diff --git a/items/generic/item773_SpectrePowder.xml b/items/generic/item0773_SpectrePowder.xml
index 9a2a106c..9a2a106c 100644
--- a/items/generic/item773_SpectrePowder.xml
+++ b/items/generic/item0773_SpectrePowder.xml
diff --git a/items/generic/item774_PoltergeistPowder.xml b/items/generic/item0774_PoltergeistPowder.xml
index 2b8508f6..2b8508f6 100644
--- a/items/generic/item774_PoltergeistPowder.xml
+++ b/items/generic/item0774_PoltergeistPowder.xml
diff --git a/items/generic/item775_Bone.xml b/items/generic/item0775_Bone.xml
index 41f4fa02..41f4fa02 100644
--- a/items/generic/item775_Bone.xml
+++ b/items/generic/item0775_Bone.xml
diff --git a/items/generic/item776_Skull.xml b/items/generic/item0776_Skull.xml
index 2aef738e..2aef738e 100644
--- a/items/generic/item776_Skull.xml
+++ b/items/generic/item0776_Skull.xml
diff --git a/items/generic/item777_RottenRags.xml b/items/generic/item0777_RottenRags.xml
index 91860c56..91860c56 100644
--- a/items/generic/item777_RottenRags.xml
+++ b/items/generic/item0777_RottenRags.xml
diff --git a/items/generic/item778_DiseasedHeart.xml b/items/generic/item0778_DiseasedHeart.xml
index c48b1f8f..c48b1f8f 100644
--- a/items/generic/item778_DiseasedHeart.xml
+++ b/items/generic/item0778_DiseasedHeart.xml
diff --git a/items/generic/item779_UndeadEar.xml b/items/generic/item0779_UndeadEar.xml
index 29a051dd..29a051dd 100644
--- a/items/generic/item779_UndeadEar.xml
+++ b/items/generic/item0779_UndeadEar.xml
diff --git a/items/generic/item780_UndeadEye.xml b/items/generic/item0780_UndeadEye.xml
index 7a245353..7a245353 100644
--- a/items/generic/item780_UndeadEye.xml
+++ b/items/generic/item0780_UndeadEye.xml
diff --git a/items/generic/item799_MylarinDust.xml b/items/generic/item0799_MylarinDust.xml
index e4661fe1..e4661fe1 100644
--- a/items/generic/item799_MylarinDust.xml
+++ b/items/generic/item0799_MylarinDust.xml
diff --git a/items/generic/item802_EasterBasket.xml b/items/generic/item0802_EasterBasket.xml
index 76b5705e..76b5705e 100644
--- a/items/generic/item802_EasterBasket.xml
+++ b/items/generic/item0802_EasterBasket.xml
diff --git a/items/generic/item803_GrassLiner.xml b/items/generic/item0803_GrassLiner.xml
index cea1cb9c..cea1cb9c 100644
--- a/items/generic/item803_GrassLiner.xml
+++ b/items/generic/item0803_GrassLiner.xml
diff --git a/items/generic/item804_JellyBeans.xml b/items/generic/item0804_JellyBeans.xml
index 986c2699..986c2699 100644
--- a/items/generic/item804_JellyBeans.xml
+++ b/items/generic/item0804_JellyBeans.xml
diff --git a/items/generic/item805_ChocolateMouboo.xml b/items/generic/item0805_ChocolateMouboo.xml
index 64c5aff2..64c5aff2 100644
--- a/items/generic/item805_ChocolateMouboo.xml
+++ b/items/generic/item0805_ChocolateMouboo.xml
diff --git a/items/generic/item806_ReedBundle.xml b/items/generic/item0806_ReedBundle.xml
index 9a6bdc7e..9a6bdc7e 100644
--- a/items/generic/item806_ReedBundle.xml
+++ b/items/generic/item0806_ReedBundle.xml
diff --git a/items/generic/item807_GrassSeeds.xml b/items/generic/item0807_GrassSeeds.xml
index 0f864111..0f864111 100644
--- a/items/generic/item807_GrassSeeds.xml
+++ b/items/generic/item0807_GrassSeeds.xml
diff --git a/items/generic/item819_DiamondPowder.xml b/items/generic/item0819_DiamondPowder.xml
index 47df03ee..47df03ee 100644
--- a/items/generic/item819_DiamondPowder.xml
+++ b/items/generic/item0819_DiamondPowder.xml
diff --git a/items/generic/item820_RubyPowder.xml b/items/generic/item0820_RubyPowder.xml
index f19415f0..f19415f0 100644
--- a/items/generic/item820_RubyPowder.xml
+++ b/items/generic/item0820_RubyPowder.xml
diff --git a/items/generic/item821_EmeraldPowder.xml b/items/generic/item0821_EmeraldPowder.xml
index d7e63f11..d7e63f11 100644
--- a/items/generic/item821_EmeraldPowder.xml
+++ b/items/generic/item0821_EmeraldPowder.xml
diff --git a/items/generic/item822_SapphirePowder.xml b/items/generic/item0822_SapphirePowder.xml
index a0896932..a0896932 100644
--- a/items/generic/item822_SapphirePowder.xml
+++ b/items/generic/item0822_SapphirePowder.xml
diff --git a/items/generic/item823_TopazPowder.xml b/items/generic/item0823_TopazPowder.xml
index 61f65763..61f65763 100644
--- a/items/generic/item823_TopazPowder.xml
+++ b/items/generic/item0823_TopazPowder.xml
diff --git a/items/generic/item824_AmethystPowder.xml b/items/generic/item0824_AmethystPowder.xml
index 73adb5e3..73adb5e3 100644
--- a/items/generic/item824_AmethystPowder.xml
+++ b/items/generic/item0824_AmethystPowder.xml
diff --git a/items/generic/item833_BrokenFourLeafAmulet.xml b/items/generic/item0833_BrokenFourLeafAmulet.xml
index efb47abd..efb47abd 100644
--- a/items/generic/item833_BrokenFourLeafAmulet.xml
+++ b/items/generic/item0833_BrokenFourLeafAmulet.xml
diff --git a/items/generic/item834_BrokenDoll.xml b/items/generic/item0834_BrokenDoll.xml
index 2a1096dc..2a1096dc 100644
--- a/items/generic/item834_BrokenDoll.xml
+++ b/items/generic/item0834_BrokenDoll.xml
diff --git a/items/generic/item835_HyvernStinger.xml b/items/generic/item0835_HyvernStinger.xml
index 8ab617ec..8ab617ec 100644
--- a/items/generic/item835_HyvernStinger.xml
+++ b/items/generic/item0835_HyvernStinger.xml
diff --git a/items/generic/item836_GrubSlime.xml b/items/generic/item0836_GrubSlime.xml
index 281f2804..281f2804 100644
--- a/items/generic/item836_GrubSlime.xml
+++ b/items/generic/item0836_GrubSlime.xml
diff --git a/items/generic/item841_RedDottedWrap.xml b/items/generic/item0841_RedDottedWrap.xml
index 67204beb..67204beb 100644
--- a/items/generic/item841_RedDottedWrap.xml
+++ b/items/generic/item0841_RedDottedWrap.xml
diff --git a/items/generic/item842_YellowDottedWrap.xml b/items/generic/item0842_YellowDottedWrap.xml
index e34ddd16..e34ddd16 100644
--- a/items/generic/item842_YellowDottedWrap.xml
+++ b/items/generic/item0842_YellowDottedWrap.xml
diff --git a/items/generic/item843_BlueDottedWrap.xml b/items/generic/item0843_BlueDottedWrap.xml
index 47648611..47648611 100644
--- a/items/generic/item843_BlueDottedWrap.xml
+++ b/items/generic/item0843_BlueDottedWrap.xml
diff --git a/items/generic/item844_PurpleStripedWrap.xml b/items/generic/item0844_PurpleStripedWrap.xml
index 4e17dc92..4e17dc92 100644
--- a/items/generic/item844_PurpleStripedWrap.xml
+++ b/items/generic/item0844_PurpleStripedWrap.xml
diff --git a/items/generic/item845_RedGoldenStripedWrap.xml b/items/generic/item0845_RedGoldenStripedWrap.xml
index d47e80a3..d47e80a3 100644
--- a/items/generic/item845_RedGoldenStripedWrap.xml
+++ b/items/generic/item0845_RedGoldenStripedWrap.xml
diff --git a/items/generic/item846_GreenRedStripedWrap.xml b/items/generic/item0846_GreenRedStripedWrap.xml
index 4a58dd37..4a58dd37 100644
--- a/items/generic/item846_GreenRedStripedWrap.xml
+++ b/items/generic/item0846_GreenRedStripedWrap.xml
diff --git a/items/generic/item847_PlushMouboo.xml b/items/generic/item0847_PlushMouboo.xml
index 01cb221e..01cb221e 100644
--- a/items/generic/item847_PlushMouboo.xml
+++ b/items/generic/item0847_PlushMouboo.xml
diff --git a/items/generic/item849_OpenPresentBox.xml b/items/generic/item0849_OpenPresentBox.xml
index 1bf949fb..1bf949fb 100644
--- a/items/generic/item849_OpenPresentBox.xml
+++ b/items/generic/item0849_OpenPresentBox.xml
diff --git a/items/generic/item850_ClosedChristmasBox.xml b/items/generic/item0850_ClosedChristmasBox.xml
index a9856037..a9856037 100644
--- a/items/generic/item850_ClosedChristmasBox.xml
+++ b/items/generic/item0850_ClosedChristmasBox.xml
diff --git a/items/generic/item851_StickReinboo.xml b/items/generic/item0851_StickReinboo.xml
index 6c79e63e..6c79e63e 100644
--- a/items/generic/item851_StickReinboo.xml
+++ b/items/generic/item0851_StickReinboo.xml
diff --git a/items/generic/item852_LeatherBall.xml b/items/generic/item0852_LeatherBall.xml
index 1fe196d3..1fe196d3 100644
--- a/items/generic/item852_LeatherBall.xml
+++ b/items/generic/item0852_LeatherBall.xml
diff --git a/items/generic/item853_Doll.xml b/items/generic/item0853_Doll.xml
index c1dd58c3..c1dd58c3 100644
--- a/items/generic/item853_Doll.xml
+++ b/items/generic/item0853_Doll.xml
diff --git a/items/generic/item858_WolvernTooth.xml b/items/generic/item0858_WolvernTooth.xml
index baa544de..baa544de 100644
--- a/items/generic/item858_WolvernTooth.xml
+++ b/items/generic/item0858_WolvernTooth.xml
diff --git a/items/generic/item859_WolvernPelt.xml b/items/generic/item0859_WolvernPelt.xml
index 41eefaa3..41eefaa3 100644
--- a/items/generic/item859_WolvernPelt.xml
+++ b/items/generic/item0859_WolvernPelt.xml
diff --git a/items/generic/item860_SquirrelPelt.xml b/items/generic/item0860_SquirrelPelt.xml
index 3a5f0884..3a5f0884 100644
--- a/items/generic/item860_SquirrelPelt.xml
+++ b/items/generic/item0860_SquirrelPelt.xml
diff --git a/items/generic/item861_WhiteBellTuber.xml b/items/generic/item0861_WhiteBellTuber.xml
index 087705b8..087705b8 100644
--- a/items/generic/item861_WhiteBellTuber.xml
+++ b/items/generic/item0861_WhiteBellTuber.xml
diff --git a/items/generic/item862_IcedWater.xml b/items/generic/item0862_IcedWater.xml
index b0b12ff1..b0b12ff1 100644
--- a/items/generic/item862_IcedWater.xml
+++ b/items/generic/item0862_IcedWater.xml
diff --git a/items/generic/item863_SilverMirror.xml b/items/generic/item0863_SilverMirror.xml
index 43565e2d..43565e2d 100644
--- a/items/generic/item863_SilverMirror.xml
+++ b/items/generic/item0863_SilverMirror.xml
diff --git a/items/generic/item864_BookPage.xml b/items/generic/item0864_BookPage.xml
index 0822c4d5..0822c4d5 100644
--- a/items/generic/item864_BookPage.xml
+++ b/items/generic/item0864_BookPage.xml
diff --git a/items/generic/item866_LeatherSuitcase.xml b/items/generic/item0866_LeatherSuitcase.xml
index 14e7d01c..14e7d01c 100644
--- a/items/generic/item866_LeatherSuitcase.xml
+++ b/items/generic/item0866_LeatherSuitcase.xml
diff --git a/items/generic/item869_Antlers.xml b/items/generic/item0869_Antlers.xml
index b44ec637..b44ec637 100644
--- a/items/generic/item869_Antlers.xml
+++ b/items/generic/item0869_Antlers.xml
diff --git a/items/generic/item871_SealedSoul.xml b/items/generic/item0871_SealedSoul.xml
index 78e6a91c..78e6a91c 100644
--- a/items/generic/item871_SealedSoul.xml
+++ b/items/generic/item0871_SealedSoul.xml
diff --git a/items/generic/item872_LockPicks.xml b/items/generic/item0872_LockPicks.xml
index 05250fc4..05250fc4 100644
--- a/items/generic/item872_LockPicks.xml
+++ b/items/generic/item0872_LockPicks.xml
diff --git a/items/generic/item873_LazuriteShard.xml b/items/generic/item0873_LazuriteShard.xml
index 02bf746f..02bf746f 100644
--- a/items/generic/item873_LazuriteShard.xml
+++ b/items/generic/item0873_LazuriteShard.xml
diff --git a/items/generic/item874_LazuriteCrystal.xml b/items/generic/item0874_LazuriteCrystal.xml
index 7805a1a8..7805a1a8 100644
--- a/items/generic/item874_LazuriteCrystal.xml
+++ b/items/generic/item0874_LazuriteCrystal.xml
diff --git a/items/generic/item875_HeartofLazurite.xml b/items/generic/item0875_HeartofLazurite.xml
index 002d9cf4..002d9cf4 100644
--- a/items/generic/item875_HeartofLazurite.xml
+++ b/items/generic/item0875_HeartofLazurite.xml
diff --git a/items/generic/item891_SilkSheet.xml b/items/generic/item0891_SilkSheet.xml
index ae768ccd..ae768ccd 100644
--- a/items/generic/item891_SilkSheet.xml
+++ b/items/generic/item0891_SilkSheet.xml
diff --git a/items/generic/item892_OrangeSummonFlower.xml b/items/generic/item0892_OrangeSummonFlower.xml
index 47052c37..47052c37 100644
--- a/items/generic/item892_OrangeSummonFlower.xml
+++ b/items/generic/item0892_OrangeSummonFlower.xml
diff --git a/items/generic/item893_PurpleSummonFlower.xml b/items/generic/item0893_PurpleSummonFlower.xml
index 61583b01..61583b01 100644
--- a/items/generic/item893_PurpleSummonFlower.xml
+++ b/items/generic/item0893_PurpleSummonFlower.xml
diff --git a/items/generic/item894_WhiteSummonFlower.xml b/items/generic/item0894_WhiteSummonFlower.xml
index 547c5e12..547c5e12 100644
--- a/items/generic/item894_WhiteSummonFlower.xml
+++ b/items/generic/item0894_WhiteSummonFlower.xml
diff --git a/items/generic/item895_YellowSummonFlower.xml b/items/generic/item0895_YellowSummonFlower.xml
index 6215aac3..6215aac3 100644
--- a/items/generic/item895_YellowSummonFlower.xml
+++ b/items/generic/item0895_YellowSummonFlower.xml
diff --git a/items/generic/item896_RedSummonFlower.xml b/items/generic/item0896_RedSummonFlower.xml
index 88540867..88540867 100644
--- a/items/generic/item896_RedSummonFlower.xml
+++ b/items/generic/item0896_RedSummonFlower.xml
diff --git a/items/generic/item5288_Naphthalene.xml b/items/generic/item5288_Naphthalene.xml
new file mode 100644
index 00000000..ae4e3f89
--- /dev/null
+++ b/items/generic/item5288_Naphthalene.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5288"
+	image="generic/naftalin.png"
+	name="Naphthalene"
+	description="Used to produce powerful dyes and medicine, and usually produced from burning a special kind of Coal."
+	type="generic"
+	weight="1"
+    />
+</items>
diff --git a/items/generic/item5292_SilverOre.xml b/items/generic/item5292_SilverOre.xml
new file mode 100644
index 00000000..34dc56ec
--- /dev/null
+++ b/items/generic/item5292_SilverOre.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5292"
+	image="generic/ore.png|W:#0f0a0e,1b141b,231a23,362736,4f3a4f,634863,936a92,b499b4;R:#1a1e1f,2f3739,4a575b,94a1a4,cad5d7,effafc"
+	name="Silver Ore"
+	description="Can be sold for a considerable amount of money."
+	type="generic"
+	weight="40"
+    />
+</items>
diff --git a/items/generic/item5293_CrystallizedDragonBlood.xml b/items/generic/item5293_CrystallizedDragonBlood.xml
new file mode 100644
index 00000000..3a5ed859
--- /dev/null
+++ b/items/generic/item5293_CrystallizedDragonBlood.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5293"
+    image="generic/crystalized-dragon-blood.png"
+    name="Crystallized Dragon Blood"
+    description="The blood of a slain dragon that seeped down to the earth's core and was formed into a crystal by the enormous pressure. It is still surrounded by an aura of incredible power that is almost as strong as it was during the dragon's lifetime."
+    type="generic"
+    weight="1111"
+  />
+</items>
diff --git a/items/generic/item5295_PinkFlowerSeed.xml b/items/generic/item5295_PinkFlowerSeed.xml
new file mode 100644
index 00000000..9507c5bb
--- /dev/null
+++ b/items/generic/item5295_PinkFlowerSeed.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5295" image="generic/pink-flower-seed.png" name="Pink Flower Seed" description="You could swear that this seed is watching you." type="generic" weight="10"/>
+</items>
diff --git a/items/generic/item5296_SilverIngot.xml b/items/generic/item5296_SilverIngot.xml
new file mode 100644
index 00000000..83f4b43a
--- /dev/null
+++ b/items/generic/item5296_SilverIngot.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5296"
+    image="generic/ingot.png"
+    name="Silver Ingot"
+    description="Used to craft silver objects."
+    type="generic"
+    sellProtected="true"
+    weight="1000"
+  />
+</items>
+
diff --git a/items/generic/item5297_GoldenTooth.xml b/items/generic/item5297_GoldenTooth.xml
new file mode 100644
index 00000000..9c2bf0a7
--- /dev/null
+++ b/items/generic/item5297_GoldenTooth.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5297"
+    image="generic/golden-tooth.png"
+    name="Golden Tooth"
+    description="Someone was very rich during their lifetime."
+    type="generic"
+    sellProtected="true"
+    weight="40"
+  />
+</items>
diff --git a/items/generic/item5298_CloverDrawing.xml b/items/generic/item5298_CloverDrawing.xml
new file mode 100644
index 00000000..e6762288
--- /dev/null
+++ b/items/generic/item5298_CloverDrawing.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5298"
+    image="generic/clover-drawing.png"
+    name="Clover Drawing"
+    description="An anatomically correct drawing of a perfect four-leaf clover with measurements."
+    type="generic"
+    sellProtected="true"
+    weight="10"
+  />
+</items>
diff --git a/items/hairsprite/_include.xml b/items/hairsprite/_include.xml
index 0fae080e..aaeb9cb7 100644
--- a/items/hairsprite/_include.xml
+++ b/items/hairsprite/_include.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/hairsprite/item-1_Bald.xml"/>
-  <include name="items/hairsprite/item-2_Flatponytail.xml"/>
-  <include name="items/hairsprite/item-3_Bowlcut.xml"/>
-  <include name="items/hairsprite/item-4_Combedback.xml"/>
-  <include name="items/hairsprite/item-5_Emo.xml"/>
-  <include name="items/hairsprite/item-6_Mohawk.xml"/>
-  <include name="items/hairsprite/item-7_Pompadour.xml"/>
-  <include name="items/hairsprite/item-8_CenterpartingShortandslick.xml"/>
-  <include name="items/hairsprite/item-9_Longandslick.xml"/>
-  <include name="items/hairsprite/item-10_Shortandcurly.xml"/>
-  <include name="items/hairsprite/item-11_Pigtails.xml"/>
-  <include name="items/hairsprite/item-12_Longandcurly.xml"/>
-  <include name="items/hairsprite/item-13_Parted.xml"/>
-  <include name="items/hairsprite/item-14_Perkyponytail.xml"/>
-  <include name="items/hairsprite/item-15_Wave.xml"/>
-  <include name="items/hairsprite/item-16_Mane.xml"/>
-  <include name="items/hairsprite/item-17_Bun.xml"/>
-  <include name="items/hairsprite/item-18_Shoulderlengthflick.xml"/>
-  <include name="items/hairsprite/item-19_Fizzy.xml"/>
-  <include name="items/hairsprite/item-20_LongandClipped.xml"/>
+  <include name="items/hairsprite/item01_Bald.xml"/>
+  <include name="items/hairsprite/item02_Flatponytail.xml"/>
+  <include name="items/hairsprite/item03_Bowlcut.xml"/>
+  <include name="items/hairsprite/item04_Combedback.xml"/>
+  <include name="items/hairsprite/item05_Emo.xml"/>
+  <include name="items/hairsprite/item06_Mohawk.xml"/>
+  <include name="items/hairsprite/item07_Pompadour.xml"/>
+  <include name="items/hairsprite/item08_CenterpartingShortandslick.xml"/>
+  <include name="items/hairsprite/item09_Longandslick.xml"/>
+  <include name="items/hairsprite/item10_Shortandcurly.xml"/>
+  <include name="items/hairsprite/item11_Pigtails.xml"/>
+  <include name="items/hairsprite/item12_Longandcurly.xml"/>
+  <include name="items/hairsprite/item13_Parted.xml"/>
+  <include name="items/hairsprite/item14_Perkyponytail.xml"/>
+  <include name="items/hairsprite/item15_Wave.xml"/>
+  <include name="items/hairsprite/item16_Mane.xml"/>
+  <include name="items/hairsprite/item17_Bun.xml"/>
+  <include name="items/hairsprite/item18_Shoulderlengthflick.xml"/>
+  <include name="items/hairsprite/item19_Fizzy.xml"/>
+  <include name="items/hairsprite/item20_LongandClipped.xml"/>
 </items>
diff --git a/items/hairsprite/item-1_Bald.xml b/items/hairsprite/item01_Bald.xml
index c6627525..c6627525 100644
--- a/items/hairsprite/item-1_Bald.xml
+++ b/items/hairsprite/item01_Bald.xml
diff --git a/items/hairsprite/item-2_Flatponytail.xml b/items/hairsprite/item02_Flatponytail.xml
index c45f8444..c45f8444 100644
--- a/items/hairsprite/item-2_Flatponytail.xml
+++ b/items/hairsprite/item02_Flatponytail.xml
diff --git a/items/hairsprite/item-3_Bowlcut.xml b/items/hairsprite/item03_Bowlcut.xml
index f1d76d8c..f1d76d8c 100644
--- a/items/hairsprite/item-3_Bowlcut.xml
+++ b/items/hairsprite/item03_Bowlcut.xml
diff --git a/items/hairsprite/item-4_Combedback.xml b/items/hairsprite/item04_Combedback.xml
index 000b632a..000b632a 100644
--- a/items/hairsprite/item-4_Combedback.xml
+++ b/items/hairsprite/item04_Combedback.xml
diff --git a/items/hairsprite/item-5_Emo.xml b/items/hairsprite/item05_Emo.xml
index 14363483..14363483 100644
--- a/items/hairsprite/item-5_Emo.xml
+++ b/items/hairsprite/item05_Emo.xml
diff --git a/items/hairsprite/item-6_Mohawk.xml b/items/hairsprite/item06_Mohawk.xml
index 115e741d..115e741d 100644
--- a/items/hairsprite/item-6_Mohawk.xml
+++ b/items/hairsprite/item06_Mohawk.xml
diff --git a/items/hairsprite/item-7_Pompadour.xml b/items/hairsprite/item07_Pompadour.xml
index 42084577..42084577 100644
--- a/items/hairsprite/item-7_Pompadour.xml
+++ b/items/hairsprite/item07_Pompadour.xml
diff --git a/items/hairsprite/item-8_CenterpartingShortandslick.xml b/items/hairsprite/item08_CenterpartingShortandslick.xml
index aff7d57d..aff7d57d 100644
--- a/items/hairsprite/item-8_CenterpartingShortandslick.xml
+++ b/items/hairsprite/item08_CenterpartingShortandslick.xml
diff --git a/items/hairsprite/item-9_Longandslick.xml b/items/hairsprite/item09_Longandslick.xml
index 105f0085..105f0085 100644
--- a/items/hairsprite/item-9_Longandslick.xml
+++ b/items/hairsprite/item09_Longandslick.xml
diff --git a/items/hairsprite/item-10_Shortandcurly.xml b/items/hairsprite/item10_Shortandcurly.xml
index de490e20..de490e20 100644
--- a/items/hairsprite/item-10_Shortandcurly.xml
+++ b/items/hairsprite/item10_Shortandcurly.xml
diff --git a/items/hairsprite/item-11_Pigtails.xml b/items/hairsprite/item11_Pigtails.xml
index 1531aef5..1531aef5 100644
--- a/items/hairsprite/item-11_Pigtails.xml
+++ b/items/hairsprite/item11_Pigtails.xml
diff --git a/items/hairsprite/item-12_Longandcurly.xml b/items/hairsprite/item12_Longandcurly.xml
index 4757ae72..4757ae72 100644
--- a/items/hairsprite/item-12_Longandcurly.xml
+++ b/items/hairsprite/item12_Longandcurly.xml
diff --git a/items/hairsprite/item-13_Parted.xml b/items/hairsprite/item13_Parted.xml
index 67d0e80b..67d0e80b 100644
--- a/items/hairsprite/item-13_Parted.xml
+++ b/items/hairsprite/item13_Parted.xml
diff --git a/items/hairsprite/item-14_Perkyponytail.xml b/items/hairsprite/item14_Perkyponytail.xml
index 206d5c2e..206d5c2e 100644
--- a/items/hairsprite/item-14_Perkyponytail.xml
+++ b/items/hairsprite/item14_Perkyponytail.xml
diff --git a/items/hairsprite/item-15_Wave.xml b/items/hairsprite/item15_Wave.xml
index eda358ef..eda358ef 100644
--- a/items/hairsprite/item-15_Wave.xml
+++ b/items/hairsprite/item15_Wave.xml
diff --git a/items/hairsprite/item-16_Mane.xml b/items/hairsprite/item16_Mane.xml
index 4f4372f8..4f4372f8 100644
--- a/items/hairsprite/item-16_Mane.xml
+++ b/items/hairsprite/item16_Mane.xml
diff --git a/items/hairsprite/item-17_Bun.xml b/items/hairsprite/item17_Bun.xml
index 8338c08b..8338c08b 100644
--- a/items/hairsprite/item-17_Bun.xml
+++ b/items/hairsprite/item17_Bun.xml
diff --git a/items/hairsprite/item-18_Shoulderlengthflick.xml b/items/hairsprite/item18_Shoulderlengthflick.xml
index 6f6b49f4..6f6b49f4 100644
--- a/items/hairsprite/item-18_Shoulderlengthflick.xml
+++ b/items/hairsprite/item18_Shoulderlengthflick.xml
diff --git a/items/hairsprite/item-19_Fizzy.xml b/items/hairsprite/item19_Fizzy.xml
index 028c69d2..028c69d2 100644
--- a/items/hairsprite/item-19_Fizzy.xml
+++ b/items/hairsprite/item19_Fizzy.xml
diff --git a/items/hairsprite/item-20_LongandClipped.xml b/items/hairsprite/item20_LongandClipped.xml
index 52336b91..52336b91 100644
--- a/items/hairsprite/item-20_LongandClipped.xml
+++ b/items/hairsprite/item20_LongandClipped.xml
diff --git a/items/misc/_include.xml b/items/misc/_include.xml
index dec94feb..ab2c12b0 100644
--- a/items/misc/_include.xml
+++ b/items/misc/_include.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/misc/item30_.xml"/>
-  <include name="items/misc/item31_.xml"/>
-  <include name="items/misc/item32_.xml"/>
-  <include name="items/misc/item33_.xml"/>
-  <include name="items/misc/item34_.xml"/>
-  <include name="items/misc/item35_.xml"/>
+  <include name="items/misc/item0030_.xml"/>
+  <include name="items/misc/item0031_.xml"/>
+  <include name="items/misc/item0032_.xml"/>
+  <include name="items/misc/item0033_.xml"/>
+  <include name="items/misc/item0034_.xml"/>
+  <include name="items/misc/item0035_.xml"/>
   <include name="items/misc/item1700_magicblade.xml"/>
   <include name="items/misc/item1701_toxicdart.xml"/>
   <include name="items/misc/item1703_wand.xml"/>
diff --git a/items/misc/item30_.xml b/items/misc/item0030_.xml
index 6381a483..6381a483 100644
--- a/items/misc/item30_.xml
+++ b/items/misc/item0030_.xml
diff --git a/items/misc/item31_.xml b/items/misc/item0031_.xml
index 700b7eb8..700b7eb8 100644
--- a/items/misc/item31_.xml
+++ b/items/misc/item0031_.xml
diff --git a/items/misc/item32_.xml b/items/misc/item0032_.xml
index c7468cd6..c7468cd6 100644
--- a/items/misc/item32_.xml
+++ b/items/misc/item0032_.xml
diff --git a/items/misc/item33_.xml b/items/misc/item0033_.xml
index cb0c5d49..cb0c5d49 100644
--- a/items/misc/item33_.xml
+++ b/items/misc/item0033_.xml
diff --git a/items/misc/item34_.xml b/items/misc/item0034_.xml
index cf4175c8..cf4175c8 100644
--- a/items/misc/item34_.xml
+++ b/items/misc/item0034_.xml
diff --git a/items/misc/item35_.xml b/items/misc/item0035_.xml
index d7c8974f..d7c8974f 100644
--- a/items/misc/item35_.xml
+++ b/items/misc/item0035_.xml
diff --git a/items/racesprite/_include.xml b/items/racesprite/_include.xml
index 20941000..3f31be1c 100644
--- a/items/racesprite/_include.xml
+++ b/items/racesprite/_include.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <items>
-  <include name="items/racesprite/item-100_Deprecated.xml"/>
-  <include name="items/racesprite/item-101_Talpan.xml"/>
-  <include name="items/racesprite/item-102_Tritan.xml"/>
-  <include name="items/racesprite/item-103_Ifriton.xml"/>
-  <include name="items/racesprite/item-104_Gispaan.xml"/>
-  <include name="items/racesprite/item-105_Sparron.xml"/>
-  <include name="items/racesprite/item-106_Undead.xml"/>
-  <include name="items/racesprite/item-99054_Troll.xml"/>
+  <include name="items/racesprite/item00100_Deprecated.xml"/>
+  <include name="items/racesprite/item00101_Talpan.xml"/>
+  <include name="items/racesprite/item00102_Tritan.xml"/>
+  <include name="items/racesprite/item00103_Ifriton.xml"/>
+  <include name="items/racesprite/item00104_Gispaan.xml"/>
+  <include name="items/racesprite/item00105_Sparron.xml"/>
+  <include name="items/racesprite/item00106_Undead.xml"/>
+  <include name="items/racesprite/item99054_Troll.xml"/>
 </items>
diff --git a/items/racesprite/item-100_Deprecated.xml b/items/racesprite/item00100_Deprecated.xml
index 93e29c89..93e29c89 100644
--- a/items/racesprite/item-100_Deprecated.xml
+++ b/items/racesprite/item00100_Deprecated.xml
diff --git a/items/racesprite/item-101_Talpan.xml b/items/racesprite/item00101_Talpan.xml
index b4da8442..b4da8442 100644
--- a/items/racesprite/item-101_Talpan.xml
+++ b/items/racesprite/item00101_Talpan.xml
diff --git a/items/racesprite/item-102_Tritan.xml b/items/racesprite/item00102_Tritan.xml
index 04420f04..04420f04 100644
--- a/items/racesprite/item-102_Tritan.xml
+++ b/items/racesprite/item00102_Tritan.xml
diff --git a/items/racesprite/item-103_Ifriton.xml b/items/racesprite/item00103_Ifriton.xml
index eb3021f0..eb3021f0 100644
--- a/items/racesprite/item-103_Ifriton.xml
+++ b/items/racesprite/item00103_Ifriton.xml
diff --git a/items/racesprite/item-104_Gispaan.xml b/items/racesprite/item00104_Gispaan.xml
index dad348e9..dad348e9 100644
--- a/items/racesprite/item-104_Gispaan.xml
+++ b/items/racesprite/item00104_Gispaan.xml
diff --git a/items/racesprite/item-105_Sparron.xml b/items/racesprite/item00105_Sparron.xml
index 033dd99f..033dd99f 100644
--- a/items/racesprite/item-105_Sparron.xml
+++ b/items/racesprite/item00105_Sparron.xml
diff --git a/items/racesprite/item-106_Undead.xml b/items/racesprite/item00106_Undead.xml
index 34dcf023..34dcf023 100644
--- a/items/racesprite/item-106_Undead.xml
+++ b/items/racesprite/item00106_Undead.xml
diff --git a/items/racesprite/item-99054_Troll.xml b/items/racesprite/item99054_Troll.xml
index 767539d7..767539d7 100644
--- a/items/racesprite/item-99054_Troll.xml
+++ b/items/racesprite/item99054_Troll.xml
diff --git a/items/usable/_include.xml b/items/usable/_include.xml
index 948e0b82..51f0fab2 100644
--- a/items/usable/_include.xml
+++ b/items/usable/_include.xml
@@ -91,6 +91,11 @@
   <include name="items/usable/item3010_CandyPumpkin.xml"/>
   <include name="items/usable/item4035_PickledBeets.xml"/>
   <include name="items/usable/item4036_RoastedAcorn.xml"/>
+  <include name="items/usable/item5141_AlizarinScroll.xml"/>
+  <include name="items/usable/item5142_CobaltScroll.xml"/>
+  <include name="items/usable/item5143_GambogeScroll.xml"/>
+  <include name="items/usable/item5144_MauveScroll.xml"/>
+  <include name="items/usable/item5145_JoyplimScroll.xml"/>
   <include name="items/usable/item5210_GrassFedTofu.xml"/>
   <include name="items/usable/item5213_VeganWater.xml"/>
   <include name="items/usable/item5214_LactoseFreeAcorn.xml"/>
@@ -99,6 +104,7 @@
   <include name="items/usable/item5237_CaramelCandy.xml"/>
   <include name="items/usable/item5251_Tomato.xml"/>
   <include name="items/usable/item5263_LovePotion.xml"/>
+  <include name="items/usable/item5294_CrazyRum.xml"/>
   <include name="items/usable/item5309_ManaDust.xml"/>
   <include name="items/usable/item5310_EnlighteningElixir.xml"/>
 </items>
diff --git a/items/usable/item501_CactusDrink.xml b/items/usable/item0501_CactusDrink.xml
index 55434d23..55434d23 100644
--- a/items/usable/item501_CactusDrink.xml
+++ b/items/usable/item0501_CactusDrink.xml
diff --git a/items/usable/item502_CactusPotion.xml b/items/usable/item0502_CactusPotion.xml
index 15a9a80b..15a9a80b 100644
--- a/items/usable/item502_CactusPotion.xml
+++ b/items/usable/item0502_CactusPotion.xml
diff --git a/items/usable/item506_CandyCane.xml b/items/usable/item0506_CandyCane.xml
index 59630f5b..59630f5b 100644
--- a/items/usable/item506_CandyCane.xml
+++ b/items/usable/item0506_CandyCane.xml
diff --git a/items/usable/item508_XmasCake.xml b/items/usable/item0508_XmasCake.xml
index fa4df290..fa4df290 100644
--- a/items/usable/item508_XmasCake.xml
+++ b/items/usable/item0508_XmasCake.xml
diff --git a/items/usable/item509_ChocolateBar.xml b/items/usable/item0509_ChocolateBar.xml
index 75783fbe..75783fbe 100644
--- a/items/usable/item509_ChocolateBar.xml
+++ b/items/usable/item0509_ChocolateBar.xml
diff --git a/items/usable/item510_Candy.xml b/items/usable/item0510_Candy.xml
index 76733b5c..76733b5c 100644
--- a/items/usable/item510_Candy.xml
+++ b/items/usable/item0510_Candy.xml
diff --git a/items/usable/item512_GingerBreadMan.xml b/items/usable/item0512_GingerBreadMan.xml
index 3543c887..3543c887 100644
--- a/items/usable/item512_GingerBreadMan.xml
+++ b/items/usable/item0512_GingerBreadMan.xml
diff --git a/items/usable/item513_Cake.xml b/items/usable/item0513_Cake.xml
index 232e886b..232e886b 100644
--- a/items/usable/item513_Cake.xml
+++ b/items/usable/item0513_Cake.xml
diff --git a/items/usable/item514_XmasCandyCane.xml b/items/usable/item0514_XmasCandyCane.xml
index 9205c1c3..9205c1c3 100644
--- a/items/usable/item514_XmasCandyCane.xml
+++ b/items/usable/item0514_XmasCandyCane.xml
diff --git a/items/usable/item519_CherryCake.xml b/items/usable/item0519_CherryCake.xml
index be25756e..be25756e 100644
--- a/items/usable/item519_CherryCake.xml
+++ b/items/usable/item0519_CherryCake.xml
diff --git a/items/usable/item520_EasterEgg.xml b/items/usable/item0520_EasterEgg.xml
index bb0d587a..bb0d587a 100644
--- a/items/usable/item520_EasterEgg.xml
+++ b/items/usable/item0520_EasterEgg.xml
diff --git a/items/usable/item527_Milk.xml b/items/usable/item0527_Milk.xml
index d03bd902..d03bd902 100644
--- a/items/usable/item527_Milk.xml
+++ b/items/usable/item0527_Milk.xml
diff --git a/items/usable/item533_RoastedMaggot.xml b/items/usable/item0533_RoastedMaggot.xml
index eda60e57..eda60e57 100644
--- a/items/usable/item533_RoastedMaggot.xml
+++ b/items/usable/item0533_RoastedMaggot.xml
diff --git a/items/usable/item534_OrangeCupcake.xml b/items/usable/item0534_OrangeCupcake.xml
index 535a9723..535a9723 100644
--- a/items/usable/item534_OrangeCupcake.xml
+++ b/items/usable/item0534_OrangeCupcake.xml
diff --git a/items/usable/item535_RedApple.xml b/items/usable/item0535_RedApple.xml
index 614b86e9..614b86e9 100644
--- a/items/usable/item535_RedApple.xml
+++ b/items/usable/item0535_RedApple.xml
diff --git a/items/usable/item539_Beer.xml b/items/usable/item0539_Beer.xml
index 7ad93abe..7ad93abe 100644
--- a/items/usable/item539_Beer.xml
+++ b/items/usable/item0539_Beer.xml
diff --git a/items/usable/item541_BottleofWater.xml b/items/usable/item0541_BottleofWater.xml
index f866fec7..f866fec7 100644
--- a/items/usable/item541_BottleofWater.xml
+++ b/items/usable/item0541_BottleofWater.xml
diff --git a/items/usable/item562_ChickenLeg.xml b/items/usable/item0562_ChickenLeg.xml
index 710e4b24..710e4b24 100644
--- a/items/usable/item562_ChickenLeg.xml
+++ b/items/usable/item0562_ChickenLeg.xml
diff --git a/items/usable/item565_PinkPetal.xml b/items/usable/item0565_PinkPetal.xml
index 43726747..43726747 100644
--- a/items/usable/item565_PinkPetal.xml
+++ b/items/usable/item0565_PinkPetal.xml
diff --git a/items/usable/item566_SmallMushroom.xml b/items/usable/item0566_SmallMushroom.xml
index c076bc85..c076bc85 100644
--- a/items/usable/item566_SmallMushroom.xml
+++ b/items/usable/item0566_SmallMushroom.xml
diff --git a/items/usable/item567_IronPotion.xml b/items/usable/item0567_IronPotion.xml
index f69adeb8..f69adeb8 100644
--- a/items/usable/item567_IronPotion.xml
+++ b/items/usable/item0567_IronPotion.xml
diff --git a/items/usable/item568_ConcentrationPotion.xml b/items/usable/item0568_ConcentrationPotion.xml
index 6c01dddc..6c01dddc 100644
--- a/items/usable/item568_ConcentrationPotion.xml
+++ b/items/usable/item0568_ConcentrationPotion.xml
diff --git a/items/usable/item657_Orange.xml b/items/usable/item0657_Orange.xml
index 4f9d0b0e..4f9d0b0e 100644
--- a/items/usable/item657_Orange.xml
+++ b/items/usable/item0657_Orange.xml
diff --git a/items/usable/item676_Steak.xml b/items/usable/item0676_Steak.xml
index cd04e682..cd04e682 100644
--- a/items/usable/item676_Steak.xml
+++ b/items/usable/item0676_Steak.xml
diff --git a/items/usable/item684_TinyHealingPotion.xml b/items/usable/item0684_TinyHealingPotion.xml
index ddf9db5a..ddf9db5a 100644
--- a/items/usable/item684_TinyHealingPotion.xml
+++ b/items/usable/item0684_TinyHealingPotion.xml
diff --git a/items/usable/item685_SmallHealingPotion.xml b/items/usable/item0685_SmallHealingPotion.xml
index 518446ed..518446ed 100644
--- a/items/usable/item685_SmallHealingPotion.xml
+++ b/items/usable/item0685_SmallHealingPotion.xml
diff --git a/items/usable/item686_MediumHealingPotion.xml b/items/usable/item0686_MediumHealingPotion.xml
index 18616bc1..18616bc1 100644
--- a/items/usable/item686_MediumHealingPotion.xml
+++ b/items/usable/item0686_MediumHealingPotion.xml
diff --git a/items/usable/item687_LargeHealingPotion.xml b/items/usable/item0687_LargeHealingPotion.xml
index ea9b71c9..ea9b71c9 100644
--- a/items/usable/item687_LargeHealingPotion.xml
+++ b/items/usable/item0687_LargeHealingPotion.xml
diff --git a/items/usable/item705_ManaPotion.xml b/items/usable/item0705_ManaPotion.xml
index 61ac78c2..61ac78c2 100644
--- a/items/usable/item705_ManaPotion.xml
+++ b/items/usable/item0705_ManaPotion.xml
diff --git a/items/usable/item714_SnakeEgg.xml b/items/usable/item0714_SnakeEgg.xml
index 077fd8fb..077fd8fb 100644
--- a/items/usable/item714_SnakeEgg.xml
+++ b/items/usable/item0714_SnakeEgg.xml
diff --git a/items/usable/item715_MountainSnakeEgg.xml b/items/usable/item0715_MountainSnakeEgg.xml
index 899d02f2..899d02f2 100644
--- a/items/usable/item715_MountainSnakeEgg.xml
+++ b/items/usable/item0715_MountainSnakeEgg.xml
diff --git a/items/usable/item716_GrassSnakeEgg.xml b/items/usable/item0716_GrassSnakeEgg.xml
index 913e5aa2..913e5aa2 100644
--- a/items/usable/item716_GrassSnakeEgg.xml
+++ b/items/usable/item0716_GrassSnakeEgg.xml
diff --git a/items/usable/item717_CaveSnakeEgg.xml b/items/usable/item0717_CaveSnakeEgg.xml
index e9863c7d..e9863c7d 100644
--- a/items/usable/item717_CaveSnakeEgg.xml
+++ b/items/usable/item0717_CaveSnakeEgg.xml
diff --git a/items/usable/item719_GreenApple.xml b/items/usable/item0719_GreenApple.xml
index f59c2aff..f59c2aff 100644
--- a/items/usable/item719_GreenApple.xml
+++ b/items/usable/item0719_GreenApple.xml
diff --git a/items/usable/item733_PurificationPotion.xml b/items/usable/item0733_PurificationPotion.xml
index d7389ea4..d7389ea4 100644
--- a/items/usable/item733_PurificationPotion.xml
+++ b/items/usable/item0733_PurificationPotion.xml
diff --git a/items/usable/item736_WhiteCake.xml b/items/usable/item0736_WhiteCake.xml
index a3c56da7..a3c56da7 100644
--- a/items/usable/item736_WhiteCake.xml
+++ b/items/usable/item0736_WhiteCake.xml
diff --git a/items/usable/item737_ChocolateCake.xml b/items/usable/item0737_ChocolateCake.xml
index db3a6f5e..db3a6f5e 100644
--- a/items/usable/item737_ChocolateCake.xml
+++ b/items/usable/item0737_ChocolateCake.xml
diff --git a/items/usable/item738_OrangeCake.xml b/items/usable/item0738_OrangeCake.xml
index a9b65a80..a9b65a80 100644
--- a/items/usable/item738_OrangeCake.xml
+++ b/items/usable/item0738_OrangeCake.xml
diff --git a/items/usable/item739_AppleCake.xml b/items/usable/item0739_AppleCake.xml
index 8a6b863d..8a6b863d 100644
--- a/items/usable/item739_AppleCake.xml
+++ b/items/usable/item0739_AppleCake.xml
diff --git a/items/usable/item743_Acorn.xml b/items/usable/item0743_Acorn.xml
index 8dde0cf7..8dde0cf7 100644
--- a/items/usable/item743_Acorn.xml
+++ b/items/usable/item0743_Acorn.xml
diff --git a/items/usable/item744_DilutedConcentrationPotion.xml b/items/usable/item0744_DilutedConcentrationPotion.xml
index 3f7d6655..3f7d6655 100644
--- a/items/usable/item744_DilutedConcentrationPotion.xml
+++ b/items/usable/item0744_DilutedConcentrationPotion.xml
diff --git a/items/usable/item745_DarkConcentrationPotion.xml b/items/usable/item0745_DarkConcentrationPotion.xml
index fa268299..fa268299 100644
--- a/items/usable/item745_DarkConcentrationPotion.xml
+++ b/items/usable/item0745_DarkConcentrationPotion.xml
diff --git a/items/usable/item746_MopoxCurePotion.xml b/items/usable/item0746_MopoxCurePotion.xml
index 84cfe138..84cfe138 100644
--- a/items/usable/item746_MopoxCurePotion.xml
+++ b/items/usable/item0746_MopoxCurePotion.xml
diff --git a/items/usable/item747_LacedChocolateCake.xml b/items/usable/item0747_LacedChocolateCake.xml
index ce8e71d9..ce8e71d9 100644
--- a/items/usable/item747_LacedChocolateCake.xml
+++ b/items/usable/item0747_LacedChocolateCake.xml
diff --git a/items/usable/item748_LacedOrangeCupcake.xml b/items/usable/item0748_LacedOrangeCupcake.xml
index 10b79550..10b79550 100644
--- a/items/usable/item748_LacedOrangeCupcake.xml
+++ b/items/usable/item0748_LacedOrangeCupcake.xml
diff --git a/items/usable/item750_SlowPoisonPotion.xml b/items/usable/item0750_SlowPoisonPotion.xml
index 8d7fa481..8d7fa481 100644
--- a/items/usable/item750_SlowPoisonPotion.xml
+++ b/items/usable/item0750_SlowPoisonPotion.xml
diff --git a/items/usable/item784_ZombieNachos.xml b/items/usable/item0784_ZombieNachos.xml
index a8972c05..a8972c05 100644
--- a/items/usable/item784_ZombieNachos.xml
+++ b/items/usable/item0784_ZombieNachos.xml
diff --git a/items/usable/item785_LadyFingers.xml b/items/usable/item0785_LadyFingers.xml
index aadaf20a..aadaf20a 100644
--- a/items/usable/item785_LadyFingers.xml
+++ b/items/usable/item0785_LadyFingers.xml
diff --git a/items/usable/item786_SlimeJellAhh.xml b/items/usable/item0786_SlimeJellAhh.xml
index fdb6e488..fdb6e488 100644
--- a/items/usable/item786_SlimeJellAhh.xml
+++ b/items/usable/item0786_SlimeJellAhh.xml
diff --git a/items/usable/item787_Snapple.xml b/items/usable/item0787_Snapple.xml
index b4aa80a8..b4aa80a8 100644
--- a/items/usable/item787_Snapple.xml
+++ b/items/usable/item0787_Snapple.xml
diff --git a/items/usable/item788_BeetleJuice.xml b/items/usable/item0788_BeetleJuice.xml
index b1173229..b1173229 100644
--- a/items/usable/item788_BeetleJuice.xml
+++ b/items/usable/item0788_BeetleJuice.xml
diff --git a/items/usable/item789_GutBusterAle.xml b/items/usable/item0789_GutBusterAle.xml
index 759e4f99..759e4f99 100644
--- a/items/usable/item789_GutBusterAle.xml
+++ b/items/usable/item0789_GutBusterAle.xml
diff --git a/items/usable/item790_BloodWine.xml b/items/usable/item0790_BloodWine.xml
index ddc107f2..ddc107f2 100644
--- a/items/usable/item790_BloodWine.xml
+++ b/items/usable/item0790_BloodWine.xml
diff --git a/items/usable/item808_HitchhikersTowel.xml b/items/usable/item0808_HitchhikersTowel.xml
index abbf794e..abbf794e 100644
--- a/items/usable/item808_HitchhikersTowel.xml
+++ b/items/usable/item0808_HitchhikersTowel.xml
diff --git a/items/usable/item809_WhiteHitchhikersTowel.xml b/items/usable/item0809_WhiteHitchhikersTowel.xml
index d0f5889e..d0f5889e 100644
--- a/items/usable/item809_WhiteHitchhikersTowel.xml
+++ b/items/usable/item0809_WhiteHitchhikersTowel.xml
diff --git a/items/usable/item810_RedHitchhikersTowel.xml b/items/usable/item0810_RedHitchhikersTowel.xml
index bbef7a84..bbef7a84 100644
--- a/items/usable/item810_RedHitchhikersTowel.xml
+++ b/items/usable/item0810_RedHitchhikersTowel.xml
diff --git a/items/usable/item811_GreenHitchhikersTowel.xml b/items/usable/item0811_GreenHitchhikersTowel.xml
index c34193b0..c34193b0 100644
--- a/items/usable/item811_GreenHitchhikersTowel.xml
+++ b/items/usable/item0811_GreenHitchhikersTowel.xml
diff --git a/items/usable/item812_BlueHitchhikersTowel.xml b/items/usable/item0812_BlueHitchhikersTowel.xml
index f5f3f72b..f5f3f72b 100644
--- a/items/usable/item812_BlueHitchhikersTowel.xml
+++ b/items/usable/item0812_BlueHitchhikersTowel.xml
diff --git a/items/usable/item813_YellowHitchhikersTowel.xml b/items/usable/item0813_YellowHitchhikersTowel.xml
index 7905f785..7905f785 100644
--- a/items/usable/item813_YellowHitchhikersTowel.xml
+++ b/items/usable/item0813_YellowHitchhikersTowel.xml
diff --git a/items/usable/item814_PurpleHitchhikersTowel.xml b/items/usable/item0814_PurpleHitchhikersTowel.xml
index a51b60d2..a51b60d2 100644
--- a/items/usable/item814_PurpleHitchhikersTowel.xml
+++ b/items/usable/item0814_PurpleHitchhikersTowel.xml
diff --git a/items/usable/item815_OrangeHitchhikersTowel.xml b/items/usable/item0815_OrangeHitchhikersTowel.xml
index b9d409ab..b9d409ab 100644
--- a/items/usable/item815_OrangeHitchhikersTowel.xml
+++ b/items/usable/item0815_OrangeHitchhikersTowel.xml
diff --git a/items/usable/item816_PinkHitchhikersTowel.xml b/items/usable/item0816_PinkHitchhikersTowel.xml
index 6dfcbc88..6dfcbc88 100644
--- a/items/usable/item816_PinkHitchhikersTowel.xml
+++ b/items/usable/item0816_PinkHitchhikersTowel.xml
diff --git a/items/usable/item817_TealHitchhikersTowel.xml b/items/usable/item0817_TealHitchhikersTowel.xml
index 0ee888fd..0ee888fd 100644
--- a/items/usable/item817_TealHitchhikersTowel.xml
+++ b/items/usable/item0817_TealHitchhikersTowel.xml
diff --git a/items/usable/item818_LimeHitchhikersTowel.xml b/items/usable/item0818_LimeHitchhikersTowel.xml
index f87cfe09..f87cfe09 100644
--- a/items/usable/item818_LimeHitchhikersTowel.xml
+++ b/items/usable/item0818_LimeHitchhikersTowel.xml
diff --git a/items/usable/item825_TinyManaElixir.xml b/items/usable/item0825_TinyManaElixir.xml
index d3ac7c74..d3ac7c74 100644
--- a/items/usable/item825_TinyManaElixir.xml
+++ b/items/usable/item0825_TinyManaElixir.xml
diff --git a/items/usable/item826_SmallManaElixir.xml b/items/usable/item0826_SmallManaElixir.xml
index afa52468..afa52468 100644
--- a/items/usable/item826_SmallManaElixir.xml
+++ b/items/usable/item0826_SmallManaElixir.xml
diff --git a/items/usable/item827_MediumManaElixir.xml b/items/usable/item0827_MediumManaElixir.xml
index e9b19966..e9b19966 100644
--- a/items/usable/item827_MediumManaElixir.xml
+++ b/items/usable/item0827_MediumManaElixir.xml
diff --git a/items/usable/item828_LargeManaElixir.xml b/items/usable/item0828_LargeManaElixir.xml
index 6be2c255..6be2c255 100644
--- a/items/usable/item828_LargeManaElixir.xml
+++ b/items/usable/item0828_LargeManaElixir.xml
diff --git a/items/usable/item838_CranberryLollipop.xml b/items/usable/item0838_CranberryLollipop.xml
index d490166e..d490166e 100644
--- a/items/usable/item838_CranberryLollipop.xml
+++ b/items/usable/item0838_CranberryLollipop.xml
diff --git a/items/usable/item839_GrapeLollipop.xml b/items/usable/item0839_GrapeLollipop.xml
index ef63ae27..ef63ae27 100644
--- a/items/usable/item839_GrapeLollipop.xml
+++ b/items/usable/item0839_GrapeLollipop.xml
diff --git a/items/usable/item840_OrangeLollipop.xml b/items/usable/item0840_OrangeLollipop.xml
index cae2688f..cae2688f 100644
--- a/items/usable/item840_OrangeLollipop.xml
+++ b/items/usable/item0840_OrangeLollipop.xml
diff --git a/items/usable/item5141_AlizarinScroll.xml b/items/usable/item5141_AlizarinScroll.xml
new file mode 100644
index 00000000..6336ce0e
--- /dev/null
+++ b/items/usable/item5141_AlizarinScroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5141"
+	image="use/scrolls/scroll-alizarin.png"
+	name="Alizarin Scroll"
+	description="Scroll with natural power; summons a plant if read."
+	effect="Summons Alizarin Plant"
+	type="usable"
+	weight="2"
+	tag="Scrolls"
+    />
+</items>
diff --git a/items/usable/item5142_CobaltScroll.xml b/items/usable/item5142_CobaltScroll.xml
new file mode 100644
index 00000000..00db9044
--- /dev/null
+++ b/items/usable/item5142_CobaltScroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5142"
+	image="use/scrolls/scroll-cobalt.png"
+	name="Cobalt Scroll"
+	description="Scroll with natural power; summons a plant if read."
+	effect="Summons Cobalt Plant"
+	type="usable"
+	weight="2"
+	tag="Scrolls"
+    />
+</items>
diff --git a/items/usable/item5143_GambogeScroll.xml b/items/usable/item5143_GambogeScroll.xml
new file mode 100644
index 00000000..57274572
--- /dev/null
+++ b/items/usable/item5143_GambogeScroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5143"
+	image="use/scrolls/scroll-gamboge.png"
+	name="Gamboge Scroll"
+	description="Scroll with natural power; summons a plant if read."
+	effect="Summons Gamboge Plant"
+	type="usable"
+	weight="2"
+	tag="Scrolls"
+    />
+</items>
diff --git a/items/usable/item5144_MauveScroll.xml b/items/usable/item5144_MauveScroll.xml
new file mode 100644
index 00000000..6fa1edfc
--- /dev/null
+++ b/items/usable/item5144_MauveScroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5144"
+	image="use/scrolls/scroll-mauve.png"
+	name="Mauve Scroll"
+	description="Scroll with natural power; summons a plant if read."
+	effect="Summons Mauve Plant"
+	type="usable"
+	weight="2"
+	tag="Scrolls"
+    />
+</items>
diff --git a/items/usable/item5145_JoyplimScroll.xml b/items/usable/item5145_JoyplimScroll.xml
new file mode 100644
index 00000000..73952f8b
--- /dev/null
+++ b/items/usable/item5145_JoyplimScroll.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<items>
+    <item id="5145"
+	image="use/scrolls/scroll-joy.png"
+	name="Joyplim Scroll"
+	description="A very funny scroll. Read it, and be amused!"
+	effect="Forces some Emote on players"
+	type="usable"
+	weight="2"
+	tag="Scrolls"
+    />
+</items>
diff --git a/items/usable/item5294_CrazyRum.xml b/items/usable/item5294_CrazyRum.xml
new file mode 100644
index 00000000..14445f7b
--- /dev/null
+++ b/items/usable/item5294_CrazyRum.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<items>
+  <item id="5294"
+	image="use/food/rum.png"
+	name="Crazy Rum"
+	description="Hohoho and a bottle of rum!"
+	effect="Hangover"
+	type="usable"
+	weight="2"
+  />
+</items>