diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/leaves/leaves.png b/gfx/MShockXotto+/pngs_small_20x20/items/leaves/leaves.png
new file mode 100644
index 0000000000..17e4a05669
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/leaves/leaves.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/leaves/young_leaves.png b/gfx/MShockXotto+/pngs_small_20x20/items/leaves/young_leaves.png
new file mode 100644
index 0000000000..bf4cda9518
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/leaves/young_leaves.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/twig.png b/gfx/MShockXotto+/pngs_small_20x20/items/twig.png
new file mode 100644
index 0000000000..7be83265b3
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/twig.png differ
diff --git a/gfx/MShockXotto+/pngs_tall_32x48/furniture/f_statue/f_statue.png b/gfx/MShockXotto+/pngs_tall_32x48/furniture/f_statue/f_statue.png
new file mode 100644
index 0000000000..c7cbefbe19
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tall_32x48/furniture/f_statue/f_statue.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_reciprocating_saw/overlay_wielded_reciprocating_saw.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_reciprocating_saw/overlay_wielded_reciprocating_saw.png
new file mode 100644
index 0000000000..43fb8ef102
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_reciprocating_saw/overlay_wielded_reciprocating_saw.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/1583_f_statue_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/1583_f_statue_0.png
deleted file mode 100644
index 4a6dcf50a8..0000000000
Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/1583_f_statue_0.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_statue_t_sliding_brick_wall_control_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_statue_t_sliding_brick_wall_control_0.json
deleted file mode 100644
index 2dff7052e3..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/furniture/f_statue_t_sliding_brick_wall_control_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["f_statue", "t_sliding_brick_wall_control"], "fg": ["1583_f_statue_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/m203/m203.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/m203/m203.png
new file mode 100644
index 0000000000..b6e264d066
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/m203/m203.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/reciprocating_saw/reciprocating_saw.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/reciprocating_saw/reciprocating_saw.png
new file mode 100644
index 0000000000..f88f1ebae9
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/item/reciprocating_saw/reciprocating_saw.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/2383_mon_coyote_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/2383_mon_coyote_0.png
deleted file mode 100644
index e69a94666a..0000000000
Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/monster/2383_mon_coyote_0.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/2385_mon_coyote_wolf_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/2385_mon_coyote_wolf_0.png
deleted file mode 100644
index c6f1030c66..0000000000
Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/monster/2385_mon_coyote_wolf_0.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/2547_mon_moose_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/2547_mon_moose_0.png
deleted file mode 100644
index f0f0ea783e..0000000000
Binary files a/gfx/MShockXotto+/pngs_tiles_32x32/monster/2547_mon_moose_0.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/coyote/mon_coyote.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/coyote/mon_coyote.png
new file mode 100644
index 0000000000..453e14f6c9
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/monster/coyote/mon_coyote.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/coyote/mon_coyote_mutant_shark.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/coyote/mon_coyote_mutant_shark.png
new file mode 100644
index 0000000000..966d497849
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/monster/coyote/mon_coyote_mutant_shark.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_coyote_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_coyote_0.json
deleted file mode 100644
index cacbf87a40..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_coyote_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "mon_coyote", "fg": ["2383_mon_coyote_0"], "bg": ["shadow_32x32_normal"], "rotates": false}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_coyote_wolf_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_coyote_wolf_0.json
deleted file mode 100644
index dd991e4189..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_coyote_wolf_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "mon_coyote_wolf", "fg": ["2385_mon_coyote_wolf_0"], "bg": ["shadow_32x32_normal"], "rotates": false}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_moose_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_moose_0.json
deleted file mode 100644
index 47a6d8e46b..0000000000
--- a/gfx/MShockXotto+/pngs_tiles_32x32/monster/mon_moose_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": "mon_moose", "fg": ["2547_mon_moose_0"], "bg": ["shadow_32x32_normal"], "rotates": false}
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_wide_48x48/monsters/mon_moose/mon_moose.png b/gfx/MShockXotto+/pngs_wide_48x48/monsters/mon_moose/mon_moose.png
new file mode 100644
index 0000000000..dc6a5cd69c
Binary files /dev/null and b/gfx/MShockXotto+/pngs_wide_48x48/monsters/mon_moose/mon_moose.png differ