diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/brownie_brownie_weed_cake2_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/brownie_brownie_weed_cake2_0.json
deleted file mode 100644
index ed572296e8..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/brownie_brownie_weed_cake2_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["brownie", "brownie_weed", "cake2"], "fg": ["1091_brownie_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/candy2_candy3_neccowafers_gummy_vitamins_maple_candy_candy_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/candy2_candy3_neccowafers_gummy_vitamins_maple_candy_candy_0.json
deleted file mode 100644
index b4a3057e0c..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/candy2_candy3_neccowafers_gummy_vitamins_maple_candy_candy_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["candy2", "candy3", "neccowafers", "gummy_vitamins", "maple_candy", "candy"], "fg": ["941_candy2_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/cheese_hard_cheese_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/cheese_hard_cheese_0.json
deleted file mode 100644
index 7ef925dec3..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/cheese_hard_cheese_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["cheese_hard", "cheese"], "fg": ["1088_cheese_hard_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/clay_lump.json b/gfx/NeoDays/pngs_tiles_10x10/items/clay_lump.json
new file mode 100644
index 0000000000..9e0a4ed13e
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/clay_lump.json
@@ -0,0 +1,9 @@
+{
+  "id": [
+    "clay_lump",
+    "clay_boiled",
+    "chocolate",
+    "chocolate_military"
+  ],
+  "fg": "clay_lump"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1059_clay_lump_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/clay_lump.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/1059_clay_lump_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/clay_lump.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/clay_lump_clay_boiled_clay_lump_chocolate_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/clay_lump_clay_boiled_clay_lump_chocolate_0.json
deleted file mode 100644
index 5f83a5b78c..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/clay_lump_clay_boiled_clay_lump_chocolate_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["clay_lump", "clay_boiled", "chocolate"], "fg": ["1059_clay_lump_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/cake2.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/cake2.json
new file mode 100644
index 0000000000..4a8ad3bc4c
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/cake2.json
@@ -0,0 +1,10 @@
+{
+  "id": [
+    "cake2",
+    "hazelnut_cake",
+    "tiramisu",
+    "brownie",
+    "brownie_weed"
+  ],
+  "fg": "cake2"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1091_brownie_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/cake2.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/1091_brownie_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/food/cake2.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/cake3.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/cake3.json
new file mode 100644
index 0000000000..8bc20d87a6
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/cake3.json
@@ -0,0 +1,8 @@
+{
+  "id": [
+    "cake3",
+    "space_cake",
+    "jihelucake"
+  ],
+  "fg": "cake3"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1092_jihelucake_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/cake3.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/1092_jihelucake_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/food/cake3.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/candy.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/candy.json
new file mode 100644
index 0000000000..95cb8283ad
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/candy.json
@@ -0,0 +1,13 @@
+{
+  "id": [
+    "candy",
+    "candy2",
+    "candy3",
+    "candy4",
+    "candy5",
+    "neccowafers",
+    "gummy_vitamins",
+    "maple_candy"
+  ],
+  "fg": "candy"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/941_candy2_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/candy.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/941_candy2_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/food/candy.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/cheese.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/cheese.json
new file mode 100644
index 0000000000..e21155b1e9
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/cheese.json
@@ -0,0 +1,8 @@
+{
+  "id": [
+    "cheese",
+    "cheese_hard",
+    "pecorino_cheese"
+  ],
+  "fg": "cheese"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1088_cheese_hard_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/cheese.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/1088_cheese_hard_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/food/cheese.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/guayaba.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/guayaba.json
new file mode 100644
index 0000000000..2016ea9c5e
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/guayaba.json
@@ -0,0 +1,8 @@
+{
+  "id": [
+    "guayaba",
+    "mayapple"
+  ],
+  "fg": "guayaba",
+  "//": "this is a lime, rename it to a lime if we ever get limes"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/guayaba.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/guayaba.png
new file mode 100644
index 0000000000..ebfaa09b8b
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/guayaba.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/lemon.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/lemon.json
index 89a7cbe304..80b19dc13f 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/lemon.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/fruit/lemon.json
@@ -1,7 +1,8 @@
 {
   "id": [
     "lemon",
-    "irradiated_lemon"
+    "irradiated_lemon",
+    "egg_goose_golden"
   ],
   "fg": "lemon"
 }
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/licorice.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/licorice.png
new file mode 100644
index 0000000000..815094ba7d
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/food/licorice.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json
index f85b508506..03a1e792b9 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish.json
@@ -1,6 +1,7 @@
 {
   "id": [
     "fish",
+    "mollusk",
     "lunchmeat",
     "fried_spam",
     "meat_aspic",
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_smoked.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_smoked.json
index 84d6229781..89eddd241d 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_smoked.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/fish_smoked.json
@@ -3,7 +3,6 @@
     "fish_smoked",
     "pemmican",
     "hflesh_pemmican",
-    "toasterpastry",
     "cloutie_dumpling",
     "haggis",
     "human_haggis",
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/meatball_raw.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/meatball_raw.png
new file mode 100644
index 0000000000..257dc7054f
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/meatball_raw.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_raw.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_raw.png
new file mode 100644
index 0000000000..d365131f77
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_raw.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1003_sausage_wasteland_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_wasteland.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/1003_sausage_wasteland_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_wasteland.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_wasteland_raw.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_wasteland_raw.png
new file mode 100644
index 0000000000..4e20df1d41
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/food/meats/sausage_wasteland_raw.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/sandwiches/sandwich_veggy_cheese.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/sandwiches/sandwich_veggy_cheese.json
new file mode 100644
index 0000000000..719eb9df09
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/sandwiches/sandwich_veggy_cheese.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "sandwich_veggy_cheese",
+    "sandwich_veggy_cheese_wheat_free"
+  ],
+  "fg": "sandwich_veggy_cheese"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/sandwiches/sandwich_veggy_cheese.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/sandwiches/sandwich_veggy_cheese.png
new file mode 100644
index 0000000000..72f22ede7d
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/food/sandwiches/sandwich_veggy_cheese.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/spaghetti_raw.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/spaghetti_raw.json
new file mode 100644
index 0000000000..3f9ff209a0
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/spaghetti_raw.json
@@ -0,0 +1,10 @@
+{
+  "id": [
+    "spaghetti_raw",
+    "cracklins",
+    "porkstick",
+    "wild_sarsaparilla_root",
+    "mre_hotdog"
+  ],
+  "fg": "spaghetti_raw"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1022_spaghetti_raw_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/spaghetti_raw.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/1022_spaghetti_raw_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/food/spaghetti_raw.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/sponge_cake.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/sponge_cake.png
new file mode 100644
index 0000000000..f1027d18ab
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/food/sponge_cake.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/succotash.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/succotash.json
new file mode 100644
index 0000000000..00c52efff1
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/succotash.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "succotash",
+    "succotash_deluxe"
+  ],
+  "fg": "succotash"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/succotash.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/succotash.png
new file mode 100644
index 0000000000..0d24301838
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/food/succotash.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/toasterpastry.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/toasterpastry.png
new file mode 100644
index 0000000000..2943eb35fb
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/food/toasterpastry.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/horseradish_root.png b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/horseradish_root.png
new file mode 100644
index 0000000000..f3330b069b
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/horseradish_root.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.json b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.json
index 8dea9231c7..819af240fa 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/food/vegetables/young_leaves.json
@@ -5,6 +5,8 @@
     "tea_raw",
     "tea_green_raw",
     "grape_leaves",
+    "horseradish_greens",
+    "spinach",
     "seasoning_italian"
   ],
   "fg": "young_leaves"
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/jihelucake_cake3_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/jihelucake_cake3_0.json
deleted file mode 100644
index 0b835c269a..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/jihelucake_cake3_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["jihelucake", "cake3"], "fg": ["1092_jihelucake_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_beans.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_beans.json
index 65d0e84bdf..05fe3bd7ee 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_beans.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_beans.json
@@ -6,6 +6,7 @@
     "hobo_helper",
     "pork_beans",
     "peanutbutter",
+    "spread_peanutbutter",
     "deluxe_beans",
     "deluxe_veggy_beans",
     "deluxe_beansnrice",
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json
index df1ebe46bd..535cdee6c1 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_clams.json
@@ -4,6 +4,7 @@
     "can_chowder",
     "rehydrated_fish",
     "milk_powder",
+    "coconut_flesh",
     "dry_rice",
     "dry_wild_rice",
     "rice_cooked",
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json
index 65e6031052..15ba6b5fb1 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/piles/can_corn.json
@@ -9,6 +9,7 @@
     "deluxe_rice",
     "deluxe_veggy_rice",
     "can_cheese",
+    "cheese_powder",
     "chem_sulphur",
     "cheese_grits",
     "corn_kernels",
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/piles/crack.json b/gfx/NeoDays/pngs_tiles_10x10/items/piles/crack.json
index ca2be45e0a..c557248954 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/piles/crack.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/piles/crack.json
@@ -10,6 +10,7 @@
     "pine_nuts",
     "cinnamon",
     "fried_seeds",
+    "dry_soybean",
     "sauerkraut",
     "sauerkraut_onions",
     "chem_compositionb",
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/cooking_oil.json b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/cooking_oil.json
index 97607ddd3d..95f58d9654 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/cooking_oil.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/cooking_oil.json
@@ -6,6 +6,8 @@
     "hflesh_shake_fortified",
     "hflesh_shake",
     "mead",
+    "cheese_rehydrated",
+    "rehydrated_eggs",
     "brew_mead",
     "dandelion_wine",
     "brew_dandelion_wine",
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json
index 4d8be8015a..c6daeac38d 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/puddles/sewage.json
@@ -31,6 +31,7 @@
     "imperial_stout",
     "syrup",
     "coffee_syrup",
+    "pekmez",
     "brew_whiskey",
     "hb_beer",
     "brew_hb_beer",
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/sausage_wasteland_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/sausage_wasteland_0.json
deleted file mode 100644
index a1fb7abcee..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/sausage_wasteland_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "sausage_wasteland", "fg": ["1003_sausage_wasteland_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/spaghetti_raw_cracklins_porkstick_mre_hotdog_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/spaghetti_raw_cracklins_porkstick_mre_hotdog_0.json
deleted file mode 100644
index 33eeb5349b..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/spaghetti_raw_cracklins_porkstick_mre_hotdog_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["spaghetti_raw", "cracklins", "porkstick", "mre_hotdog"], "fg": ["1022_spaghetti_raw_0"], "rotates": false, "bg": []}
\ No newline at end of file