diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/2021_bat_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/bat.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/2021_bat_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/bat.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bat_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/bat_0.json
deleted file mode 100644
index 8f89ebd360..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/bat_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "bat", "fg": ["2021_bat_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/2020_bat_metal_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/bat_metal.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/2020_bat_metal_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/bat_metal.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bat_metal_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/bat_metal_0.json
deleted file mode 100644
index 0a854568cc..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/bat_metal_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "bat_metal", "fg": ["2020_bat_metal_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bat_nerf.png b/gfx/NeoDays/pngs_tiles_10x10/items/bat_nerf.png
new file mode 100644
index 0000000000..5814be63c0
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/bat_nerf.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bottle_gourd.png b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_gourd.png
new file mode 100644
index 0000000000..5345f01b2a
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_gourd.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic.json b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic.json
deleted file mode 100644
index 6700f70c68..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "id": [
-    "bottle_plastic",
-    "bottle_plastic_small",
-    "bottle_twoliter"
-  ],
-  "fg": "bottle_plastic"
-}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic_small.png b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic_small.png
new file mode 100644
index 0000000000..40cba619ca
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_plastic_small.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bottle_twoliter.png b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_twoliter.png
new file mode 100644
index 0000000000..5596baec16
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/bottle_twoliter.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1175_bucket_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/bucket.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/1175_bucket_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/bucket.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bucket_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/bucket_0.json
deleted file mode 100644
index cca9024f98..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/bucket_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "bucket", "fg": ["1175_bucket_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/bucket_wood.png b/gfx/NeoDays/pngs_tiles_10x10/items/bucket_wood.png
new file mode 100644
index 0000000000..c2e22be586
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/bucket_wood.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/condiment_bottle_sealed.png b/gfx/NeoDays/pngs_tiles_10x10/items/condiment_bottle_sealed.png
new file mode 100644
index 0000000000..d06b86892f
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/condiment_bottle_sealed.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/dry_bottle_gourd.png b/gfx/NeoDays/pngs_tiles_10x10/items/dry_bottle_gourd.png
new file mode 100644
index 0000000000..794225405f
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/dry_bottle_gourd.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/plastic_bucket.png b/gfx/NeoDays/pngs_tiles_10x10/items/plastic_bucket.png
new file mode 100644
index 0000000000..9e5d81bf4a
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/plastic_bucket.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/1173_plastic_shopping_bag_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/plastic_shopping_bag.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/1173_plastic_shopping_bag_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/plastic_shopping_bag.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/plastic_shopping_bag_plastic_bucket_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/plastic_shopping_bag_plastic_bucket_0.json
deleted file mode 100644
index 8400fa61fe..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/plastic_shopping_bag_plastic_bucket_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["plastic_shopping_bag", "plastic_bucket"], "fg": ["1173_plastic_shopping_bag_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/plastic_six_dice.png b/gfx/NeoDays/pngs_tiles_10x10/items/plastic_six_dice.png
new file mode 100644
index 0000000000..ef980e135b
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/plastic_six_dice.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/raw_bottle_gourd.png b/gfx/NeoDays/pngs_tiles_10x10/items/raw_bottle_gourd.png
new file mode 100644
index 0000000000..82f089731c
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/raw_bottle_gourd.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/plastic_fork.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/plastic_fork.png
new file mode 100644
index 0000000000..909af64421
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/plastic_fork.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/plastic_spoon.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/plastic_spoon.png
new file mode 100644
index 0000000000..24cfbfb1e9
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/tools/kitchenware/plastic_spoon.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/tools/multimeter.png b/gfx/NeoDays/pngs_tiles_10x10/items/tools/multimeter.png
new file mode 100644
index 0000000000..6d8d1cd645
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/tools/multimeter.png differ