re-organisation:

- All food was moved to use/food/ folder
- Some generic items wer in fact food such as lollipops, moved to use/food/ folder
- Removed all colored hints and dyed them using items.xml, colors are exactly the same as before
- Some other generic items were moved to generic/ folder

And of course, every single item has been tested.

57 files changed, 69 insertions, 69 deletions

diff --git a/graphics/items/generic-bluehint.png b/graphics/items/generic-bluehint.png
deleted file mode 100644
index 4f6b8a2e..00000000
--- a/graphics/items/generic-bluehint.png
+++ /dev/null
diff --git a/graphics/items/generic-greenhint.png b/graphics/items/generic-greenhint.png
deleted file mode 100644
index 275767f3..00000000
--- a/graphics/items/generic-greenhint.png
+++ /dev/null
diff --git a/graphics/items/generic-magentahint.png b/graphics/items/generic-magentahint.png
deleted file mode 100644
index d1acba19..00000000
--- a/graphics/items/generic-magentahint.png
+++ /dev/null
diff --git a/graphics/items/generic-orangehint.png b/graphics/items/generic-orangehint.png
deleted file mode 100644
index 7c8e842f..00000000
--- a/graphics/items/generic-orangehint.png
+++ /dev/null
diff --git a/graphics/items/generic-otherbluehint.png b/graphics/items/generic-otherbluehint.png
deleted file mode 100644
index 25c712f9..00000000
--- a/graphics/items/generic-otherbluehint.png
+++ /dev/null
diff --git a/graphics/items/generic-purplehint.png b/graphics/items/generic-purplehint.png
deleted file mode 100644
index ed9f2a3c..00000000
--- a/graphics/items/generic-purplehint.png
+++ /dev/null
diff --git a/graphics/items/generic-redhint.png b/graphics/items/generic-redhint.png
deleted file mode 100644
index de5d1d56..00000000
--- a/graphics/items/generic-redhint.png
+++ /dev/null
diff --git a/graphics/items/generic-tealhint.png b/graphics/items/generic-tealhint.png
deleted file mode 100644
index c98454cf..00000000
--- a/graphics/items/generic-tealhint.png
+++ /dev/null
diff --git a/graphics/items/generic-yellowhint.png b/graphics/items/generic-yellowhint.png
deleted file mode 100644
index 18596551..00000000
--- a/graphics/items/generic-yellowhint.png
+++ /dev/null
diff --git a/graphics/items/generic-emptybottle.png b/graphics/items/generic/bottle-empty.png
index 23e08c52..23e08c52 100644
--- a/graphics/items/generic-emptybottle.png
+++ b/graphics/items/generic/bottle-empty.png
diff --git a/graphics/items/generic-bottleofsand.png b/graphics/items/generic/bottle-sand.png
index 7c1f9d25..7c1f9d25 100644
--- a/graphics/items/generic-bottleofsand.png
+++ b/graphics/items/generic/bottle-sand.png
diff --git a/graphics/items/generic-greyhint.png b/graphics/items/generic/hint.png
index fb120eed..fb120eed 100644
--- a/graphics/items/generic-greyhint.png
+++ b/graphics/items/generic/hint.png
diff --git a/graphics/items/generic-pumpkinseed.png b/graphics/items/generic/pumpkinseed.png
index 5f0558c3..5f0558c3 100644
--- a/graphics/items/generic-pumpkinseed.png
+++ b/graphics/items/generic/pumpkinseed.png
diff --git a/graphics/items/generic-santacookie.png b/graphics/items/generic/santacookie.png
index 1970595d..1970595d 100644
--- a/graphics/items/generic-santacookie.png
+++ b/graphics/items/generic/santacookie.png
diff --git a/graphics/items/generic-scroll.png b/graphics/items/generic/scroll.png
index b89cfc76..b89cfc76 100644
--- a/graphics/items/generic-scroll.png
+++ b/graphics/items/generic/scroll.png
diff --git a/graphics/items/generic-cocoon-silk.png b/graphics/items/generic/silkcocoon.png
index 7c9e5858..7c9e5858 100644
--- a/graphics/items/generic-cocoon-silk.png
+++ b/graphics/items/generic/silkcocoon.png
diff --git a/graphics/items/use-food-acorn.png b/graphics/items/use/food/acorn.png
index acf6f919..acf6f919 100644
--- a/graphics/items/use-food-acorn.png
+++ b/graphics/items/use/food/acorn.png
diff --git a/graphics/items/use-food-apple.png b/graphics/items/use/food/apple.png
index b2fc3d53..b2fc3d53 100644
--- a/graphics/items/use-food-apple.png
+++ b/graphics/items/use/food/apple.png
diff --git a/graphics/items/use-food-beer.png b/graphics/items/use/food/beer.png
index b80ad2f5..b80ad2f5 100644
--- a/graphics/items/use-food-beer.png
+++ b/graphics/items/use/food/beer.png
diff --git a/graphics/items/use-cake-a.png b/graphics/items/use/food/bigcake.png
index 7cc92b53..7cc92b53 100644
--- a/graphics/items/use-cake-a.png
+++ b/graphics/items/use/food/bigcake.png
diff --git a/graphics/items/use-blueberries.png b/graphics/items/use/food/blueberries.png
index e96f399f..e96f399f 100644
--- a/graphics/items/use-blueberries.png
+++ b/graphics/items/use/food/blueberries.png
diff --git a/graphics/items/use-food-cake.png b/graphics/items/use/food/cake.png
index 21b90867..21b90867 100644
--- a/graphics/items/use-food-cake.png
+++ b/graphics/items/use/food/cake.png
diff --git a/graphics/items/use-food-candy.png b/graphics/items/use/food/candy.png
index e3d75c21..e3d75c21 100644
--- a/graphics/items/use-food-candy.png
+++ b/graphics/items/use/food/candy.png
diff --git a/graphics/items/use-food-candycane.png b/graphics/items/use/food/candycane.png
index 67b7d946..67b7d946 100644
--- a/graphics/items/use-food-candycane.png
+++ b/graphics/items/use/food/candycane.png
diff --git a/graphics/items/generic-candypumpkin.png b/graphics/items/use/food/candypumpkin.png
index c5b40eaf..c5b40eaf 100644
--- a/graphics/items/generic-candypumpkin.png
+++ b/graphics/items/use/food/candypumpkin.png
diff --git a/graphics/items/generic-caramelapple.png b/graphics/items/use/food/caramelapple.png
index 637bed4d..637bed4d 100644
--- a/graphics/items/generic-caramelapple.png
+++ b/graphics/items/use/food/caramelapple.png
diff --git a/graphics/items/use-food-cherry.png b/graphics/items/use/food/cherry.png
index 9b919d44..9b919d44 100644
--- a/graphics/items/use-food-cherry.png
+++ b/graphics/items/use/food/cherry.png
diff --git a/graphics/items/use-food-cherrycake.png b/graphics/items/use/food/cherrycake.png
index 50a05824..50a05824 100644
--- a/graphics/items/use-food-cherrycake.png
+++ b/graphics/items/use/food/cherrycake.png
diff --git a/graphics/items/use-food-chickenleg.png b/graphics/items/use/food/chickenleg.png
index 1031a3b5..1031a3b5 100644
--- a/graphics/items/use-food-chickenleg.png
+++ b/graphics/items/use/food/chickenleg.png
diff --git a/graphics/items/use-food-chocolatebar.png b/graphics/items/use/food/chocolatebar.png
index 7ba87bfe..7ba87bfe 100644
--- a/graphics/items/use-food-chocolatebar.png
+++ b/graphics/items/use/food/chocolatebar.png
diff --git a/graphics/items/use-food-decorcandy.png b/graphics/items/use/food/decorcandy.png
index a148ed31..a148ed31 100644
--- a/graphics/items/use-food-decorcandy.png
+++ b/graphics/items/use/food/decorcandy.png
diff --git a/graphics/items/use-food-easteregg.png b/graphics/items/use/food/easteregg.png
index b6c0f447..b6c0f447 100644
--- a/graphics/items/use-food-easteregg.png
+++ b/graphics/items/use/food/easteregg.png
diff --git a/graphics/items/use-food-gingerbreadman.png b/graphics/items/use/food/gingerbreadman.png
index 14972c99..14972c99 100644
--- a/graphics/items/use-food-gingerbreadman.png
+++ b/graphics/items/use/food/gingerbreadman.png
diff --git a/graphics/items/use-food-jello.png b/graphics/items/use/food/jello.png
index fc91ece6..fc91ece6 100755
--- a/graphics/items/use-food-jello.png
+++ b/graphics/items/use/food/jello.png
diff --git a/graphics/items/generic-jellyskull.png b/graphics/items/use/food/jellyskull.png
index bfdd49c8..bfdd49c8 100644
--- a/graphics/items/generic-jellyskull.png
+++ b/graphics/items/use/food/jellyskull.png
diff --git a/graphics/items/use-food-juice.png b/graphics/items/use/food/juice.png
index b21e7ce2..b21e7ce2 100755
--- a/graphics/items/use-food-juice.png
+++ b/graphics/items/use/food/juice.png
diff --git a/graphics/items/use-food-lady-fingers.png b/graphics/items/use/food/lady-fingers.png
index 9c8cc3b9..9c8cc3b9 100755
--- a/graphics/items/use-food-lady-fingers.png
+++ b/graphics/items/use/food/lady-fingers.png
diff --git a/graphics/items/generic-lollipop.png b/graphics/items/use/food/lollipop.png
index 97e99061..97e99061 100644
--- a/graphics/items/generic-lollipop.png
+++ b/graphics/items/use/food/lollipop.png
diff --git a/graphics/items/generic-marshmallow.png b/graphics/items/use/food/marshmallow.png
index 91cf206b..91cf206b 100644
--- a/graphics/items/generic-marshmallow.png
+++ b/graphics/items/use/food/marshmallow.png
diff --git a/graphics/items/use-food-milk.png b/graphics/items/use/food/milk.png
index 59466865..59466865 100644
--- a/graphics/items/use-food-milk.png
+++ b/graphics/items/use/food/milk.png
diff --git a/graphics/items/use-food-orange.png b/graphics/items/use/food/orange.png
index 48435f48..48435f48 100644
--- a/graphics/items/use-food-orange.png
+++ b/graphics/items/use/food/orange.png
diff --git a/graphics/items/use-food-orangecupcake.png b/graphics/items/use/food/orangecupcake.png
index ea9da086..ea9da086 100644
--- a/graphics/items/use-food-orangecupcake.png
+++ b/graphics/items/use/food/orangecupcake.png
diff --git a/graphics/items/use-food-pear.png b/graphics/items/use/food/pear.png
index 080d1720..080d1720 100644
--- a/graphics/items/use-food-pear.png
+++ b/graphics/items/use/food/pear.png
diff --git a/graphics/items/use-food-roastedmaggot.png b/graphics/items/use/food/roastedmaggot.png
index 2936c820..2936c820 100644
--- a/graphics/items/use-food-roastedmaggot.png
+++ b/graphics/items/use/food/roastedmaggot.png
diff --git a/graphics/items/use-food-shock-candy.png b/graphics/items/use/food/shock-candy.png
index f69df9c7..f69df9c7 100644
--- a/graphics/items/use-food-shock-candy.png
+++ b/graphics/items/use/food/shock-candy.png
diff --git a/graphics/items/use-food-skull-mug.png b/graphics/items/use/food/skull-mug.png
index 7ca071fe..7ca071fe 100755
--- a/graphics/items/use-food-skull-mug.png
+++ b/graphics/items/use/food/skull-mug.png
diff --git a/graphics/items/use-food-snake-egg.png b/graphics/items/use/food/snake-egg.png
index f98d6def..f98d6def 100644
--- a/graphics/items/use-food-snake-egg.png
+++ b/graphics/items/use/food/snake-egg.png
diff --git a/graphics/items/use-food-snapple.png b/graphics/items/use/food/snapple.png
index d5502c50..d5502c50 100755
--- a/graphics/items/use-food-snapple.png
+++ b/graphics/items/use/food/snapple.png
diff --git a/graphics/items/use-food-steak.png b/graphics/items/use/food/steak.png
index 859600f4..859600f4 100644
--- a/graphics/items/use-food-steak.png
+++ b/graphics/items/use/food/steak.png
diff --git a/graphics/items/generic-tonoridelight.png b/graphics/items/use/food/tonoridelight.png
index c65566d6..c65566d6 100644
--- a/graphics/items/generic-tonoridelight.png
+++ b/graphics/items/use/food/tonoridelight.png
diff --git a/graphics/items/use-food-bottleofwater.png b/graphics/items/use/food/water.png
index 3079db97..3079db97 100644
--- a/graphics/items/use-food-bottleofwater.png
+++ b/graphics/items/use/food/water.png
diff --git a/graphics/items/use-food-wine.png b/graphics/items/use/food/wine.png
index 6b7c49c1..6b7c49c1 100755
--- a/graphics/items/use-food-wine.png
+++ b/graphics/items/use/food/wine.png
diff --git a/graphics/items/use-food-xmascake.png b/graphics/items/use/food/xmascake.png
index 496e5fea..496e5fea 100644
--- a/graphics/items/use-food-xmascake.png
+++ b/graphics/items/use/food/xmascake.png
diff --git a/graphics/items/use-food-xmascandycane.png b/graphics/items/use/food/xmascandycane.png
index cf7e9e96..cf7e9e96 100644
--- a/graphics/items/use-food-xmascandycane.png
+++ b/graphics/items/use/food/xmascandycane.png
diff --git a/graphics/items/use-food-yellow-plum.png b/graphics/items/use/food/yellow-plum.png
index 13180b51..13180b51 100644
--- a/graphics/items/use-food-yellow-plum.png
+++ b/graphics/items/use/food/yellow-plum.png
diff --git a/graphics/items/use-food-zombie-nachos.png b/graphics/items/use/food/zombie-nachos.png
index 5049dec8..5049dec8 100755
--- a/graphics/items/use-food-zombie-nachos.png
+++ b/graphics/items/use/food/zombie-nachos.png
diff --git a/items.xml b/items.xml
index a895fe7a..2483a862 100644
--- a/items.xml
+++ b/items.xml
@@ -138,7 +138,7 @@
         weight="1"
         max-per-slot="10"/>
     <item id="504"
-        image="use-food-decorcandy.png"
+        image="use/food/decorcandy.png"
         name="Decor Candy"
         description="A leftover decor candy from last Christmas."
         effect=""
@@ -154,7 +154,7 @@
         weight="1"
         max-per-slot="10"/>
     <item id="506"
-        image="use-food-candycane.png"
+        image="use/food/candycane.png"
         name="Candy Cane"
         description="Tasty candy cane."
         effect="+5 HP"
@@ -171,7 +171,7 @@
         weight="1"
         max-per-slot="10"/>
     <item id="508"
-        image="use-food-xmascake.png"
+        image="use/food/xmascake.png"
         name="Xmas Cake"
         description="A sweet xmas cake."
         effect="+10 HP"
@@ -180,7 +180,7 @@
         weight="1"
         max-per-slot="10"/>
     <item id="509"
-        image="use-food-chocolatebar.png|W:#441e00,b36e36"
+        image="use/food/chocolatebar.png|W:#441e00,b36e36"
         name="Chocolate Bar"
         description="A chocolate bar made of finest chocolate."
         effect="+20 HP"
@@ -189,7 +189,7 @@
         weight="1"
         max-per-slot="10"/>
     <item id="510"
-        image="use-food-candy.png"
+        image="use/food/candy.png"
         name="Candy"
         description="A sugar-free candy."
         effect="+5 HP"
@@ -209,7 +209,7 @@
         <sprite>head-santahat.xml</sprite>
     </item>
     <item id="512"
-        image="use-food-gingerbreadman.png"
+        image="use/food/gingerbreadman.png"
         name="Ginger Bread Man"
         description="A tasty ginger bread man."
         effect="+25 HP"
@@ -217,7 +217,7 @@
         hp="25"
         weight="1"/>
     <item id="513"
-        image="use-food-cake.png"
+        image="use/food/cake.png"
         name="Cake"
         description="A slice of cake."
         effect="+15 HP"
@@ -225,7 +225,7 @@
         hp="15"
         weight="1"/>
     <item id="514"
-        image="use-food-xmascandycane.png"
+        image="use/food/xmascandycane.png"
         name="Xmas Candy Cane"
         description="A special xmas candy cane."
         effect="+10 HP"
@@ -261,7 +261,7 @@
         type="generic"
         weight="1"/>
     <item id="519"
-        image="use-food-cherrycake.png"
+        image="use/food/cherrycake.png"
         name="Cherry Cake"
         description="A nice cherry cake."
         effect="+35 HP"
@@ -269,7 +269,7 @@
         hp="35"
         weight="1"/>
     <item id="520"
-        image="use-food-easteregg.png"
+        image="use/food/easteregg.png"
         name="Easter Egg"
         description="A surprise."
         effect="+100 HP"
@@ -354,7 +354,7 @@
         weight="5"
         max-per-slot="1"/>
     <item id="527"
-        image="use-food-milk.png"
+        image="use/food/milk.png"
         name="Milk"
         description="A fresh litre of ice cold milk. Note: Cool people drink milk!"
         effect="+150 HP"
@@ -423,7 +423,7 @@
         <sprite gender="female">hands-gloves-generic-female.xml|#4e2e18,c8752f</sprite>
     </item>
     <item id="533"
-        image="use-food-roastedmaggot.png"
+        image="use/food/roastedmaggot.png"
         name="Roasted Maggot"
         description="A maggot roasted on fire."
         effect="+150 HP"
@@ -432,7 +432,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="534"
-        image="use-food-orangecupcake.png"
+        image="use/food/orangecupcake.png"
         name="Orange Cupcake"
         description="A very soft orange cupcake."
         effect="+100 HP"
@@ -441,7 +441,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="535"
-        image="use-food-apple.png|R:#FF3600;Y:#FFC000;G:#66CC33"
+        image="use/food/apple.png|R:#FF3600;Y:#FFC000;G:#66CC33"
         name="Red Apple"
         description="A healthy red apple."
         effect="+50 HP"
@@ -482,7 +482,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="539"
-        image="use-food-beer.png"
+        image="use/food/beer.png"
         name="Beer"
         description="A fresh beer."
         effect="+200 HP"
@@ -491,7 +491,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="540"
-        image="generic-emptybottle.png"
+        image="generic/bottle-empty.png"
         name="Empty Bottle"
         description="An empty bottle."
         effect=""
@@ -499,7 +499,7 @@
         weight="1"
         max-per-slot="10"/>
     <item id="541"
-        image="use-food-bottleofwater.png"
+        image="use/food/water.png"
         name="Bottle of Water"
         description="A bottle of water."
         effect="+250 HP"
@@ -508,7 +508,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="542"
-        image="generic-bottleofsand.png"
+        image="generic/bottle-sand.png"
         name="Bottle of Sand"
         description="A bottle with sand in it."
         effect=""
@@ -614,7 +614,7 @@
 		<sprite>weapon-axe-blacksmith.xml</sprite>
 		</item>
     <item id="551"
-        image="generic-bluehint.png"
+        image="generic/hint.png|W:#74e1f4"
         name="Aqua Hint"
         description="A hint."
         effect=""
@@ -622,7 +622,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="552"
-        image="generic-magentahint.png"
+        image="generic/hint.png|W:#c38ec7"
         name="Magenta Hint"
         description="A hint."
         effect=""
@@ -630,7 +630,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="553"
-        image="generic-yellowhint.png"
+        image="generic/hint.png|W:#f0f17d"
         name="Yellow Hint"
         description="A hint."
         effect=""
@@ -638,7 +638,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="554"
-        image="generic-greenhint.png"
+        image="generic/hint.png|W:#70e370"
         name="Green Hint"
         description="A hint."
         effect=""
@@ -646,7 +646,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="555"
-        image="generic-tealhint.png"
+        image="generic/hint.png|W:#6ef4ea"
         name="Teal Hint"
         description="A hint."
         effect=""
@@ -654,7 +654,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="556"
-        image="generic-purplehint.png"
+        image="generic/hint.png|W:#c97fe8"
         name="Purple Hint"
         description="A hint."
         effect=""
@@ -662,7 +662,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="557"
-        image="generic-redhint.png"
+        image="generic/hint.png|W:#e97180"
         name="Red Hint"
         description="A hint."
         effect=""
@@ -670,7 +670,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="558"
-        image="generic-otherbluehint.png"
+        image="generic/hint.png|W:#7a86f4"
         name="Blue Hint"
         description="A hint."
         effect=""
@@ -678,7 +678,7 @@
         weight="10"
         max-per-slot="10"/>
     <item id="559"
-        image="generic-orangehint.png"
+        image="generic/hint.png|W:#f0bd67"
         name="Orange Hint"
         description="A hint."
         effect=""
@@ -686,8 +686,8 @@
         weight="10"
         max-per-slot="10"/>
     <item id="560"
-        image="generic-greyhint.png"
-        name="Gray Hint"
+        image="generic/hint.png"
+        name="Grey Hint"
         description="A hint."
         effect=""
         type="generic"
@@ -705,7 +705,7 @@
         attack-range="32"
         max-per-slot="1"/>
     <item id="562"
-        image="use-food-chickenleg.png"
+        image="use/food/chickenleg.png"
         name="Chicken Leg"
         description="A well cooked chicken leg."
         effect="+500 HP"
@@ -1475,7 +1475,7 @@
         <sprite>head-mask.xml</sprite>
     </item>
     <item id="635"
-        image="generic-santacookie.png"
+        image="generic/santacookie.png"
         name="Santa Cookie"
         description="This isn't for you to eat, it is for Santa Claus!"
         effect=""
@@ -1686,7 +1686,7 @@
         <sprite>head-serf.xml</sprite>
     </item>
     <item id="657"
-        image="use-food-orange.png"
+        image="use/food/orange.png"
         name="Orange"
         description="A juicy orange."
         effect="+60 HP"
@@ -1850,7 +1850,7 @@
         <sprite>head-gradcap.xml</sprite>
     </item>
     <item id="676"
-        image="use-food-steak.png"
+        image="use/food/steak.png"
         name="Steak"
         description="A tasty piece of steak."
         effect="+250 HP"
@@ -2145,7 +2145,7 @@
         type="generic"
         weight="1"/>
     <item id="714"
-        image="use-food-snake-egg.png|W:#c0c0a0;R:#b09070;G:#b8a888"
+        image="use/food/snake-egg.png|W:#c0c0a0;R:#b09070;G:#b8a888"
         name="Snake Egg"
         description="An edible snake egg."
         effect="+30 HP"
@@ -2153,7 +2153,7 @@
         hp="30"
         weight="4"/>
     <item id="715"
-        image="use-food-snake-egg.png|W:#806020;R:#604010;G:#705018"
+        image="use/food/snake-egg.png|W:#806020;R:#604010;G:#705018"
         name="Mountain Snake Egg"
         description="An edible mountain snake egg."
         effect="+40 HP"
@@ -2161,7 +2161,7 @@
         hp="40"
         weight="4"/>
     <item id="716"
-        image="use-food-snake-egg.png|W:#e0e0c0;R:#80f0a0;G:#b0e8b0"
+        image="use/food/snake-egg.png|W:#e0e0c0;R:#80f0a0;G:#b0e8b0"
         name="Grass Snake Egg"
         description="An edible grass snake egg."
         effect="+50 HP"
@@ -2169,7 +2169,7 @@
         hp="50"
         weight="4"/>
     <item id="717"
-        image="use-food-snake-egg.png|W:#c0c0c0;R:#c090c0;G:#c0a8c0"
+        image="use/food/snake-egg.png|W:#c0c0c0;R:#c090c0;G:#c0a8c0"
         name="Cave Snake Egg"
         description="An edible cave snake egg."
         effect="+20 HP"
@@ -2177,14 +2177,14 @@
         hp="20"
         weight="4"/>
     <item id="718"
-        image="generic-cocoon-silk.png"
+        image="generic/silkcocoon.png"
         name="Silk Cocoon"
         description="A silkworm's cocoon."
         effect=""
         type="generic"
         weight="1"/>
     <item id="719"
-        image="use-food-apple.png|R:#73E600;Y:#C1F102;G:#66CC33"
+        image="use/food/apple.png|R:#73E600;Y:#C1F102;G:#66CC33"
         name="Green Apple"
         description="A healthy green apple."
         effect="+45 HP"
@@ -2346,7 +2346,7 @@
         <sprite gender="female">equipment/feet/boots-female.xml|#A4B2B2,FFFFFF</sprite>
     </item>
     <item id="736"
-        image="use-cake-a.png|R:#EDE5B2,FFF7BF;G:#CCCCCC,FFFFFF"
+        image="use/food/bigcake.png|R:#EDE5B2,FFF7BF;G:#CCCCCC,FFFFFF"
         name="White Cake"
         description="A delicious white cake. Would go good with strawberries."
         hp="10"
@@ -2354,7 +2354,7 @@
         type="usable"
         weight="10"/>
     <item id="737"
-        image="use-cake-a.png|R:#9E6E3B,E39D52;G:#E29F57;W:#FFD5A8"
+        image="use/food/bigcake.png|R:#9E6E3B,E39D52;G:#E29F57;W:#FFD5A8"
         name="Chocolate Cake"
         description="A scrumptious chocolate cake. Real chocolate guaranteed."
         hp="11"
@@ -2362,7 +2362,7 @@
         type="usable"
         weight="10"/>
     <item id="738"
-        image="use-cake-a.png|R:#FED079,FFFFFF;G:#FED079,FFFFFF,FFFFFF;W:#856200,E68E00,FFA600"
+        image="use/food/bigcake.png|R:#FED079,FFFFFF;G:#FED079,FFFFFF,FFFFFF;W:#856200,E68E00,FFA600"
         name="Orange Cake"
         description="A tangy orange cake. Made from real oranges."
         hp="12"
@@ -2370,7 +2370,7 @@
         type="usable"
         weight="10"/>
     <item id="739"
-        image="use-cake-a.png|R:#CCC599,FFF8ED;G:#FFBABA,FFFEFE;W:#D91A1A,FF8F8F"
+        image="use/food/bigcake.png|R:#CCC599,FFF8ED;G:#FFBABA,FFFEFE;W:#D91A1A,FF8F8F"
         name="Apple Cake"
         description="A crisp apple cake. Real apple pieces inside!"
         hp="12"
@@ -2403,7 +2403,7 @@
         luck="1"
         weight="1"/>
     <item id="743"
-        image="use-food-acorn.png"
+        image="use/food/acorn.png"
         name="Acorn"
         description="An acorn."
         effect="+3 HP"
@@ -2437,7 +2437,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="747"
-        image="use-cake-a.png|R:#9E6E3B,E39D52;G:#E29F57;W:#FFD5A8"
+        image="use/food/bigcake.png|R:#9E6E3B,E39D52;G:#E29F57;W:#FFD5A8"
         name="Laced Chocolate Cake"
         description="A scrumptious chocolate cake, with a dash of Mopox cure potion."
         hp="11"
@@ -2445,7 +2445,7 @@
         type="usable"
         weight="10"/>
     <item id="748"
-        image="use-food-orangecupcake.png"
+        image="use/food/orangecupcake.png"
         name="Laced Orange Cupcake"
         description="A very soft orange cupcake, laced with Mopox cure potion."
         effect="+100 HP"
@@ -2799,7 +2799,7 @@
         <sprite gender="female">equipment/chest/valentine-dress.xml|#BF0E08</sprite>
     </item>
     <item id="784"
-        image="use-food-zombie-nachos.png"
+        image="use/food/zombie-nachos.png"
         name="Zombie Nachos"
         description="The flavor is in the brains."
         effect="+60 HP"
@@ -2808,7 +2808,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="785"
-        image="use-food-lady-fingers.png"
+        image="use/food/lady-fingers.png"
         name="Lady Fingers"
         description="Made with simulated lady fingers."
         effect="+40 HP"
@@ -2817,7 +2817,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="786"
-        image="use-food-jello.png"
+        image="use/food/jello.png"
         name="Slime Jell-Ahh"
         description="Finally, an edible form of slime!"
         effect="+50 HP"
@@ -2826,7 +2826,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="787"
-        image="use-food-snapple.png"
+        image="use/food/snapple.png"
         name="Snapple"
         description="Bite it before it bites you!"
         effect="+70 HP"
@@ -2835,7 +2835,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="788"
-        image="use-food-juice.png"
+        image="use/food/juice.png"
         name="Beetle Juice"
         description="Thist quencing and nutritious!"
         effect="+50 HP"
@@ -2844,7 +2844,7 @@
         weight="5"
         max-per-slot="10"/>
     <item id="789"
-        image="use-food-skull-mug.png"
+        image="use/food/skull-mug.png"
         name="Gut Buster Ale"
         description="If you can survive the first gulp, the rest goes down smooth."
         effect="+60 HP"
@@ -2853,7 +2853,7 @@
         weight="5"
         max-per-slot="10"/>
 	<item id="790"
-        image="use-food-wine.png"
+        image="use/food/wine.png"
         name="Blood Wine"
         description="A good vintage."
         effect="+100 HP"
@@ -3409,7 +3409,7 @@
         weight="10"
         max-per-slot="5"/>
     <item id="1224"
-        image="generic-scroll.png"
+        image="generic/scroll.png"
         name="Scroll of Paper"
         description="A scroll made of fine paper."
         effect=""
@@ -3451,7 +3451,7 @@
         luck="5"/>
 
     <item id="1229"
-        image="generic-caramelapple.png"
+        image="use/food/caramelapple.png"
         name="Caramel Apple"
         description="A caramel coated apple, complete with stick. Rots teeth, tastes good."
         type="usable"
@@ -3461,7 +3461,7 @@
         max-per-slot="200"/>
 
     <item id="1230"
-        image="generic-lollipop.png|W:#2502d6"
+        image="use/food/lollipop.png|W:#2502d6"
         name="Booberry Blue Lollipop"
         description="A lollipop. Mmm."
         type="usable"
@@ -3471,7 +3471,7 @@
         max-per-slot="200"/>
 
     <item id="1231"
-        image="generic-lollipop.png|W:#00ba16"
+        image="use/food/lollipop.png|W:#00ba16"
         name="Ghastly Green Lollipop"
         description="A lollipop. Tasty."
         type="usable"
@@ -3481,7 +3481,7 @@
         max-per-slot="200"/>
 
     <item id="1232"
-        image="generic-lollipop.png|W:#e00418"
+        image="use/food/lollipop.png|W:#e00418"
         name="Blood Red Lollipop"
         description="A lollipop. Yum."
         type="usable"
@@ -3600,7 +3600,7 @@
         <sprite>equipment/head/heart-glasses.xml</sprite>
     </item>
     <item id="1248"
-        image="use-blueberries.png"
+        image="use/food/blueberries.png"
         name="Blueberries"
         description="Blueberries from another world. Unusually refreshing, from a world of death."
         effect="+800 HP"
@@ -3615,7 +3615,7 @@
         type="generic"
         weight="3"/>
     <item id="1250"
-        image="use-food-pear.png"
+        image="use/food/pear.png"
         name="Pear"
         description="A pear. Taken from a tree of many fruits from a distant world."
         effect="+200 HP"
@@ -3623,7 +3623,7 @@
         hp="200"
         weight="7"/>
     <item id="1251"
-        image="use-food-yellow-plum.png"
+        image="use/food/yellow-plum.png"
         name="Yellow plum"
         description="A plum. Taken from a tree of many fruits from a distant world."
         effect="+300 HP"
@@ -3631,7 +3631,7 @@
         hp="300"
         weight="10"/>
     <item id="1252"
-        image="use-food-cherry.png"
+        image="use/food/cherry.png"
         name="Cherry"
         description="A cherry. Taken from a tree of many fruits from a distant world."
         effect="+250 HP"
@@ -3639,7 +3639,7 @@
         hp="250"
         weight="5"/>
     <item id="1253"
-        image="use-food-apple.png|R:#B3AB77;Y:#FFC030;G:#66CC33"
+        image="use/food/apple.png|R:#B3AB77;Y:#FFC030;G:#66CC33"
         name="Golden delicious apple"
         description="A golden apple. Taken from a tree of many fruits from a distant world."
         effect="+200 HP"
@@ -3734,7 +3734,7 @@
         type="usable"
         weight="120"/>
      <item id="1281"
-        image="use-food-shock-candy.png"
+        image="use/food/shock-candy.png"
         name="Shock Sweet"
         description="It'll turn your hair white!"
         type="usable"
@@ -5747,31 +5747,31 @@
         type="generic"
         weight="5"/>
     <item id="3006"
-        image="generic-tonoridelight.png"
+        image="use/food/tonoridelight.png"
         name="Tonori Delight"
         description="A softly-scented jelly-like treat, dusted with the sweet white sands of Eastern Tonori."
         type="generic"
         weight="2"/>
     <item id="3007"
-        image="generic-marshmallow.png"
+        image="use/food/marshmallow.png"
         name="Marshmallow"
         description="Flavoured with real marshmallow root."
         type="generic"
         weight="2"/>
     <item id="3009"
-        image="generic-jellyskull.png"
+        image="use/food/jellyskull.png"
         name="Jelly Skull"
         description="Like a jelly bean, but in the shape of skull."
         type="generic"
         weight="2"/>
     <item id="3010"
-        image="generic-candypumpkin.png"
+        image="use/food/candypumpkin.png"
         name="Candy Pumpkin"
         description="With a squishy interior inside a hard, crunchy shell, this sweet has a warm and delcious pumpkin flavour."
         type="generic"
         weight="2"/>
     <item id="3011"
-        image="generic-pumpkinseed.png"
+        image="generic/pumpkinseed.png"
         name="Pumpkin Seeds"
         description="The seeds from a seasonal pumpkin vine."
         type="generic"