diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_bed.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_bed.json
index 9308b7b553..8314a53c76 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_bed.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/furniture/indoors/f_bed.json
@@ -2,7 +2,9 @@
   "id": [
     "f_bed",
     "f_floor_mattress",
-    "f_down_mattress"
+    "f_down_mattress",
+    "tr_mattress",
+    "tr_down_mattress"
   ],
   "//": "different sprite(s) for mattresses later",
   "fg": "f_makeshift_bed_0",
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/ap_box_battery_charger.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/ap_box_battery_charger.json
new file mode 100644
index 0000000000..61800418a2
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/ap_box_battery_charger.json
@@ -0,0 +1,8 @@
+{
+  "id": [
+    "vp_ap_box_battery_charger",
+    "vp_ap_foot_locker_recharge_station"
+  ],
+  "fg": "vp_recharge_station",
+  "//": "vehicle part"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.json
new file mode 100644
index 0000000000..41b6f95bd9
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "f_air_compressor",
+    "vp_ap_air_compressor"
+  ],
+  "fg": "f_air_compressor"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.png
new file mode 100644
index 0000000000..3ea8cd0114
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_air_compressor.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.json
new file mode 100644
index 0000000000..60600da83b
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "f_bandsaw",
+    "vp_ap_bandsaw"
+  ],
+  "fg": "f_bandsaw"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.png
new file mode 100644
index 0000000000..469481a4f1
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_bandsaw.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.json b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.json
new file mode 100644
index 0000000000..4c5015d779
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "f_tablesaw",
+    "vp_ap_tablesaw"
+  ],
+  "fg": "f_tablesaw"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.png
new file mode 100644
index 0000000000..bd990f946c
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_tablesaw.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_water_heater_family.png b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_water_heater_family.png
new file mode 100644
index 0000000000..1d710456a9
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/furniture/utility/f_water_heater_family.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/air_compressor.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/air_compressor.png
new file mode 100644
index 0000000000..c53b1eaa4e
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/air_compressor.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bandsaw.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bandsaw.png
new file mode 100644
index 0000000000..bb90c55555
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bandsaw.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bigmirror.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bigmirror.png
new file mode 100644
index 0000000000..49531f7b60
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/bigmirror.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.json b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.json
new file mode 100644
index 0000000000..fd37fa32db
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "box_battery_charger",
+    "foot_locker_recharge_station"
+  ],
+  "fg": "box_battery_charger"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.png
new file mode 100644
index 0000000000..7e9d09aeb0
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/box_battery_charger.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/household_water_heater_family.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/household_water_heater_family.png
new file mode 100644
index 0000000000..e9fd076bff
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/household_water_heater_family.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/standing_lamp.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/standing_lamp.png
new file mode 100644
index 0000000000..26affe7709
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/standing_lamp.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/deployables/tablesaw.png b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/tablesaw.png
new file mode 100644
index 0000000000..b53f0e2b0b
Binary files /dev/null and b/gfx/NeoDays/pngs_tiles_10x10/items/deployables/tablesaw.png differ
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json b/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json
index cb2c8ab598..5a0574371f 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/mayonnaise.json
@@ -13,6 +13,8 @@
      "meal_bone",
      "meal_bone_tainted",
      "starch",
+     "sourdough_young_uncovered",
+     "sourdough_split_uncovered",
      "mayonnaise"
   ],
   "fg": ["mayonnaise"]
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/2148_mirror_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/mirror.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/2148_mirror_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/mirror.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mirror_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/mirror_0.json
deleted file mode 100644
index d97e3bfe01..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/mirror_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "mirror", "fg": ["2148_mirror_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mustard.json b/gfx/NeoDays/pngs_tiles_10x10/items/mustard.json
new file mode 100644
index 0000000000..8c4bb284ea
--- /dev/null
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/mustard.json
@@ -0,0 +1,9 @@
+{
+  "id": [
+    "mustard",
+    "honey_bottled",
+    "sourdough_starter_uncovered",
+    "marloss_gel"
+  ],
+  "fg": "mustard"
+}
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/951_mustard_0.png b/gfx/NeoDays/pngs_tiles_10x10/items/mustard.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/951_mustard_0.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/mustard.png
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/mustard_honey_bottled_marloss_gel_0.json b/gfx/NeoDays/pngs_tiles_10x10/items/mustard_honey_bottled_marloss_gel_0.json
deleted file mode 100644
index d4a4b7e5b8..0000000000
--- a/gfx/NeoDays/pngs_tiles_10x10/items/mustard_honey_bottled_marloss_gel_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["mustard", "honey_bottled", "marloss_gel"], "fg": ["951_mustard_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/recharge_station.json b/gfx/NeoDays/pngs_tiles_10x10/items/vehicle/recharge_station.json
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/recharge_station.json
rename to gfx/NeoDays/pngs_tiles_10x10/items/vehicle/recharge_station.json
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/m4a1.json b/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/rifle_semi.json
similarity index 76%
rename from gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/m4a1.json
rename to gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/rifle_semi.json
index 5f1277a9cb..e33ec27401 100644
--- a/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/m4a1.json
+++ b/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/rifle_semi.json
@@ -1,11 +1,13 @@
 {
   "id": [
+    "rifle_semi",
     "m4a1",
     "hk_g3",
     "hk_g36",
     "arx160",
     "acr",
     "ar15",
+    "modular_ar15",
     "scar_l",
     "scar_h",
     "m107a1",
@@ -13,5 +15,5 @@
     "m27iar",
     "rm51_assault_rifle"
   ],
-  "fg": "m4a1"
+  "fg": "rifle_semi"
 }
diff --git a/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/m4a1.png b/gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/rifle_semi.png
similarity index 100%
rename from gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/m4a1.png
rename to gfx/NeoDays/pngs_tiles_10x10/items/weaponry/firearm/rifle_semi.png