Merge branch 'master' into 'master'

Huge reorganization of item icon

See merge request TMW2/clientdata!24

1 files changed, 195 insertions, 195 deletions

diff --git a/items.xml b/items.xml
index 6e568669..4cf3cf91 100644
--- a/items.xml
+++ b/items.xml
@@ -174,7 +174,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 
 	<!-- Usable Items -->
 	<item id="501"
-		image="usable/acorn.png"
+		image="usable/food/acorn.png"
 		name="Acorn"
 		description="A natural food, ingredient, bait or seed."
 		useButton="Eat"
@@ -196,7 +196,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		</inventory>
 	</item>
 	<item id="502"
-		image="usable/bread.png"
+		image="usable/food/bread.png"
 		name="Bread"
 		description="A baked food, ingredient or bait."
 		useButton="Eat"
@@ -204,7 +204,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="25"/>
 	<item id="503"
-		image="usable/fungus.png"
+		image="usable/food/fungus.png"
 		name="Fungus"
 		description="A peculiar food, ingredient or remedy against poison."
 		useButton="Eat"
@@ -213,7 +213,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="8"
 		maxFloorOffset="9"/>
 	<item id="504"
-		image="usable/cheese.png"
+		image="usable/food/cheese.png"
 		name="Cheese"
 		description="A yummy food, ingredient or bait."
 		useButton="Eat"
@@ -221,7 +221,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="3"/>
 	<item id="505"
-		image="usable/pioulegs.png"
+		image="usable/food/pioulegs.png"
 		name="Piou Legs"
 		description="A tender food or ingredient."
 		useButton="Eat"
@@ -229,7 +229,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="4"/>
 	<item id="506"
-		image="usable/lettuceleaf.png"
+		image="usable/food/lettuceleaf.png"
 		name="Lettuce Leaf"
 		description="A healthy food, ingredient or bait."
 		useButton="Eat"
@@ -237,7 +237,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="507"
-		image="usable/piberries.png"
+		image="usable/food/piberries.png"
 		name="Piberries"
 		description="The famous staining fruit."
 		useButton="Eat"
@@ -277,7 +277,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="512"
-		image="usable/croconut-half.png"
+		image="usable/food/halfcroconut.png"
 		name="Half Croconut"
 		description="Its inside seems delicious."
 		useButton="Eat"
@@ -295,7 +295,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="80"/>
 	<!-- ID 514 is free -->
 	<item id="515"
-		image="usable/plushroom.png"
+		image="usable/food/plushroom.png"
 		name="Plushroom"
 		description="A strange remedy of many possible uses."
 		useButton="Eat"
@@ -312,7 +312,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="517"
-		image="usable/deliciouscookie.png"
+		image="usable/food/deliciouscookie.png"
 		name="Delicious Cookie"
 		description="Baked by Reid herself. People who ate it were not seen again for quite a while."
 		useButton="Eat"
@@ -340,7 +340,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="519"
-		image="usable/easteregg.png"
+		image="usable/egg/easteregg.png"
 		name="Easter Egg"
 		description="A chocolate shell covered in a very thin metal layer."
 		useButton="Eat"
@@ -348,7 +348,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="520"
-		image="usable/piberriesinfusion.png"
+		image="usable/potion/piberriesinfusion.png"
 		name="Piberries Infusion"
 		description="A potion made from piberries."
 		effect="Heal 240-440 HP"
@@ -356,7 +356,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="15"/>
 	<item id="521"
-		image="usable/fatespotion.png"
+		image="usable/potion/fatespotion.png"
 		name="Fate's Potion"
 		description="An effective blood-loss remedy."
 		effect="Heal 440-640 HP"
@@ -364,7 +364,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="17"/>
 	<item id="522"
-		image="usable/clotholiquor.png"
+		image="usable/potion/clotholiquor.png"
 		name="Clotho Liquor"
 		description="Remedy used in feral warrior training sessions."
 		effect="Heal 640-900 HP"
@@ -372,7 +372,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="16"/>
 	<item id="523"
-		image="usable/lachesisbrew.png"
+		image="usable/potion/lachesisbrew.png"
 		name="Lachesis Brew"
 		description="Rare, powerful and restricted remedy."
 		effect="Heal 900-1200 HP"
@@ -380,7 +380,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="14"/>
 	<item id="524"
-		image="usable/atroposmixture.png"
+		image="usable/potion/atroposmixture.png"
 		name="Atropos Mixture"
 		description="The most advanced potion ever synthesised."
 		effect="Heal 1200-2400 HP"
@@ -388,7 +388,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="15"/>
 	<item id="525"
-		image="usable/elixiroflife.png"
+		image="usable/potion/elixiroflife.png"
 		name="Elixir Of Life"
 		description="A potion able to restore even dead trees to life."
 		effect="Complete Healing"
@@ -397,7 +397,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		weight="20"/>
 	<item id="526"
-		image="usable/shovel.png"
+		image="usable/use/shovel.png"
 		name="Iron Shovel"
 		useButton="Use"
 		description="Discover treasures, dungeons and raw materials."
@@ -407,7 +407,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="5"/>
 	<item id="527"
-		image="usable/pumpkinjuice.png"
+		image="usable/food/pumpkinjuice.png"
 		name="Pumpkin Juice"
 		useButton="Use"
 		description="Blood-coloured juice from madly swarming pumpkin."
@@ -416,7 +416,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="5"
 		maxFloorOffset="15"/>
 	<item id="528"
-		image="usable/manana.png"
+		image="usable/food/manana.png"
 		name="Manana"
 		useButton="Use"
 		description="A fast healing fruit."
@@ -434,7 +434,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="10"
 		maxFloorOffset="6"/>
 	<item id="530"
-		image="usable/carrot.png"
+		image="usable/food/carrot.png"
 		name="Carrot"
 		description="Good in various recipes, and found with bunnies. During Easter, heals 10x more."
 		useButton="Eat"
@@ -443,7 +443,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="3"
 		maxFloorOffset="6"/>
 	<item id="531"
-		image="usable/wine.png"
+		image="usable/food/wine.png"
 		name="Red Plush Wine"
 		description="Wine produced from black grapes in the south-east of Aurora."
 		effect="Heal 50-110 HP"
@@ -452,35 +452,35 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="10"/>
 	<!-- ID 532 ~ 534 are free. -->
 	<item id="535"
-		image="usable/book-jesusalva.png"
+		image="usable/book/jesusalvagrimorium.png"
 		name="Jesusaves's Grimorium"
 		description="A grimorium said to light the path to the Secret Of Mana. The book writes itself on its own."
 		useButton="Read"
 		type="usable"
 		weight="20"/>
 	<item id="536"
-		image="usable/book-chorus.png"
+		image="usable/book/petbook.png"
 		name="Fluffy Animals who Love Their Owners"
 		description="A quick guide to introduce pet caring."
 		useButton="Read"
 		type="usable"
 		weight="20"/>
 	<item id="537"
-		image="usable/book-laws.png"
+		image="usable/book/bookoflaws.png"
 		name="The Book of Laws"
 		description="The laws respected and upheld in the World Of Mana, and enforced by the Alliance."
 		useButton="Read"
 		type="usable"
 		weight="10"/>
 	<item id="538"
-		image="usable/book-fishing.png"
+		image="usable/book/fishingguide.png"
 		name="Fishing Guide Vol. I"
 		description="A small book that covers the basics of fishing."
 		useButton="Read"
 		type="usable"
 		weight="25"/>
 	<item id="539"
-		image="usable/roastedmaggot.png"
+		image="usable/food/roastedmaggot.png"
 		name="Roasted Maggot"
 		description="Tasty crunchy snack!"
 		useButton="Eat"
@@ -488,7 +488,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="5"/>
 	<item id="540"
-		image="usable/redapple.png"
+		image="usable/food/redapple.png"
 		name="Red Apple"
 		description="A healthy apple"
 		useButton="Eat"
@@ -496,7 +496,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="5"/>
 	<item id="541"
-		image="usable/cactuspotion.png"
+		image="usable/potion/cactuspotion.png"
 		name="Cactus Potion"
 		description="A special potion for the desert places."
 		useButton="Drink"
@@ -504,7 +504,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="4"/>
 	<item id="542"
-		image="usable/apotion.png"
+		image="usable/potion/apotion.png"
 		name="Cactus Drink"
 		description="A small drink for the desert places."
 		useButton="Drink"
@@ -512,7 +512,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="4"/>
 	<item id="543"
-		image="usable/apanacake.png"
+		image="usable/food/apanacake.png"
 		name="Apana Cake"
 		description="A very tiny cake!"
 		useButton="Eat"
@@ -520,7 +520,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="544"
-		image="usable/beer.png"
+		image="usable/food/beer.png"
 		name="Beer"
 		description="A fresh beer."
 		useButton="Drink"
@@ -528,7 +528,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="545"
-		image="usable/blueberries.png"
+		image="usable/food/blueberries.png"
 		name="Blue Berries"
 		description="Near to bursting with sweet juice."
 		useButton="Drink"
@@ -536,7 +536,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="6"/>
 	<item id="546"
-		image="usable/candy.png"
+		image="usable/food/candy.png"
 		name="Candy"
 		description="A sweet for you."
 		useButton="Eat"
@@ -544,7 +544,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="547"
-		image="usable/bottleofseawater.png"
+		image="usable/potion/bottleofseawater.png"
 		name="Bottle Of Sea Water"
 		description="Very salty. Drink with caution."
 		useButton="Drink"
@@ -552,7 +552,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="300"/>
 	<item id="548"
-		image="usable/candycane.png"
+		image="usable/food/candycane.png"
 		name="Candy Cane"
 		description="Tasty candy cane."
 		useButton="Drink"
@@ -560,7 +560,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="549"
-		image="usable/cherry.png"
+		image="usable/food/cherry.png"
 		name="Cherry"
 		description="Natural treat."
 		useButton="Drink"
@@ -568,7 +568,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="5"/>
 	<item id="550"
-		image="usable/cherrycake.png"
+		image="usable/food/cherrycake.png"
 		name="Cherry Cake"
 		description="A nice cherry cake."
 		useButton="Eat"
@@ -576,7 +576,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="551"
-		image="usable/chickenleg.png"
+		image="usable/food/chickenleg.png"
 		name="Chicken Leg"
 		description="A big chunk of meat."
 		useButton="Drink"
@@ -584,7 +584,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="552"
-		image="usable/chocolatemouboo.png"
+		image="usable/food/chocolatemouboo.png"
 		name="Chocolate Mouboo"
 		description="Chocolate!"
 		useButton="Eat"
@@ -592,7 +592,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="4"/>
 	<item id="553"
-		image="usable/gingerbreadman.png"
+		image="usable/food/gingerbreadman.png"
 		name="Ginger Bread Man"
 		description="A tasty ginger bread man."
 		useButton="Eat"
@@ -600,7 +600,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="4"/>
 	<item id="554"
-		image="usable/goldenapple.png"
+		image="usable/food/goldenapple.png"
 		name="Golden Apple"
 		description="A golden apple. Taken from a tree of many fruits from a distant world."
 		useButton="Drink"
@@ -609,7 +609,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		weight="30"/>
 	<item id="555"
-		image="usable/jarofblood.png"
+		image="usable/food/jarofblood.png"
 		name="Jar Of Blood"
 		description="Disgusting jar of blood...for all your bloody needs."
 		useButton="Drink"
@@ -617,7 +617,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="375"/>
 	<item id="556"
-		image="usable/jellybeans.png"
+		image="usable/food/jellybeans.png"
 		name="Jelly Beans"
 		description="Chocolate!"
 		useButton="Drink"
@@ -625,7 +625,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="2"/>
 	<item id="557"
-		image="usable/lollipop.png"
+		image="usable/food/lollipop.png"
 		name="Lollipop"
 		description="A tasty variety of lollipops."
 		useButton="Drink"
@@ -633,7 +633,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="558"
-		image="usable/marshmallow.png"
+		image="usable/food/marshmallow.png"
 		name="Marshmallow"
 		description="Sweet drop."
 		useButton="Drink"
@@ -641,7 +641,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="559"
-		image="usable/milk.png"
+		image="usable/food/mouboomilk.png"
 		name="Milk"
 		description="A refreshing drink from the monsters of TMW."
 		useButton="Drink"
@@ -649,7 +649,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="5"/>
 	<item id="560"
-		image="usable/orange.png"
+		image="usable/food/orange.png"
 		name="Orange"
 		description="A juicy orange."
 		useButton="Drink"
@@ -657,7 +657,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="7"/>
 	<item id="561"
-		image="usable/orangecupcake.png"
+		image="usable/food/orangecupcake.png"
 		name="Orange Cupcake"
 		description="A tangy orange cupcake. Made from real oranges."
 		useButton="Eat"
@@ -665,7 +665,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="5"/>
 	<item id="562"
-		image="usable/pear.png"
+		image="usable/food/pear.png"
 		name="Pear"
 		description="A healthy pear."
 		useButton="Drink"
@@ -673,7 +673,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="7"/>
 	<item id="563"
-		image="usable/plum.png"
+		image="usable/food/plum.png"
 		name="Plum"
 		description="A Fresh healthy plum."
 		useButton="Drink"
@@ -681,7 +681,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="564"
-		image="usable/pumpkinjuice.png"
+		image="usable/food/pumpkinjuice.png"
 		name="Pumpkin Juice"
 		description="Fresh pumpkin juice."
 		useButton="Drink"
@@ -705,7 +705,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="2"/>
 	<item id="567"
-		image="usable/skullbloodymug.png"
+		image="usable/food/skullbloodymug.png"
 		name="Skull Bloody Mug"
 		description="I wouldn't drink from that."
 		useButton="Drink"
@@ -713,7 +713,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="40"/>
 	<item id="568"
-		image="usable/skullpotion.png"
+		image="usable/potion/skullpotion.png"
 		name="Skull Potion"
 		description="A bottle in the shape of a skull."
 		useButton="Drink"
@@ -721,7 +721,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="25"/>
 	<item id="569"
-		image="usable/smallmushroom.png"
+		image="usable/food/smallmushroom.png"
 		name="Small Mushroom"
 		description="A mushroom."
 		useButton="Drink"
@@ -729,7 +729,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="10"/>
 	<item id="570"
-		image="usable/steak.png"
+		image="usable/food/mouboosteak.png"
 		name="Mouboo Steak"
 		description="A tasty piece of steak."
 		useButton="Eat"
@@ -737,7 +737,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="250"/>
 	<item id="571"
-		image="usable/tonoridelight.png"
+		image="usable/food/tonoridelight.png"
 		name="Tonori Delight"
 		description="A treat exquisite."
 		useButton="Eat"
@@ -745,7 +745,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="2"/>
 	<item id="572"
-		image="usable/xmascake.png"
+		image="usable/food/xmascake.png"
 		name="Xmas Cake"
 		description="A sweet Xmas cake."
 		useButton="Drink"
@@ -753,7 +753,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="573"
-		image="usable/xmascandycane.png"
+		image="usable/food/xmascandycane.png"
 		name="Xmas Candy Cane"
 		description="A special Xmas candy cane."
 		useButton="Drink"
@@ -761,7 +761,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="1"/>
 	<item id="574"
-		image="usable/zombienachos.png"
+		image="usable/food/zombienachos.png"
 		name="Zombie Nachos"
 		description="Zombies love this dish."
 		useButton="Drink"
@@ -769,7 +769,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="5"/>
 	<item id="583"
-		image="usable/chocolatebiscuit.png"
+		image="usable/food/chocolatebiscuit.png"
 		name="Chocolate Biscuit"
 		description="A chocolate biscuit."
 		useButton="Yummy!"
@@ -777,7 +777,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="5"/>
 	<item id="584"
-		image="usable/chocolatebar.png"
+		image="usable/food/chocolatebar.png"
 		name="Chocolate Bar"
 		description="A chocolate bar."
 		useButton="Eat"
@@ -785,7 +785,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="5"/>
 	<item id="585"
-		image="usable/cavesnakeegg.png"
+		image="usable/egg/cavesnakeegg.png"
 		name="Cave Snake Egg"
 		description="For omelettes."
 		useButton="Eat"
@@ -793,7 +793,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="5"/>
 	<item id="586"
-		image="usable/cactuspotion.png"
+		image="usable/potion/cactuspotion.png"
 		name="Smoke Grenade"
 		description="Explodes and could cause splash damage... If it didn't missed every single time."
 		useButton="Explode"
@@ -809,7 +809,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="4"/>
 	<item id="588"
-		image="usable/toothbrush.png"
+		image="usable/use/toothbrush.png"
 		name="Toothbrush"
 		description="To keep that beautiful smile going."
 		type="usable"
@@ -817,7 +817,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="589"
-		image="usable/gift-bronze.png"
+		image="usable/box/bronzegift.png"
 		name="Bronze Gift"
 		description="Wow! A Gift Box! What wonders are inside?"
 		type="usable"
@@ -826,7 +826,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="590"
-		image="usable/gift-silver.png"
+		image="usable/box/silvergift.png"
 		name="Silver Gift"
 		description="Wow! A Gift Box! What wonders are inside?"
 		type="usable"
@@ -835,7 +835,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="591"
-		image="usable/gift-golden.png"
+		image="usable/box/goldengift.png"
 		name="Golden Gift"
 		description="Wow! A Gift Box! What wonders are inside?"
 		type="usable"
@@ -844,7 +844,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="592"
-		image="usable/gift-prism.png"
+		image="usable/box/prismgift.png"
 		name="Prism Gift"
 		description="Wow! A Gift Box! What wonders are inside?"
 		type="usable"
@@ -853,7 +853,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="593"
-		image="usable/gift-supreme.png"
+		image="usable/box/supremegift.png"
 		name="Supreme Gift"
 		description="Wow! A Gift Box! What wonders are inside?"
 		type="usable"
@@ -870,7 +870,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		weight="860"/>
 	<item id="595"
-		image="usable/bottleofseawater.png"
+		image="usable/potion/bottleofseawater.png"
 		name="Bottle Of Divine Water"
 		description="Very tasty water."
 		useButton="Drink"
@@ -879,7 +879,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		weight="290"/>
 	<item id="596"
-		image="usable/bottleoftonoriwater.png"
+		image="usable/potion/bottleoftonoriwater.png"
 		name="Bottle Of Tonori Water"
 		description="A basic tonori water."
 		useButton="Drink"
@@ -887,7 +887,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="300"/>
 	<item id="597"
-		image="usable/chocolatebunny.png"
+		image="usable/food/chocolatebunny.png"
 		name="Chocolate Bunny"
 		description="A delicious chocolate bunny"
 		useButton="Eat"
@@ -895,7 +895,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="350"/>
 	<item id="598"
-		image="usable/goldenapple.png"
+		image="usable/food/goldenapple.png"
 		name="Divine Apple"
 		description="A Divine Apple"
 		useButton="Eat"
@@ -904,7 +904,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		weight="1"/>
 	<item id="599"
-		image="usable/snakeeggmodel.png|W:#c0c0a0;R:#b09070;G:#b8a888"
+		image="usable/egg/snakeeggmodel.png|W:#c0c0a0;R:#b09070;G:#b8a888"
 		name="Snake Egg"
 		description="An edible snake egg"
 		useButton="Eat"
@@ -912,7 +912,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="8"/>
 	<item id="600"
-		image="usable/snakeeggmodel.png|W:#806020;R:#604010;G:#705018"
+		image="usable/egg/snakeeggmodel.png|W:#806020;R:#604010;G:#705018"
 		name="Mountain Snake Egg"
 		description="An edible mountain snake egg."
 		useButton="Eat"
@@ -920,7 +920,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="9"/>
 	<item id="601"
-		image="usable/chagashroom.png"
+		image="usable/food/chagashroom.png"
 		name="Chagashroom"
 		description="A strange remedy of many possible uses."
 		useButton="Eat"
@@ -936,7 +936,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="12"/>
 	<item id="603"
-		image="usable/bpotion.png|G:#da69e5,ffdaff"
+		image="usable/potion/bpotion.png|G:#da69e5,ffdaff"
 		name="Haste Potion"
 		description="Formely known as Concentration Potion, this is made of plushrooms."
 		useButton="Drink"
@@ -944,7 +944,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="12"/>
 	<item id="604"
-		image="usable/bpotion.png|G:#c05000,f0a000,f0f09f"
+		image="usable/potion/bpotion.png|G:#c05000,f0a000,f0f09f"
 		name="Strength Potion"
 		description="Formely known as Iron Potion, this is made of chagashrooms."
 		useButton="Drink"
@@ -952,7 +952,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="12"/>
 	<item id="605"
-		image="usable/bottleofsewerwater.png"
+		image="usable/potion/bottleofsewerwater.png"
 		name="Bottle Of Sewer Water"
 		description="Want to be sick?"
 		useButton="Drink"
@@ -961,7 +961,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="350"/>
 	<!-- Saulc FIXXX -->
 	<item id="606"
-		image="usable/book-fishing.png" 
+		image="usable/book/fishingguide.png" 
 		name="Pirate Treasure Map"
 		description="It's time to become rich!"
 		useButton="Blame Saulc"
@@ -978,7 +978,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="25"/>
 	<!-- /FIXME Saulc -->
 	<item id="608"
-		image="usable/juice.png|G:#009900"
+		image="usable/food/juice.png|G:#009900"
 		name="Celestia's Tea"
 		description="A lovely tea from a lovely person. It's dead cold."
 		useButton="Drink"
@@ -1010,7 +1010,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="14"/>
 	<item id="612"
-		image="generic/clothespack.png"
+		image="generic/box/clothespack.png"
 		name="Friend Gift"
 		description="Sent by your friend. Can be open at level 5."
 		type="usable"
@@ -1019,7 +1019,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="613"
-		image="usable/snakeeggmodel.png|W:#373737;R:#901010;G:#1a1a1a"
+		image="usable/egg/snakeeggmodel.png|W:#373737;R:#901010;G:#1a1a1a"
 		name="Black Mamba Egg"
 		description="An edible black mamba egg."
 		useButton="Eat"
@@ -1027,7 +1027,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="4"/>
 	<item id="614"
-		image="usable/timeflask.png"
+		image="usable/use/timeflask.png"
 		name="Time Flask"
 		description="Contains Ozthokk's time-space technology."
 		useButton="Teleport"
@@ -1035,7 +1035,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="40"/>
 	<item id="615"
-		image="usable/bpotion.png|G:#ff4aff"
+		image="usable/potion/bpotion.png|G:#ff4aff"
 		name="Herbal Tea"
 		description="Dangerous stuff, do not drink. You have been warned."
 		useButton="Drink"
@@ -1043,7 +1043,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="12"/>
 	<item id="616"
-		image="usable/bottleoftonoriwater.png"
+		image="usable/potion/bottleoftonoriwater.png"
 		name="Bottle Of Woodland Water"
 		description="A basic woodland water."
 		useButton="Drink"
@@ -1051,7 +1051,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="usable"
 		weight="300"/>
 	<item id="617"
-		image="usable/fertilizedspores.png"
+		image="usable/use/fertilizedspores.png"
 		name="Fertilized Spores"
 		description="You can plant it to colect some shrooms."
 		useButton="Plant"
@@ -1076,20 +1076,20 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="5"
 		maxFloorOffset="12"/>
 	 <item id="701"
-		image="generic/pioufeathers.png"
+		image="generic/feather/pioufeathers.png"
 		name="Piou Feathers"
 		description="Small feathers of an innocent little piou."
 		type="generic"
 		weight="1"
 		maxFloorOffset="8"/>
 	<item id="702"
-		image="generic/tortugashell-fragment.png"
+		image="generic/tortugashellfragment.png"
 		name="Tortuga Shell Fragment"
 		description="Used to make tools and decorations."
 		type="generic"
 		weight="25"/>
 	<item id="703"
-		image="generic/eggshell-half.png"
+		image="generic/halfeggshell.png"
 		name="Half Eggshell"
 		description="Maybe something hatched, or someone was cooked..."
 		type="generic"
@@ -1101,7 +1101,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="1"/>
 	<item id="705"
-		image="generic/teeth-ratto.png"
+		image="generic/rattoteeth.png"
 		name="Ratto Teeth"
 		description="Sharp incisors of a ratto."
 		type="generic"
@@ -1132,7 +1132,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="2"
 		maxFloorOffset="12"/>
 	<item id="710"
-		image="generic/pearl.png"
+		image="generic/gem/pearl.png"
 		name="Pearl"
 		description="A beautiful round and shiny pearl."
 		type="generic"
@@ -1153,60 +1153,60 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="10"
 		maxFloorOffset="9"/>
 	<item id="713"
-		image="generic/box-fish.png"
+		image="generic/box/fishbox.png"
 		name="Fish Box"
 		description="A wooden box full of fresh fish."
 		type="generic"
 		weight="1250"/>
 	<item id="714"
-		image="generic/letter-stamp.png"
+		image="generic/guildcertification.png"
 		name="Guild Certification"
 		description="This piece of paper grants you official permission to found a Guild."
 		type="generic"
 		sellProtected="true"
 		weight="5"/>
 	<item id="715"
-		image="generic/box-croconut.png"
+		image="generic/box/croconutbox.png"
 		name="Croconut Box"
 		description="Contains 17 croconuts."
 		type="generic"
 		weight="1400"/>
 	<item id="716"
-		image="generic/box-plushroom.png"
+		image="generic/box/plushroombox.png"
 		name="Plushroom Box"
 		description="Contains 87 plushrooms."
 		type="generic"
 		weight="720"/>
 	<item id="717"
-		image="generic/dish-poisoned.png"
+		image="generic/poisoneddish.png"
 		name="Poisoned Dish"
 		description="A special dish made of strange ingredients."
 		type="generic"
 		weight="20"
 		maxFloorOffset="12"/>
 	<item id="718"
-		image="generic/key-ship.png"
+		image="generic/key/shipkey.png"
 		name="Silver Key"
 		description="An iron key trying to pass itself as a silver one. Don't ask. Just use it!"
 		type="generic"
 		weight="1"
 		maxFloorOffset="12"/>
 	<item id="719"
-		image="generic/wing-bat.png|S:#4d4d4d,3d2e37,686868,4f3c47,919191,664f4f,b6b6b6,948573"
+		image="generic/batwingmodel.png|S:#4d4d4d,3d2e37,686868,4f3c47,919191,664f4f,b6b6b6,948573"
 		name="Left Crafty Wing"
 		description="This wing is slight and soft unlike its former owner."
 		type="generic"
 		weight="35"
 		maxFloorOffset="17"/>
 	<item id="720"
-		image="generic/teeth-bat.png"
+		image="generic/batteeth.png"
 		name="Bat Teeth"
 		description="What sharp teeth! They seem to be more dangerous than a knife."
 		type="generic"
 		weight="3"
 		maxFloorOffset="16"/>
 	<item id="721"
-		image="generic/wing-bat.png|S:#4d4d4d,4b3126,686868,624632,919191,af6b3b,b6b6b6,de8f40"
+		image="generic/batwingmodel.png|S:#4d4d4d,4b3126,686868,624632,919191,af6b3b,b6b6b6,de8f40"
 		name="Right Crafty Wing"
 		description="This wing is slight and soft unlike its former owner."
 		type="generic"
@@ -1220,7 +1220,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="530"
 		maxFloorOffset="10"/>
 	<item id="723"
-		image="generic/mushroom-spores.png"
+		image="generic/mushroomspores.png"
 		name="Mushroom Spores"
 		description="Some colored spores that help mushrooms spread across the land."
 		type="generic"
@@ -1241,14 +1241,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="8"
 		maxFloorOffset="7"/>
 	<item id="726"
-		image="generic/carp.png"
+		image="generic/fish/carp.png"
 		name="Common Carp"
 		description="Freshwater is commonly inhabited by these pests."
 		type="generic"
 		weight="200"
 		maxFloorOffset="9"/>
 	<item id="727"
-		image="generic/carp.png|S:#394f4d,3e4d58,607793,7b6093,6ba6a8,a47ba8,c9dec0,dec0cb,8dc7a2,dec0cb"
+		image="generic/fish/carp.png|S:#394f4d,3e4d58,607793,7b6093,6ba6a8,a47ba8,c9dec0,dec0cb,8dc7a2,dec0cb"
 		name="Grass Carp"
 		description="A smart fish, very difficult to catch."
 		type="generic"
@@ -1265,49 +1265,49 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	<!-- id 729 is free -->
 	<!-- id 730 is free -->
 	<item id="731"
-		image="generic/diamond.png"
+		image="generic/gem/diamond.png"
 		name="Diamond"
 		description="A raw diamond gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="732"
-		image="generic/ruby.png"
+		image="generic/gem/ruby.png"
 		name="Ruby"
 		description="A raw ruby gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="733"
-		image="generic/emerald.png"
+		image="generic/gem/emerald.png"
 		name="Emerald"
 		description="A raw emerald gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="734"
-		image="generic/sapphire.png"
+		image="generic/gem/sapphire.png"
 		name="Sapphire"
 		description="A raw sapphire gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="735"
-		image="generic/topaz.png"
+		image="generic/gem/topaz.png"
 		name="Topaz"
 		description="A raw topaz gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="736"
-		image="generic/amethyst.png"
+		image="generic/gem/amethyst.png"
 		name="Amethyst"
 		description="A raw amethyst gemstone."
 		type="generic"
 		weight="20"
 		maxFloorOffset="20"/>
 	<item id="737"
-		image="generic/blackpearl.png"
+		image="generic/gem/blackpearl.png"
 		name="Black Pearl"
 		description="A pearl. Round, shiny and black!"
 		type="generic"
@@ -1421,14 +1421,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="2"
 		maxFloorOffset="20"/>
 	<item id="753"
-		image="generic/cavesnakelamp.png"
+		image="generic/snake/cavesnakelamp.png"
 		name="Cave Snake Lamp"
 		description="The feeler of a cave snake that glows in the dark."
 		type="generic"
 		weight="10"
 		maxFloorOffset="20"/>
 	<item id="754"
-		image="generic/closedchristmasbox.png"
+		image="generic/box/closedchristmasbox.png"
 		name="Closed Christmas Box"
 		description="A closed, but yet unwrapped box that should contain some Christmas present."
 		type="generic"
@@ -1442,14 +1442,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="40"
 		maxFloorOffset="20"/>
 	<item id="756"
-		image="generic/cryptkey.png"
+		image="generic/key/cryptkey.png"
 		name="Crypt Key"
 		description="You feel as if the Skeleton Key is staring at you."
 		type="generic"
 		weight="2"
 		maxFloorOffset="20"/>
 	<item id="757"
-		image="generic/darkpetal.png"
+		image="generic/herb/darkpetal.png"
 		name="Dark Petal"
 		description="A single, dark, petal, oddly heavy. The edges of the petal are unusually hard, and have a slightly reflective shine to them. But looking into the gleam, you can only see fire."
 		type="generic"
@@ -1477,14 +1477,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="761"
-		image="generic/cobaltherb.png"
+		image="generic/herb/cobaltherb.png"
 		name="Cobalt Herb"
 		description="An ingredient for brewing healing potions."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="762"
-		image="generic/snakeskin.png"
+		image="generic/snake/snakeskin.png"
 		name="Snake Skin"
 		description="The skin of a slain snake."
 		type="generic"
@@ -1526,14 +1526,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="10"
 		maxFloorOffset="20"/>
 	<item id="768"
-		image="generic/gambogeherb.png"
+		image="generic/herb/gambogeherb.png"
 		name="Gamboge Herb"
 		description="An ingredient for brewing healing potions."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="769"
-		image="generic/mauveherb.png"
+		image="generic/herb/mauveherb.png"
 		name="Mauve Herb"
 		description="An ingredient for brewing healing potions."
 		type="generic"
@@ -1597,7 +1597,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="5"
 		maxFloorOffset="20"/>
 	<item id="778"
-		image="generic/scorpionstinger.png"
+		image="generic/scorpion/scorpionstinger.png"
 		name="Scorpion Stinger"
 		description="A poisoned scorpion stinger."
 		type="generic"
@@ -1611,14 +1611,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="780"
-		image="generic/snaketongue.png"
+		image="generic/snake/snaketongue.png"
 		name="Snake Tongue"
 		description="The forked tongue of a snake."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="781"
-		image="generic/treasurekey.png"
+		image="generic/key/treasurekey.png"
 		name="Treasure Key"
 		description="A rusty key."
 		type="generic"
@@ -1646,7 +1646,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="785"
-		image="generic/pearl.png|W:#581a1a,a41111,c03a3a,ff6060"
+		image="generic/gem/pearl.png|W:#581a1a,a41111,c03a3a,ff6060"
 		name="Lava Mana Pearl"
 		description="A strange lava pearl that did not burn you."
 		type="generic"
@@ -1732,21 +1732,21 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="798"
-		image="generic/lazuriteshard.png"
+		image="generic/gem/lazuriteshard.png"
 		name="Lazurite Shard"
 		description="A small shard of Lazurite, with little magic catalysis properties."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="799"
-		image="generic/lazuritecrystal.png"
+		image="generic/gem/lazuritecrystal.png"
 		name="Lazurite Crystal"
 		description="A crystal of Lazurite, with magic catalysis properties."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="800"
-		image="generic/lazuriteheart.png"
+		image="generic/gem/lazuriteheart.png"
 		name="Lazurite Heart"
 		description="A large crystal of Lazurite, with powerful magic catalysis properties."
 		type="generic"
@@ -1781,7 +1781,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="805"
-		image="generic/openedchristmasbox.png"
+		image="generic/box/openedchristmasbox.png"
 		name="Opened Christmas Box"
 		description="What was inside?"
 		type="generic"
@@ -1795,7 +1795,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="807"
-		image="generic/petal.png"
+		image="generic/herb/petalmodel.png"
 		name="Petal"
 		description="This lovely petal was picked from a flower."
 		type="generic"
@@ -1809,7 +1809,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="4"
 		maxFloorOffset="20"/>
 	<item id="809"
-		image="generic/presentbox.png"
+		image="generic/box/presentbox.png"
 		name="Present Box"
 		description="What does it contain."
 		type="generic"
@@ -1865,7 +1865,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="817"
-		image="generic/key-ship.png"
+		image="generic/key/shipkey.png"
 		name="Saxso Key"
 		description="Used to unlock something."
 		type="generic"
@@ -1873,7 +1873,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="818"
-		image="generic/bluemanapearl.png"
+		image="generic/gem/bluemanapearl.png"
 		name="Blue Mana Pearl"
 		description="A pure pearl of Mana."
 		type="generic"
@@ -1889,14 +1889,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="820"
-		image="generic/darkcrystal.png"
+		image="generic/gem/darkcrystal.png"
 		name="Dark Crystal"
 		description="Dark as the night."
 		type="generic"
 		weight="10"
 		maxFloorOffset="20"/>
 	<item id="821"
-		image="generic/sunnycrystal.png"
+		image="generic/gem/sunnycrystal.png"
 		name="Sunny Crystal"
 		description="Shines as bright as the sun."
 		type="generic"
@@ -1917,7 +1917,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="10"
 		maxFloorOffset="20"/>
 	<item id="824"
-		image="generic/lightgreendiamond.png"
+		image="generic/gem/lightgreendiamond.png"
 		name="Light Green Diamond"
 		description="A light green diamond."
 		type="generic"
@@ -1962,21 +1962,21 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		maxFloorOffset="20"/>
 	<item id="830"
-		image="generic/cavesnaketongue.png"
+		image="generic/snake/cavesnaketongue.png"
 		name="Cave Snake Tongue"
 		description="It is not kind to show tongues to people, you know."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="831"
-		image="generic/redscorpionstinger.png"
+		image="generic/scorpion/redscorpionstinger.png"
 		name="Red Scorpion Stinger"
 		description="It stings!"
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="832"
-		image="generic/blackscorpionstinger.png"
+		image="generic/scorpion/blackscorpionstinger.png"
 		name="Black Scorpion Stinger"
 		description="It stings a lot!"
 		type="generic"
@@ -1990,14 +1990,14 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="5"
 		maxFloorOffset="20"/>
 	<item id="834"
-		image="generic/easteregg-gold.png"
+		image="generic/goldeneasteregg.png"
 		name="Golden Easter Egg"
 		description="A rare golden egg which can only be used during Easter."
 		type="generic"
 		weight="5"
 		maxFloorOffset="20"/>
 	<item id="835"
-		image="generic/easteregg-silver.png"
+		image="generic/silvereasteregg.png"
 		name="Silver Easter Egg"
 		description="A silver egg which can only be used during Easter."
 		type="generic"
@@ -2011,7 +2011,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="6"
 		maxFloorOffset="20"/>
 	 <item id="837"
-		image="generic/duckfeather.png"
+		image="generic/feather/duckfeather.png"
 		name="Duck Feathers"
 		description="Small feathers of an angry Duck."
 		type="generic"
@@ -2025,19 +2025,19 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		weight="1"/>
 	 <item id="839"
-		image="generic/roach.png"
+		image="generic/fish/roach.png"
 		name="Roach"
 		description="A small fish."
 		type="generic"
 		weight="80"/>
 	 <item id="840"
-		image="generic/tench.png"
+		image="generic/fish/tench.png"
 		name="Tench"
 		description="A tench found in pond."
 		type="generic"
 		weight="120"/>
 	 <item id="841"
-		image="generic/gemstone.png|W:#a0a010,ffffa0"
+		image="generic/gem/gemstone.png|W:#a0a010,ffffa0"
 		name="Lifestone"
 		description="A small stone with some life power on it. Not very useful."
 		type="generic"
@@ -2186,27 +2186,27 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="12"/>
 	<item id="864"
-		image="generic/box-aquada.png"
+		image="generic/box/aquadabox.png"
 		name="Aquada Box"
 		description="Contains 50 aquadas."
 		type="generic"
 		weight="850"/>
 	<item id="865"
-		image="generic/snaketongue.png|W:#706060"
+		image="generic/snake/snaketongue.png|W:#706060"
 		name="Mountain Snake Tongue"
 		description="The forked tongue of a mountain snake."
 		type="generic"
 		weight="2"/>
 		<!-- Saulc FIXXX -->	
 	<item id="866"
-		image="generic/snakeskin.png|W:#706060"
+		image="generic/snake/snakeskin.png|W:#706060"
 		name="Mountain Snake Skin"
 		description="A rare skin of a mountain snake."
 		type="generic"
 		weight="22"
 		maxFloorOffset="20"/>
 	<item id="867"
-		image="generic/snakeskin.png|W:#3c1554,6d3195,c987d1"
+		image="generic/snake/snakeskin.png|W:#3c1554,6d3195,c987d1"
 		name="Cave Snake Skin"
 		description="A cave snake skin."
 		type="generic"
@@ -2219,13 +2219,13 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="15"/>
 	<item id="869"
-		image="generic/redscorpionclaw.png"
+		image="generic/scorpion/redscorpionclaw.png"
 		name="Red Scorpion claw"
 		description="Not appetizing."
 		type="generic"
 		weight="20"/>
 	<item id="870"
-		image="generic/blackscorpionclaw.png"
+		image="generic/scorpion/blackscorpionclaw.png"
 		name="Black Scorpion claw"
 		description="It moves and pinches without its body."
 		type="generic"
@@ -2269,20 +2269,20 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="70"/>
 	<item id="877"
-		image="generic/manapioufeathers.png"
+		image="generic/feather/manapioufeathers.png"
 		name="Mana Piou Feathers"
 		description="Small magic feathers of a little magic piou."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="878"
-		image="generic/black-mamba-skin.png"
+		image="generic/snake/blackmambaskin.png"
 		name="Black Mamba Skin"
 		description="The skin of a slain black mamba."
 		type="generic"
 		weight="22"/>
 	<item id="879"
-		image="generic/snaketongue.png|W:#0a0a0a,e02020"
+		image="generic/snake/snaketongue.png|W:#0a0a0a,e02020"
 		name="Black Mamba Tongue"
 		description="The forked tongue of a black mamba."
 		type="generic"
@@ -2294,27 +2294,27 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		type="generic"
 		weight="19"/>
 	<item id="881"
-		image="generic/alizarinherb.png"
+		image="generic/herb/alizarinherb.png"
 		name="Alizarin Herb"
 		description="An ingredient for brewing healing potions."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="882"
-		image="generic/herb.png|W:#332636"
+		image="generic/herb/herbmodel.png|W:#332636"
 		name="Shadow Herb"
 		description="An ingredient for brewing poison potions."
 		type="generic"
 		weight="1"
 		maxFloorOffset="20"/>
 	<item id="883"
-		image="generic/warped_log.png"
+		image="generic/warpedlog.png"
 		name="Warped Log"
 		description="A piece of wood, warped and twisted by some unnatural force. Useless."
 		type="generic"
 		weight="8"/>
 	<item id="884"
-		image="generic/wooden_mouboo.png"
+		image="generic/mouboofigurine.png"
 		name="Mouboo Figurine"
 		description="A small, wooden figurine of a mouboo. Useful for summoning."
 		type="generic"
@@ -5555,7 +5555,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	/>
 	<!-- Cards -->
 	<item id="5000"
-		image="usable/dye.png|S:#3c3c3c,3e1e28,4d4d4d,6f2630,686868,a6313f,919191,d15b5b,b6b6b6,e59b77,dfdfdf,efe0c1"
+		image="usable/card/dye.png|S:#3c3c3c,3e1e28,4d4d4d,6f2630,686868,a6313f,919191,d15b5b,b6b6b6,e59b77,dfdfdf,efe0c1"
 		name="Crimson Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5564,7 +5564,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="21"
 		maxFloorOffset="15"/>
 	<item id="5001"
-		image="usable/dye.png|S:#3c3c3c,302525,4d4d4d,4a3430,686868,69453a,919191,96664c,b6b6b6,bf8d67,dfdfdf,e6c19c"
+		image="usable/card/dye.png|S:#3c3c3c,302525,4d4d4d,4a3430,686868,69453a,919191,96664c,b6b6b6,bf8d67,dfdfdf,e6c19c"
 		name="Chocolate Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5573,7 +5573,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="22"
 		maxFloorOffset="15"/>
 	<item id="5002"
-		image="usable/dye.png|S:#3c3c3c,35313d,4d4d4d,443f4f,686868,485c6b,919191,50918f,b6b6b6,75c7a8,dfdfdf,c3e8c4"
+		image="usable/card/dye.png|S:#3c3c3c,35313d,4d4d4d,443f4f,686868,485c6b,919191,50918f,b6b6b6,75c7a8,dfdfdf,c3e8c4"
 		name="Mint Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5582,7 +5582,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="23"
 		maxFloorOffset="15"/>
 	<item id="5003"
-		image="usable/dye.png|W:#111111,222222,333333,444444,555555,aaaaaa"
+		image="usable/card/dye.png|W:#111111,222222,333333,444444,555555,aaaaaa"
 		name="Black Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5591,7 +5591,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="2"
 		maxFloorOffset="15"/>
 	<item id="5004"
-		image="usable/dye.png|W:#44494b,797a7e,b9bbc1"
+		image="usable/card/dye.png|W:#44494b,797a7e,b9bbc1"
 		name="Silver Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5600,7 +5600,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="3"
 		maxFloorOffset="15"/>
 	<item id="5005"
-		image="usable/dye.png|W:#594d36,b49b6c,f4d293"
+		image="usable/card/dye.png|W:#594d36,b49b6c,f4d293"
 		name="Camel Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5609,7 +5609,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="4"
 		maxFloorOffset="15"/>
 	<item id="5006"
-		image="usable/dye.png|W:#3f221d,754d23,f5cea4"
+		image="usable/card/dye.png|W:#3f221d,754d23,f5cea4"
 		name="Brown Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5618,7 +5618,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="5"
 		maxFloorOffset="15"/>
 	<item id="5007"
-		image="usable/dye.png|W:#831f2d,f07401,f8cc8b"
+		image="usable/card/dye.png|W:#831f2d,f07401,f8cc8b"
 		name="Orange Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5627,7 +5627,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="6"
 		maxFloorOffset="15"/>
 	<item id="5008"
-		image="usable/dye.png|W:#6a0022,7c151a,c60022"
+		image="usable/card/dye.png|W:#6a0022,7c151a,c60022"
 		name="Dark Red Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5636,7 +5636,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="7"
 		maxFloorOffset="15"/>
 	<item id="5009"
-		image="usable/dye.png|W:#580000,a40000,c02020,ff6060"
+		image="usable/card/dye.png|W:#580000,a40000,c02020,ff6060"
 		name="Red Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5645,7 +5645,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="8"
 		maxFloorOffset="15"/>
 	<item id="5010"
-		image="usable/dye.png|W:#620e48,bf1b8b,e32bcf,ffb6f7"
+		image="usable/card/dye.png|W:#620e48,bf1b8b,e32bcf,ffb6f7"
 		name="Fuchsia Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5654,7 +5654,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="9"
 		maxFloorOffset="15"/>
 	<item id="5011"
-		image="usable/dye.png|W:#a92d42,f67189,ffbac7"
+		image="usable/card/dye.png|W:#a92d42,f67189,ffbac7"
 		name="Pink Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5663,7 +5663,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="10"
 		maxFloorOffset="15"/>
 	<item id="5012"
-		image="usable/dye.png|W:#640088,b350e0,ecb7ff"
+		image="usable/card/dye.png|W:#640088,b350e0,ecb7ff"
 		name="Mauve Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5672,7 +5672,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="11"
 		maxFloorOffset="15"/>
 	<item id="5013"
-		image="usable/dye.png|W:#3c1554,6d3195,c987d1"
+		image="usable/card/dye.png|W:#3c1554,6d3195,c987d1"
 		name="Purple Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5681,7 +5681,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="12"
 		maxFloorOffset="15"/>
 	<item id="5014"
-		image="usable/dye.png|W:#0d1430,21337c,4363e5"
+		image="usable/card/dye.png|W:#0d1430,21337c,4363e5"
 		name="Navy Blue Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5690,7 +5690,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="13"
 		maxFloorOffset="15"/>
 	<item id="5015"
-		image="usable/dye.png|W:#2d2d41,4c4d9a,7b7b99"
+		image="usable/card/dye.png|W:#2d2d41,4c4d9a,7b7b99"
 		name="Blue Gray Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5699,7 +5699,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="14"
 		maxFloorOffset="15"/>
 	<item id="5016"
-		image="usable/dye.png|W:#16486e,498ec5,e4f2fc"
+		image="usable/card/dye.png|W:#16486e,498ec5,e4f2fc"
 		name="Blue Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5708,7 +5708,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="15"
 		maxFloorOffset="15"/>
 	<item id="5017"
-		image="usable/dye.png|W:#196253,18986c,37cf7d"
+		image="usable/card/dye.png|W:#196253,18986c,37cf7d"
 		name="Teal Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5717,7 +5717,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="16"
 		maxFloorOffset="15"/>
 	<item id="5018"
-		image="usable/dye.png|W:#115511,22aa22,99dd99"
+		image="usable/card/dye.png|W:#115511,22aa22,99dd99"
 		name="Green Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5726,7 +5726,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="17"
 		maxFloorOffset="15"/>
 	<item id="5019"
-		image="usable/dye.png|W:#547000,a5dc00,d1ff46"
+		image="usable/card/dye.png|W:#547000,a5dc00,d1ff46"
 		name="Lime Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5735,7 +5735,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="18"
 		maxFloorOffset="15"/>
 	<item id="5020"
-		image="usable/dye.png|W:#002504,2d551b,07871d"
+		image="usable/card/dye.png|W:#002504,2d551b,07871d"
 		name="Khaki Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5744,7 +5744,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="19"
 		maxFloorOffset="15"/>
 	<item id="5021"
-		image="usable/dye.png|W:#846211,dab333,fffb93,ffffff"
+		image="usable/card/dye.png|W:#846211,dab333,fffb93,ffffff"
 		name="Yellow Dye"
 		useButton="Dye"
 		description="Color dye that can be used on clothing."
@@ -5753,63 +5753,63 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="20"
 		maxFloorOffset="15"/>
 	<item id="5022"
-		image="usable/necromancercard.png"
+		image="usable/card/necromancercard.png"
 		name="Necromancer Card"
 		description="A powerful card."
 		effect="Prints an error"
 		type="card"
 		weight="5"/>
 	<item id="5023"
-		image="usable/herocard.png"
+		image="usable/card/herocard.png"
 		name="Hero Card"
 		description="A powerful card."
 		effect="Prints an error"
 		type="card"
 		weight="5"/>
 	<item id="5024"
-		image="usable/crusadercard.png"
+		image="usable/card/crusadercard.png"
 		name="Crusader Card"
 		description="A powerful card."
 		effect="Prints an error"
 		type="card"
 		weight="5"/>
 	<item id="5025"
-		image="usable/paladincard.png"
+		image="usable/card/paladincard.png"
 		name="Paladin Card"
 		description="A powerful card."
 		effect="Prints an error"
 		type="card"
 		weight="5"/>
 	<item id="5026"
-		image="usable/forestcard.png"
+		image="usable/card/forestcard.png"
 		name="Forest Card"
 		description="A powerful card."
 		effect="Prints an error"
 		type="card"
 		weight="5"/>
 	<item id="5027"
-		image="usable/oldurcard.png"
+		image="usable/card/desertthiefcard.png"
 		name="Oldur Card"
 		description="A powerful card."
 		effect="Prints an error"
 		type="card"
 		weight="5"/>
 	<item id="5028"
-		image="usable/slidecard.png"
+		image="usable/card/slidecard.png"
 		name="Slide Card"
 		description="A powerful card."
 		effect="Prints an error"
 		type="card"
 		weight="5"/>
 	<item id="5029"
-		image="usable/naturalcard.png"
+		image="usable/card/naturalcard.png"
 		name="Natural Card"
 		description="A powerful card."
 		effect="Prints an error"
 		type="card"
 		weight="5"/>
 	<item id="5030"
-		image="usable/oldurcard.png"
+		image="usable/card/desertthiefcard.png"
 		name="Desert Thief Card"
 		description="This magic card made of dried sand can be placed in certain type of glove to bring you some powers."
 		effect="Attack Speed +1%"
@@ -5817,7 +5817,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="4"/>
 	<!-- TEST RING CARD -->
 	<item id="5031"
-		image="generic/diamond.png"
+		image="generic/gem/diamond.png"
 		name="Polished Diamond"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -5826,7 +5826,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="2"
 		weight="4"/>
 	<item id="5032"
-		image="generic/ruby.png"
+		image="generic/gem/ruby.png"
 		name="Polished Ruby"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -5835,7 +5835,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="3"
 		weight="4"/>
 	<item id="5033"
-		image="generic/amethyst.png"
+		image="generic/gem/amethyst.png"
 		name="Polished Amethyst"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -5844,7 +5844,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="4"
 		weight="4"/>
 	<item id="5034"
-		image="generic/sapphire.png"
+		image="generic/gem/sapphire.png"
 		name="Polished Sapphire"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -5853,7 +5853,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="5"
 		weight="4"/>
 	<item id="5035"
-		image="generic/topaz.png"
+		image="generic/gem/topaz.png"
 		name="Polished Topaz"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -5862,7 +5862,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		cardColor="6"
 		weight="4"/>
 	<item id="5036"
-		image="generic/emerald.png"
+		image="generic/gem/emerald.png"
 		name="Polished Emerald"
 		useButton="Insert"
 		description="A polished gemstone."
@@ -6141,7 +6141,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		attack="10"
 		weight="12"/>
 	<item id="7420"
-		image="usable/acorn.png"
+		image="usable/food/acorn.png"
 		name="Acorn Of Death"
 		description="You died, and all you got was this nasty acorn!"
 		useButton="Eat"