diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/glasses_monocle/credits.txt b/gfx/MShockXotto+/pngs_small_20x20/items/glasses_monocle/credits.txt
new file mode 100644
index 0000000000..c8d6c499d1
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_small_20x20/items/glasses_monocle/credits.txt
@@ -0,0 +1 @@
+Ryu
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/glasses_monocle/glasses_monocle.png b/gfx/MShockXotto+/pngs_small_20x20/items/glasses_monocle/glasses_monocle.png
new file mode 100644
index 0000000000..ad596a3b3d
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/glasses_monocle/glasses_monocle.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/lug_wrench/credits.txt b/gfx/MShockXotto+/pngs_small_20x20/items/lug_wrench/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_small_20x20/items/lug_wrench/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/lug_wrench/lug_wrench.png b/gfx/MShockXotto+/pngs_small_20x20/items/lug_wrench/lug_wrench.png
new file mode 100644
index 0000000000..c37a0dc4ba
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/lug_wrench/lug_wrench.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/machetes/credits.txt b/gfx/MShockXotto+/pngs_small_20x20/items/machetes/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_small_20x20/items/machetes/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/machetes/machete.png b/gfx/MShockXotto+/pngs_small_20x20/items/machetes/machete.png
new file mode 100644
index 0000000000..7b6847ec5d
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/machetes/machete.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/machetes/machete_gimmick.png b/gfx/MShockXotto+/pngs_small_20x20/items/machetes/machete_gimmick.png
new file mode 100644
index 0000000000..0666590123
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/machetes/machete_gimmick.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/machetes/makeshift_machete.png b/gfx/MShockXotto+/pngs_small_20x20/items/machetes/makeshift_machete.png
new file mode 100644
index 0000000000..713d6de246
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/machetes/makeshift_machete.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/machetes/survivor_machete.png b/gfx/MShockXotto+/pngs_small_20x20/items/machetes/survivor_machete.png
new file mode 100644
index 0000000000..88b45c0e67
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/machetes/survivor_machete.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/sickles/credits.txt b/gfx/MShockXotto+/pngs_small_20x20/items/sickles/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_small_20x20/items/sickles/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/sickles/sickle.png b/gfx/MShockXotto+/pngs_small_20x20/items/sickles/sickle.png
new file mode 100644
index 0000000000..39b0390de2
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/sickles/sickle.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/sickles/sickle_stone.png b/gfx/MShockXotto+/pngs_small_20x20/items/sickles/sickle_stone.png
new file mode 100644
index 0000000000..e80c8cf371
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/sickles/sickle_stone.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/smart_lamp/credits.txt b/gfx/MShockXotto+/pngs_small_20x20/items/smart_lamp/credits.txt
new file mode 100644
index 0000000000..c8d6c499d1
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_small_20x20/items/smart_lamp/credits.txt
@@ -0,0 +1 @@
+Ryu
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/smart_lamp/smart_lamp.png b/gfx/MShockXotto+/pngs_small_20x20/items/smart_lamp/smart_lamp.png
new file mode 100644
index 0000000000..9417778986
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/smart_lamp/smart_lamp.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/smart_lamp/smart_lamp_on.png b/gfx/MShockXotto+/pngs_small_20x20/items/smart_lamp/smart_lamp_on.png
new file mode 100644
index 0000000000..256a35604d
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/smart_lamp/smart_lamp_on.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/3669_overlay_wielded_hoe_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/3669_overlay_wielded_hoe_0.png
deleted file mode 100644
index 0292499f51..0000000000
Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/3669_overlay_wielded_hoe_0.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/3681_overlay_wielded_scythe_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/3681_overlay_wielded_scythe_0.png
deleted file mode 100644
index ebb2f3836b..0000000000
Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/3681_overlay_wielded_scythe_0.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/3683_overlay_wielded_sickle_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/3683_overlay_wielded_sickle_0.png
deleted file mode 100644
index 060abb1452..0000000000
Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/3683_overlay_wielded_sickle_0.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hoe/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hoe/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hoe/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hoe/overlay_wielded_hoe.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hoe/overlay_wielded_hoe.png
new file mode 100644
index 0000000000..08a8dfd5fb
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hoe/overlay_wielded_hoe.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hoe_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hoe_0.json
deleted file mode 100644
index 7fa7be4cfa..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_hoe_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "overlay_wielded_hoe", "fg": ["3669_overlay_wielded_hoe_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_khopesh/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_khopesh/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_khopesh/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_khopesh/overlay_wielded_khopesh.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_khopesh/overlay_wielded_khopesh.png
new file mode 100644
index 0000000000..c24dff4a13
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_khopesh/overlay_wielded_khopesh.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_khopesh_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_khopesh_0.json
deleted file mode 100644
index 287f694d40..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_khopesh_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "overlay_wielded_khopesh", "fg": ["3683_overlay_wielded_sickle_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_lug_wrench/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_lug_wrench/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_lug_wrench/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_lug_wrench/overlay_wielded_lug_wrench.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_lug_wrench/overlay_wielded_lug_wrench.png
new file mode 100644
index 0000000000..0d24fcf7ef
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_lug_wrench/overlay_wielded_lug_wrench.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_machete.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_machete.png
new file mode 100644
index 0000000000..a65f6153dc
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_machete.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_machete_gimmick.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_machete_gimmick.png
new file mode 100644
index 0000000000..902f0ea97d
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_machete_gimmick.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_makeshift_machete.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_makeshift_machete.png
new file mode 100644
index 0000000000..87d766ad99
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_makeshift_machete.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_survivor_machete.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_survivor_machete.png
new file mode 100644
index 0000000000..f8e197b5ad
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete/overlay_wielded_survivor_machete.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete_0.json
deleted file mode 100644
index 9d86ea7fdf..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_machete_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "overlay_wielded_machete", "fg": ["3660_overlay_wielded_firemachete_off_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_makeshift_machete_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_makeshift_machete_0.json
deleted file mode 100644
index b723903fed..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_makeshift_machete_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "overlay_wielded_makeshift_machete", "fg": ["3660_overlay_wielded_firemachete_off_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_makeshift_scythe_war.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_makeshift_scythe_war.png
new file mode 100644
index 0000000000..a6f5e2d6a4
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_makeshift_scythe_war.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_scythe.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_scythe.png
new file mode 100644
index 0000000000..4bdfecdf03
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_scythe.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_scythe_toy.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_scythe_toy.png
new file mode 100644
index 0000000000..02aaa559db
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_scythe_toy.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_scythe_war.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_scythe_war.png
new file mode 100644
index 0000000000..2365e00ec9
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe/overlay_wielded_scythe_war.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe_0.json
deleted file mode 100644
index 86d60d0314..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "overlay_wielded_scythe", "fg": ["3681_overlay_wielded_scythe_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe_war_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe_war_0.json
deleted file mode 100644
index 0806e47cc2..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_scythe_war_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "overlay_wielded_scythe_war", "fg": ["3681_overlay_wielded_scythe_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle/overlay_wielded_sickle.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle/overlay_wielded_sickle.png
new file mode 100644
index 0000000000..a68bb46913
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle/overlay_wielded_sickle.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle_0.json
deleted file mode 100644
index 141fb456e3..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "overlay_wielded_sickle", "fg": ["3683_overlay_wielded_sickle_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle_stone/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle_stone/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle_stone/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle_stone/overlay_wielded_sickle_stone.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle_stone/overlay_wielded_sickle_stone.png
new file mode 100644
index 0000000000..d247cae816
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_sickle_stone/overlay_wielded_sickle_stone.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_survivor_machete_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_survivor_machete_0.json
deleted file mode 100644
index ed09bd6bfc..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_survivor_machete_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "overlay_wielded_survivor_machete", "fg": ["3660_overlay_wielded_firemachete_off_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/machete/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/machete/credits.txt
deleted file mode 100644
index a4207e2962..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/machete/credits.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-https://sketchfab.com/3d-models/classic-machete-game-model-175bb0580dee4890800ce56a6c83b831
-model by monst
-rendered by int_ua
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/machete/machete.json b/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/machete/machete.json
deleted file mode 100644
index 0efc6f96aa..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/machete/machete.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": "machete",
-  "fg": ["machete"],
-  "bg": []
-}
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/machete/machete.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/machete/machete.png
deleted file mode 100644
index 85a81cbf56..0000000000
Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/machete/machete.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/hoe/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/item/hoe/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/item/hoe/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/hoe/hoe.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/hoe/hoe.png
new file mode 100644
index 0000000000..9cdbed839d
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/hoe/hoe.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/khopesh/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/item/khopesh/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/item/khopesh/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/khopesh/khopesh.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/khopesh/khopesh.png
new file mode 100644
index 0000000000..4c6e86a2e8
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/khopesh/khopesh.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/khopesh.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/khopesh.png
deleted file mode 100644
index a2d5d015b1..0000000000
Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/item/legacy_sprite/khopesh.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/makeshift_scythe_war/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/item/makeshift_scythe_war/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/item/makeshift_scythe_war/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/makeshift_scythe_war/makeshift_scythe_war.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/makeshift_scythe_war/makeshift_scythe_war.png
new file mode 100644
index 0000000000..ddbae33d8b
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/makeshift_scythe_war/makeshift_scythe_war.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/credits.txt b/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/credits.txt
new file mode 100644
index 0000000000..2dc4f0396f
--- /dev/null
+++ b/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/credits.txt
@@ -0,0 +1 @@
+oxnard
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe.png
new file mode 100644
index 0000000000..889e9250a7
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe_fake.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe_fake.png
new file mode 100644
index 0000000000..6480a9157c
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe_fake.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe_toy.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe_toy.png
new file mode 100644
index 0000000000..016fb31aef
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe_toy.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe_war.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe_war.png
new file mode 100644
index 0000000000..aeac0f9d50
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/scythes/scythe_war.png differ