diff --git a/Cargo.lock b/Cargo.lock
index 378d056b64..530a2072ed 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,9 +27,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.52"
+version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
+checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -60,12 +60,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "base-x"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -74,15 +68,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bumpalo"
-version = "3.9.1"
+version = "3.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
 
 [[package]]
 name = "bytemuck"
-version = "1.7.3"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439989e6b8c38d1b6570a384ef1e49c8848128f5a97f3914baef02920842712f"
+checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc"
 
 [[package]]
 name = "byteorder"
@@ -110,9 +104,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "core-foundation"
-version = "0.6.4"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -120,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.6.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "crc32fast"
@@ -158,12 +152,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "discard"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
-
 [[package]]
 name = "ff-particles"
 version = "0.1.2"
@@ -206,8 +194,8 @@ dependencies = [
 
 [[package]]
 name = "fishsticks"
-version = "0.2.1"
-source = "git+https://github.com/fishfight/fishsticks#ffd11a5b48abecadf8cd47033b1b26fff74b5557"
+version = "0.2.3"
+source = "git+https://github.com/fishfight/fishsticks#25bd7676c85064ad976c449317f30b623f5e7515"
 dependencies = [
  "cfg-if",
  "gilrs",
@@ -231,9 +219,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.4"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -244,9 +232,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs"
-version = "0.8.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1550c8bdebc993576e343d600a954654708a9a1182396ee1e805d6fe60c72909"
+checksum = "1d6ba7c37bf8ea7ba0c3e3795dfa1a7771b1e47c4bb417c4d27c7b338d79685f"
 dependencies = [
  "fnv",
  "gilrs-core",
@@ -257,9 +245,9 @@ dependencies = [
 
 [[package]]
 name = "gilrs-core"
-version = "0.3.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c7262ce1e88429c9b1d847820c9d2ba00adafc955218393d9c0861d5aaab88"
+checksum = "96a8d94a7fc5afd27e894e08a4cfe5a49237f85bcc7140e90721bad3399c7d02"
 dependencies = [
  "core-foundation",
  "io-kit-sys",
@@ -269,9 +257,9 @@ dependencies = [
  "log",
  "nix",
  "rusty-xinput",
- "stdweb",
  "uuid",
  "vec_map",
+ "wasm-bindgen",
  "web-sys",
  "winapi",
 ]
@@ -293,20 +281,20 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
+checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
 dependencies = [
  "ahash 0.7.6",
 ]
 
 [[package]]
 name = "hecs"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d4e8eb4d5dd2ea100ffbb4eb6814f4294a7362fcafbc5c1c4c015b41d16f424"
+checksum = "95ae6c6368add4cc6592ed9b48a270b35cf3a52d429355aaeb55822935526e94"
 dependencies = [
- "hashbrown 0.12.0",
+ "hashbrown 0.12.1",
  "spin",
 ]
 
@@ -333,9 +321,9 @@ dependencies = [
 
 [[package]]
 name = "io-kit-sys"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0"
+checksum = "7789f7f3c9686f96164f5109d69152de759e76e284f736bd57661c6df5091919"
 dependencies = [
  "core-foundation-sys",
  "mach",
@@ -343,15 +331,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
 
 [[package]]
 name = "js-sys"
-version = "0.3.56"
+version = "0.3.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
+checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -375,9 +363,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.118"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e509672465a0504304aa87f9f176f2b2b716ed8fb105ebe5c02dc6dce96a94"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
 name = "libudev-sys"
@@ -391,27 +379,27 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.14"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "mach"
-version = "0.2.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "macroquad"
-version = "0.3.13"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bbc44698249e98c7aedb8eef94b8806b5d68187c0c3d8c2a0912cb9efab1950"
+checksum = "6b723ade71357d07177c769af9ae42beff73c854e827ee5a4ec765dd2beb95e1"
 dependencies = [
  "bumpalo",
  "fontdue",
@@ -425,9 +413,9 @@ dependencies = [
 
 [[package]]
 name = "macroquad-platformer"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a912b373a1edc678242e262010d58e3e7e7977bf00227d5343dd9e641d52fa2"
+checksum = "927301bceb8c2781043a18611304b7b0a9d034b402321d4e099ef01c58ac0793"
 dependencies = [
  "macroquad",
 ]
@@ -444,20 +432,11 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
 
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "miniquad"
-version = "0.3.0-alpha.42"
+version = "0.3.0-alpha.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75bba73cbdaa1cb8f7889fcbb083941eae39ad4257d47e0d8e819d1de9963ba0"
+checksum = "c1462459fb1813decc7115ab4aed8f41183612557b08bf604bfb46b05286d703"
 dependencies = [
  "sapp-android",
  "sapp-darwin",
@@ -485,22 +464,20 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
 
 [[package]]
 name = "nix"
-version = "0.23.1"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
+checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9"
 dependencies = [
  "bitflags",
- "cc",
  "cfg-if",
  "libc",
- "memoffset",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
  "autocfg",
  "num-traits",
@@ -508,9 +485,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.42"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -530,9 +507,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
 ]
@@ -548,15 +525,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.9.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
+checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
+checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
 [[package]]
 name = "png"
@@ -572,11 +549,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -609,22 +586,13 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.15"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
+checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rusty-xinput"
 version = "1.2.0"
@@ -638,15 +606,15 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
 
 [[package]]
 name = "sapp-android"
-version = "0.1.14"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27c54dc8d8fc38874a0e5cca3a8fba35c7db8e46a3d65f47d0fc999aa48d6a9f"
+checksum = "9c0d0e6f562c01c533f693ac9c045d69cbeab24d2e16caaaa0e67d06ae6e0940"
 dependencies = [
  "libc",
  "ndk-sys",
@@ -654,9 +622,9 @@ dependencies = [
 
 [[package]]
 name = "sapp-darwin"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0310e2445f307468aa13f1cde94d6fba6b8fd329afbb642dedbe3faf1a145f31"
+checksum = "f1282369f486bc334efa2d76fa4d54c20b37664d83da14fc60afbe941814e374"
 dependencies = [
  "cc",
 ]
@@ -681,9 +649,9 @@ dependencies = [
 
 [[package]]
 name = "sapp-linux"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbdb2f8011955c62544d9e626a58333e788810d00bd7411d52b81611b92af142"
+checksum = "dc71510a7781d8f31d58046a9117682c8e8546ad43f52c0e31275db214495c3d"
 dependencies = [
  "libc",
 ]
@@ -696,42 +664,27 @@ checksum = "00e859e8645a3bcb85aecd40bab883438e4105f21b21bccbeac2348760f508bb"
 
 [[package]]
 name = "sapp-windows"
-version = "0.2.19"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3e9a4ab4682752ffcbbacf87b44c75373479331dfe408432280d305e0563c9c"
+checksum = "088f921b591fdcabf5f2dc17237be5203b6a1a6988f252d36e153f1442a8138e"
 dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "serde"
-version = "1.0.136"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
+checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.136"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
+checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -740,30 +693,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.79"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
+checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
 dependencies = [
  "itoa",
  "ryu",
  "serde",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-dependencies = [
- "sha1_smol",
-]
-
-[[package]]
-name = "sha1_smol"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
-
 [[package]]
 name = "smallvec"
 version = "0.6.14"
@@ -775,77 +713,26 @@ dependencies = [
 
 [[package]]
 name = "spin"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5"
-
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version",
- "serde",
- "serde_json",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1",
- "syn",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
+checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d"
 
 [[package]]
 name = "syn"
-version = "1.0.86"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
+checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "toml"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
 dependencies = [
  "serde",
 ]
@@ -857,16 +744,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ae2f58a822f08abdaf668897e96a5656fe72f5a9ce66422423e8849384872e6"
 
 [[package]]
-name = "unicode-xid"
-version = "0.2.2"
+name = "unicode-ident"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
+checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
 
 [[package]]
 name = "uuid"
-version = "0.8.2"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
 
 [[package]]
 name = "vec_map"
@@ -882,15 +769,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "wasi"
-version = "0.10.2+wasi-snapshot-preview1"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.79"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
+checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -898,9 +785,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.79"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
+checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -913,9 +800,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.79"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
+checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -923,9 +810,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.79"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
+checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -936,15 +823,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.79"
+version = "0.2.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
+checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
 
 [[package]]
 name = "web-sys"
-version = "0.3.56"
+version = "0.3.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
+checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index 9a8c0ad183..f7675b8e3f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,8 +23,8 @@ core = { path = "./core", package = "fishfight-core" }
 # ultimate = { path = "../FishFight-ultimate", package = "fishfight-ultimate", optional = true }
 ff-particles = { version = "0.1", features = ["serde"] }
 fishsticks = { git = "https://github.com/fishfight/fishsticks", default-features = false, features = ["gilrs"] }
-macroquad = { version = "0.3.10" }
-macroquad-platformer = "0.1"
+macroquad = { version = "=0.3.16" } # Newer versions break is_key_pressed detection
+macroquad-platformer = "0.1.3"
 hecs = "0.7.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
diff --git a/README.md b/README.md
index b37d3c60b7..fa4c16ca8b 100644
--- a/README.md
+++ b/README.md
@@ -72,26 +72,9 @@ pacman -S fishfight
 2. Clone this repository: `git clone https://github.com/fishfight/FishFight.git`
 3. `cargo run`
 
-## Default key bindings
-
-Keyboard right:
-- movement: arrow keys `↑`, `←`, `↓`, `→`
-- pick/drop: `K`
-- attack: `L`
-- slide: `↓` + `RightCtrl`
-
-Keyboard left:
-- movement: `W`, `A`, `S`, `D` (& `Space` for jump)
-- pick/drop: `C`
-- attack: `V` & `LeftCtrl`
-- slide: `A` + `F`
-
-Gamepad:
-- movement: direction axis
-- pick/drop: `X`
-- attack: `B`
-- jump: `A`
-- slide: `Down` + `Y`
+## Default Keybindings
+
+You can view and modify the default keybindings in [config.toml](./config.toml).
 
 ## Credits
 
diff --git a/assets/decoration/anemones.json b/assets/decoration/anemones.json
index 36db7eab28..b3975a8bb2 100644
--- a/assets/decoration/anemones.json
+++ b/assets/decoration/anemones.json
@@ -3,10 +3,6 @@
   "sprite": {
     "texture": "default_decoration",
     "autoplay_id": "idle",
-    "frame_size": {
-      "x": 48,
-      "y": 51
-    },
     "animations": [
       {
         "id": "idle",
diff --git a/assets/decoration/seaweed.json b/assets/decoration/seaweed.json
index 199a90aed8..87a77c4dc1 100644
--- a/assets/decoration/seaweed.json
+++ b/assets/decoration/seaweed.json
@@ -3,10 +3,6 @@
   "sprite": {
     "texture": "default_decoration",
     "autoplay_id": "idle",
-    "frame_size": {
-      "x": 48,
-      "y": 51
-    },
     "animations": [
       {
         "id": "idle",
@@ -15,7 +11,6 @@
         "fps": 8,
         "is_looping": true
       }
-    ],
-    "autoplay": true
+    ]
   }
-}
\ No newline at end of file
+}
diff --git a/assets/items/cannon.json b/assets/items/cannon.json
index d967497521..e50228fd77 100644
--- a/assets/items/cannon.json
+++ b/assets/items/cannon.json
@@ -46,7 +46,6 @@
           "type": "circle_collider",
           "radius": 80,
           "is_explosion": true,
-          "particle_effect": "hit",
           "sound_effect": "explode"
         },
         {
diff --git a/assets/items/grenades.json b/assets/items/grenades.json
index a8c7070cdf..25c56e3b23 100644
--- a/assets/items/grenades.json
+++ b/assets/items/grenades.json
@@ -60,8 +60,7 @@
             "fps": 12,
             "is_looping": true
           }
-        ],
-        "should_autoplay": true
+        ]
       },
       "particles": [
         {
@@ -101,4 +100,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/assets/items/kick_bomb.json b/assets/items/kick_bomb.json
index d585f39a9f..68dfb24941 100644
--- a/assets/items/kick_bomb.json
+++ b/assets/items/kick_bomb.json
@@ -42,7 +42,6 @@
           "type": "circle_collider",
           "radius": 64,
           "is_explosion": true,
-          "particle_effect": "hit",
           "sound_effect": "explode"
         },
         {
diff --git a/assets/items/mines.json b/assets/items/mines.json
index 5cb81eb96d..b4a3b1add7 100644
--- a/assets/items/mines.json
+++ b/assets/items/mines.json
@@ -30,7 +30,6 @@
           "type": "circle_collider",
           "radius": 64,
           "is_explosion": true,
-          "particle_effect": "hit",
           "sound_effect": "explode"
         },
         {
diff --git a/assets/maps/lev01.json b/assets/maps/lev01.json
index 5018857b1e..c99f936a3d 100644
--- a/assets/maps/lev01.json
+++ b/assets/maps/lev01.json
@@ -856,11 +856,11 @@
           }
         },
         {
-          "id": "mines",
+          "id": "kick_bomb",
           "kind": "item",
           "position": {
-            "x": 142.4722,
-            "y": 253.69444
+            "x": 141.7857,
+            "y": 240.12857
           }
         },
         {
@@ -1494,10 +1494,10 @@
         "56": [
           "jumpthrough"
         ],
-        "60": [
+        "58": [
           "jumpthrough"
         ],
-        "58": [
+        "60": [
           "jumpthrough"
         ]
       }
diff --git a/assets/maps/lev02.json b/assets/maps/lev02.json
index 61fd313818..c192adc3ad 100644
--- a/assets/maps/lev02.json
+++ b/assets/maps/lev02.json
@@ -274,8 +274,8 @@
         0,
         8,
         10,
-        0,
-        0,
+        59,
+        61,
         0,
         0,
         0,
@@ -301,8 +301,8 @@
         2,
         8,
         10,
-        59,
-        61,
+        0,
+        0,
         0,
         0,
         0,
@@ -355,8 +355,8 @@
         13,
         8,
         10,
-        0,
-        0,
+        59,
+        61,
         0,
         0,
         0,
@@ -409,8 +409,8 @@
         6,
         8,
         10,
-        59,
-        61,
+        0,
+        0,
         0,
         0,
         0,
@@ -436,8 +436,8 @@
         13,
         8,
         10,
-        0,
-        0,
+        59,
+        61,
         0,
         0,
         0,
@@ -536,7 +536,7 @@
         0,
         0,
         0,
-        0,
+        57,
         29,
         30,
         40,
@@ -699,8 +699,8 @@
           "id": "anemones",
           "kind": "decoration",
           "position": {
-            "x": 37.54866,
-            "y": 237.76035
+            "x": 35.88199,
+            "y": 301.0937
           }
         },
         {
@@ -728,35 +728,123 @@
       "has_collision": false,
       "objects": [
         {
-          "id": "sword",
+          "id": "grenades",
           "kind": "item",
           "position": {
-            "x": 225.00365,
-            "y": 570.9357
+            "x": 798.1076,
+            "y": 120.600006
           }
         },
         {
-          "id": "sword",
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 419.0,
+            "y": 399.33334
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 608.94116,
+            "y": 82.56866
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 135.36362,
+            "y": 147.27274
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 248.2858,
+            "y": 424.99997
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 765.28577,
+            "y": 205.14287
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 204.00006,
+            "y": 108.42859
+          }
+        },
+        {
+          "id": "sniper_rifle",
+          "kind": "item",
+          "position": {
+            "x": 578.4286,
+            "y": 54.14292
+          }
+        },
+        {
+          "id": "mines",
           "kind": "item",
           "position": {
-            "x": 655.00366,
-            "y": 284.93573
+            "x": 41.571472,
+            "y": 221.28577
           }
         },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 353.08264,
-            "y": 19.381384
+            "x": 569.85706,
+            "y": 306.33325
           }
         },
         {
-          "id": "mines",
+          "id": "musket",
+          "kind": "item",
+          "position": {
+            "x": 199.16669,
+            "y": 444.16672
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 705.6667,
+            "y": 491.83334
+          }
+        },
+        {
+          "id": "sword",
+          "kind": "item",
+          "position": {
+            "x": 143.18549,
+            "y": 612.7539
+          }
+        },
+        {
+          "id": "sword",
+          "kind": "item",
+          "position": {
+            "x": 401.6703,
+            "y": 385.7691
+          }
+        },
+        {
+          "id": "musket",
           "kind": "item",
           "position": {
-            "x": 726.0,
-            "y": 70.0
+            "x": 274.90082,
+            "y": 32.108643
           }
         }
       ],
@@ -1483,16 +1571,20 @@
   ],
   "spawn_points": [
     {
-      "x": 82.574425,
-      "y": 468.84995
+      "x": 98.210815,
+      "y": 490.57727
     },
     {
-      "x": 316.61115,
-      "y": 103.42124
+      "x": 271.61115,
+      "y": 101.75456
     },
     {
       "x": 787.6791,
       "y": 195.83423
+    },
+    {
+      "x": 650.2078,
+      "y": 458.88315
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/maps/lev02.png b/assets/maps/lev02.png
index aee2b13bf0..314b0e3227 100644
Binary files a/assets/maps/lev02.png and b/assets/maps/lev02.png differ
diff --git a/assets/maps/lev03.json b/assets/maps/lev03.json
index 1d5995047c..89e9d3eb3d 100644
--- a/assets/maps/lev03.json
+++ b/assets/maps/lev03.json
@@ -1393,12 +1393,92 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "grenades",
+          "kind": "item",
+          "position": {
+            "x": 777.2001,
+            "y": 827.5333
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 230.25632,
+            "y": 780.5556
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 859.55554,
+            "y": 779.0
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 353.16675,
+            "y": 456.16672
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 795.4643,
+            "y": 530.2143
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 232.0,
+            "y": 616.0
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 220.63892,
+            "y": 295.95834
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 838.77277,
+            "y": 300.51138
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 768.89795,
+            "y": 717.31824
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 521.8443,
+            "y": 403.16885
+          }
+        },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 591.0,
-            "y": 337.83334
+            "x": 530.1667,
+            "y": 348.6667
           }
         },
         {
@@ -1439,22 +1519,22 @@
   ],
   "tilesets": [
     {
-      "id": "tileset",
-      "texture_id": "default_tileset",
+      "id": "decorations1",
+      "texture_id": "default_decoration",
       "texture_size": {
-        "x": 224,
-        "y": 288
+        "x": 240,
+        "y": 102
       },
       "tile_size": {
-        "x": 32.0,
-        "y": 32.0
+        "x": 48.0,
+        "y": 51.0
       },
       "grid_size": {
-        "x": 7,
-        "y": 9
+        "x": 5,
+        "y": 2
       },
-      "first_tile_id": 1,
-      "tile_cnt": 63,
+      "first_tile_id": 64,
+      "tile_cnt": 10,
       "tile_subdivisions": {
         "x": 3,
         "y": 3
@@ -1549,6 +1629,31 @@
         false,
         false,
         false,
+        false
+      ]
+    },
+    {
+      "id": "tileset",
+      "texture_id": "default_tileset",
+      "texture_size": {
+        "x": 224,
+        "y": 288
+      },
+      "tile_size": {
+        "x": 32.0,
+        "y": 32.0
+      },
+      "grid_size": {
+        "x": 7,
+        "y": 9
+      },
+      "first_tile_id": 1,
+      "tile_cnt": 63,
+      "tile_subdivisions": {
+        "x": 3,
+        "y": 3
+      },
+      "autotile_mask": [
         false,
         false,
         false,
@@ -2026,42 +2131,6 @@
         false,
         false,
         false,
-        false
-      ],
-      "tile_attributes": {
-        "56": [
-          "jumpthrough"
-        ],
-        "58": [
-          "jumpthrough"
-        ],
-        "60": [
-          "jumpthrough"
-        ]
-      }
-    },
-    {
-      "id": "decorations1",
-      "texture_id": "default_decoration",
-      "texture_size": {
-        "x": 240,
-        "y": 102
-      },
-      "tile_size": {
-        "x": 48.0,
-        "y": 51.0
-      },
-      "grid_size": {
-        "x": 5,
-        "y": 2
-      },
-      "first_tile_id": 64,
-      "tile_cnt": 10,
-      "tile_subdivisions": {
-        "x": 3,
-        "y": 3
-      },
-      "autotile_mask": [
         false,
         false,
         false,
@@ -2152,7 +2221,18 @@
         false,
         false,
         false
-      ]
+      ],
+      "tile_attributes": {
+        "56": [
+          "jumpthrough"
+        ],
+        "58": [
+          "jumpthrough"
+        ],
+        "60": [
+          "jumpthrough"
+        ]
+      }
     }
   ],
   "spawn_points": [
diff --git a/assets/maps/lev03.png b/assets/maps/lev03.png
index a26873e738..777fac6b24 100644
Binary files a/assets/maps/lev03.png and b/assets/maps/lev03.png differ
diff --git a/assets/maps/lev04.json b/assets/maps/lev04.json
index e99371e3ff..23080f60d0 100644
--- a/assets/maps/lev04.json
+++ b/assets/maps/lev04.json
@@ -199,9 +199,6 @@
         9,
         9,
         21,
-        23,
-        23,
-        24,
         0,
         0,
         0,
@@ -227,19 +224,19 @@
         0,
         0,
         0,
-        22,
-        23,
-        23,
-        14,
-        9,
-        9,
-        10,
         0,
         0,
         0,
         0,
         0,
         0,
+        14,
+        9,
+        9,
+        10,
+        59,
+        59,
+        61,
         0,
         0,
         0,
@@ -265,6 +262,9 @@
         0,
         0,
         0,
+        57,
+        59,
+        59,
         8,
         9,
         9,
@@ -597,6 +597,54 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "sniper_rifle",
+          "kind": "item",
+          "position": {
+            "x": 956.28564,
+            "y": 217.14284
+          }
+        },
+        {
+          "id": "blunderbass",
+          "kind": "item",
+          "position": {
+            "x": 77.7143,
+            "y": 231.42854
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 549.5714,
+            "y": 208.1429
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 468.71423,
+            "y": 49.571457
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 867.2858,
+            "y": 323.14285
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 65.7143,
+            "y": 102.14285
+          }
+        },
         {
           "id": "seaweed",
           "kind": "decoration",
@@ -610,7 +658,7 @@
           "kind": "decoration",
           "position": {
             "x": 472.5,
-            "y": 334.0
+            "y": 334.00003
           }
         },
         {
@@ -641,16 +689,16 @@
           "id": "seaweed",
           "kind": "decoration",
           "position": {
-            "x": 710.0,
-            "y": 16.5
+            "x": 708.1818,
+            "y": 12.863632
           }
         },
         {
           "id": "seaweed",
           "kind": "decoration",
           "position": {
-            "x": 83.0,
-            "y": 67.5
+            "x": 73.45456,
+            "y": 110.35715
           }
         },
         {
@@ -677,12 +725,60 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "crate",
+          "kind": "item",
+          "position": {
+            "x": 92.20001,
+            "y": 325.08463
+          }
+        },
+        {
+          "id": "crate",
+          "kind": "item",
+          "position": {
+            "x": 1002.99225,
+            "y": 324.26926
+          }
+        },
+        {
+          "id": "crate",
+          "kind": "item",
+          "position": {
+            "x": 79.70007,
+            "y": 118.27142
+          }
+        },
+        {
+          "id": "crate",
+          "kind": "item",
+          "position": {
+            "x": 1013.9857,
+            "y": 124.75714
+          }
+        },
+        {
+          "id": "crate",
+          "kind": "item",
+          "position": {
+            "x": 368.078,
+            "y": 28.023087
+          }
+        },
+        {
+          "id": "crate",
+          "kind": "item",
+          "position": {
+            "x": 646.6118,
+            "y": 24.362648
+          }
+        },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 589.0,
-            "y": 330.83334
+            "x": 595.79486,
+            "y": 352.79916
           }
         },
         {
@@ -697,8 +793,8 @@
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 382.66666,
-            "y": 7.6666665
+            "x": 518.0513,
+            "y": 35.35897
           }
         },
         {
@@ -713,32 +809,24 @@
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 309.0,
-            "y": 327.0
+            "x": 256.85715,
+            "y": 354.85715
           }
         },
         {
           "id": "mines",
           "kind": "item",
           "position": {
-            "x": 635.5905,
-            "y": 41.094215
+            "x": 778.05804,
+            "y": 29.276031
           }
         },
         {
           "id": "sproinger",
           "kind": "environment",
           "position": {
-            "x": 499.48517,
-            "y": 367.1083
-          }
-        },
-        {
-          "id": "sproinger",
-          "kind": "environment",
-          "position": {
-            "x": 586.8749,
-            "y": 366.11847
+            "x": 544.4851,
+            "y": 364.33054
           }
         }
       ],
@@ -747,22 +835,22 @@
   ],
   "tilesets": [
     {
-      "id": "decorations1",
-      "texture_id": "default_decoration",
+      "id": "tileset",
+      "texture_id": "default_tileset",
       "texture_size": {
-        "x": 240,
-        "y": 102
+        "x": 224,
+        "y": 288
       },
       "tile_size": {
-        "x": 48.0,
-        "y": 51.0
+        "x": 32.0,
+        "y": 32.0
       },
       "grid_size": {
-        "x": 5,
-        "y": 2
+        "x": 7,
+        "y": 9
       },
-      "first_tile_id": 64,
-      "tile_cnt": 10,
+      "first_tile_id": 1,
+      "tile_cnt": 63,
       "tile_subdivisions": {
         "x": 3,
         "y": 3
@@ -857,31 +945,6 @@
         false,
         false,
         false,
-        false
-      ]
-    },
-    {
-      "id": "tileset",
-      "texture_id": "default_tileset",
-      "texture_size": {
-        "x": 224,
-        "y": 288
-      },
-      "tile_size": {
-        "x": 32.0,
-        "y": 32.0
-      },
-      "grid_size": {
-        "x": 7,
-        "y": 9
-      },
-      "first_tile_id": 1,
-      "tile_cnt": 63,
-      "tile_subdivisions": {
-        "x": 3,
-        "y": 3
-      },
-      "autotile_mask": [
         false,
         false,
         false,
@@ -1359,6 +1422,42 @@
         false,
         false,
         false,
+        false
+      ],
+      "tile_attributes": {
+        "56": [
+          "jumpthrough"
+        ],
+        "60": [
+          "jumpthrough"
+        ],
+        "58": [
+          "jumpthrough"
+        ]
+      }
+    },
+    {
+      "id": "decorations1",
+      "texture_id": "default_decoration",
+      "texture_size": {
+        "x": 240,
+        "y": 102
+      },
+      "tile_size": {
+        "x": 48.0,
+        "y": 51.0
+      },
+      "grid_size": {
+        "x": 5,
+        "y": 2
+      },
+      "first_tile_id": 64,
+      "tile_cnt": 10,
+      "tile_subdivisions": {
+        "x": 3,
+        "y": 3
+      },
+      "autotile_mask": [
         false,
         false,
         false,
@@ -1449,18 +1548,7 @@
         false,
         false,
         false
-      ],
-      "tile_attributes": {
-        "58": [
-          "jumpthrough"
-        ],
-        "60": [
-          "jumpthrough"
-        ],
-        "56": [
-          "jumpthrough"
-        ]
-      }
+      ]
     }
   ],
   "spawn_points": [
@@ -1473,12 +1561,12 @@
       "y": 328.66666
     },
     {
-      "x": 141.0,
-      "y": 72.0
+      "x": 137.42857,
+      "y": 101.28572
     },
     {
-      "x": 976.0,
-      "y": 73.0
+      "x": 973.857,
+      "y": 100.14285
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/maps/lev04.png b/assets/maps/lev04.png
index 2910ee69fa..4158e036ba 100644
Binary files a/assets/maps/lev04.png and b/assets/maps/lev04.png differ
diff --git a/assets/maps/lev05.json b/assets/maps/lev05.json
index cfca57607a..6bc75379f3 100644
--- a/assets/maps/lev05.json
+++ b/assets/maps/lev05.json
@@ -1,8 +1,8 @@
 {
   "background_color": {
-    "red": 0.0,
-    "green": 0.0,
-    "blue": 0.0,
+    "red": 0.5,
+    "green": 0.7,
+    "blue": 0.7,
     "alpha": 1.0
   },
   "background_layers": [
@@ -302,11 +302,11 @@
         0,
         0,
         47,
-        24,
         57,
         59,
+        59,
+        59,
         61,
-        22,
         49,
         0,
         0,
@@ -482,11 +482,11 @@
         0,
         0,
         0,
-        1,
-        2,
-        2,
-        2,
-        3,
+        0,
+        0,
+        0,
+        0,
+        0,
         0,
         0,
         0,
@@ -527,11 +527,11 @@
         0,
         0,
         0,
-        11,
-        5,
-        28,
-        6,
-        11,
+        1,
+        2,
+        2,
+        2,
+        3,
         0,
         0,
         0,
@@ -573,9 +573,9 @@
         0,
         0,
         11,
-        21,
-        23,
-        14,
+        5,
+        28,
+        6,
         11,
         0,
         0,
@@ -670,7 +670,7 @@
         0,
         0,
         0,
-        11,
+        8,
         7,
         11,
         0,
@@ -747,12 +747,20 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 703.63354,
+            "y": 301.37103
+          }
+        },
         {
           "id": "anemones",
           "kind": "decoration",
           "position": {
-            "x": 668.5,
-            "y": 238.0
+            "x": 641.5769,
+            "y": 270.30768
           }
         },
         {
@@ -768,7 +776,7 @@
           "kind": "decoration",
           "position": {
             "x": 748.1667,
-            "y": 110.0
+            "y": 109.999985
           }
         },
         {
@@ -807,8 +815,8 @@
           "id": "anemones",
           "kind": "decoration",
           "position": {
-            "x": 1109.0,
-            "y": 74.5
+            "x": 1108.1666,
+            "y": 173.66666
           }
         }
       ],
@@ -819,44 +827,124 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "grenades",
+          "kind": "item",
+          "position": {
+            "x": 829.98456,
+            "y": 26.192322
+          }
+        },
+        {
+          "id": "kick_bomb",
+          "kind": "item",
+          "position": {
+            "x": 930.8,
+            "y": 272.2923
+          }
+        },
+        {
+          "id": "sniper_rifle",
+          "kind": "item",
+          "position": {
+            "x": 354.8334,
+            "y": 25.500061
+          }
+        },
+        {
+          "id": "cannon",
+          "kind": "item",
+          "position": {
+            "x": 1076.3333,
+            "y": 15.166718
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 897.29407,
+            "y": 49.588287
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 440.6078,
+            "y": 48.627304
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 982.3334,
+            "y": 6.7777405
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 720.0,
+            "y": 144.11111
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 474.55557,
+            "y": 259.22214
+          }
+        },
+        {
+          "id": "mines",
+          "kind": "item",
+          "position": {
+            "x": 452.36362,
+            "y": 286.1818
+          }
+        },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 753.0,
-            "y": 239.5
+            "x": 655.02856,
+            "y": 127.46002
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 1167.6666,
-            "y": 175.66667
+            "x": 1103.5,
+            "y": 198.16664
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 540.6667,
-            "y": 28.666666
+            "x": 559.8334,
+            "y": 39.499985
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 991.6667,
-            "y": 25.666666
+            "x": 887.5,
+            "y": 38.16667
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 337.0,
-            "y": 177.0
+            "x": 275.33334,
+            "y": 198.66666
           }
         }
       ],
@@ -1569,13 +1657,13 @@
         false
       ],
       "tile_attributes": {
-        "58": [
+        "56": [
           "jumpthrough"
         ],
         "60": [
           "jumpthrough"
         ],
-        "56": [
+        "58": [
           "jumpthrough"
         ]
       }
diff --git a/assets/maps/lev05.png b/assets/maps/lev05.png
index 81f7bf0de8..a971cc28c7 100644
Binary files a/assets/maps/lev05.png and b/assets/maps/lev05.png differ
diff --git a/assets/maps/lev06.json b/assets/maps/lev06.json
index 3af4472715..f4b6f09c31 100644
--- a/assets/maps/lev06.json
+++ b/assets/maps/lev06.json
@@ -391,13 +391,13 @@
         0,
         0,
         0,
+        57,
+        61,
         0,
         0,
         0,
-        0,
-        0,
-        0,
-        0,
+        57,
+        61,
         0,
         0,
         0,
@@ -584,8 +584,8 @@
           "id": "anemones",
           "kind": "decoration",
           "position": {
-            "x": 560.8333,
-            "y": 174.0
+            "x": 556.6228,
+            "y": 173.47368
           }
         },
         {
@@ -645,59 +645,131 @@
       "has_collision": false,
       "objects": [
         {
-          "id": "sword",
+          "id": "crate",
+          "kind": "item",
+          "position": {
+            "x": 739.2429,
+            "y": 31.428589
+          }
+        },
+        {
+          "id": "kick_bomb",
+          "kind": "item",
+          "position": {
+            "x": 190.74286,
+            "y": 304.98572
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 159.52945,
+            "y": 204.47061
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 609.2202,
+            "y": 204.23442
+          }
+        },
+        {
+          "id": "musket",
           "kind": "item",
           "position": {
-            "x": 782.6667,
-            "y": 5.3333335
+            "x": 567.6667,
+            "y": 318.49997
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 373.5,
+            "y": 227.33334
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 171.00003,
+            "y": 35.5
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 643.00006,
+            "y": 419.0
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 263.00006,
+            "y": 80.153854
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 543.36365,
+            "y": 78.90906
           }
         },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 420.66666,
-            "y": 243.33333
+            "x": 221.78943,
+            "y": 192.63158
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 79.083336,
-            "y": 6.25
+            "x": 45.75,
+            "y": 37.583336
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 754.0,
-            "y": 435.0
+            "x": 688.0,
+            "y": 452.33328
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 111.333336,
-            "y": 433.33334
+            "x": 134.00003,
+            "y": 452.66666
           }
         },
         {
           "id": "mines",
           "kind": "item",
           "position": {
-            "x": 432.0,
-            "y": 40.0
+            "x": 446.6667,
+            "y": 29.333336
           }
         },
         {
           "id": "sproinger",
           "kind": "environment",
           "position": {
-            "x": 384.0,
-            "y": 592.0
+            "x": 382.82352,
+            "y": 588.4706
           }
         }
       ],
@@ -706,22 +778,22 @@
   ],
   "tilesets": [
     {
-      "id": "decorations1",
-      "texture_id": "default_decoration",
+      "id": "tileset",
+      "texture_id": "default_tileset",
       "texture_size": {
-        "x": 240,
-        "y": 102
+        "x": 224,
+        "y": 288
       },
       "tile_size": {
-        "x": 48.0,
-        "y": 51.0
+        "x": 32.0,
+        "y": 32.0
       },
       "grid_size": {
-        "x": 5,
-        "y": 2
+        "x": 7,
+        "y": 9
       },
-      "first_tile_id": 64,
-      "tile_cnt": 10,
+      "first_tile_id": 1,
+      "tile_cnt": 63,
       "tile_subdivisions": {
         "x": 3,
         "y": 3
@@ -816,31 +888,6 @@
         false,
         false,
         false,
-        false
-      ]
-    },
-    {
-      "id": "tileset",
-      "texture_id": "default_tileset",
-      "texture_size": {
-        "x": 224,
-        "y": 288
-      },
-      "tile_size": {
-        "x": 32.0,
-        "y": 32.0
-      },
-      "grid_size": {
-        "x": 7,
-        "y": 9
-      },
-      "first_tile_id": 1,
-      "tile_cnt": 63,
-      "tile_subdivisions": {
-        "x": 3,
-        "y": 3
-      },
-      "autotile_mask": [
         false,
         false,
         false,
@@ -1318,6 +1365,42 @@
         false,
         false,
         false,
+        false
+      ],
+      "tile_attributes": {
+        "58": [
+          "jumpthrough"
+        ],
+        "56": [
+          "jumpthrough"
+        ],
+        "60": [
+          "jumpthrough"
+        ]
+      }
+    },
+    {
+      "id": "decorations1",
+      "texture_id": "default_decoration",
+      "texture_size": {
+        "x": 240,
+        "y": 102
+      },
+      "tile_size": {
+        "x": 48.0,
+        "y": 51.0
+      },
+      "grid_size": {
+        "x": 5,
+        "y": 2
+      },
+      "first_tile_id": 64,
+      "tile_cnt": 10,
+      "tile_subdivisions": {
+        "x": 3,
+        "y": 3
+      },
+      "autotile_mask": [
         false,
         false,
         false,
@@ -1408,18 +1491,7 @@
         false,
         false,
         false
-      ],
-      "tile_attributes": {
-        "60": [
-          "jumpthrough"
-        ],
-        "58": [
-          "jumpthrough"
-        ],
-        "56": [
-          "jumpthrough"
-        ]
-      }
+      ]
     }
   ],
   "spawn_points": [
diff --git a/assets/maps/lev06.png b/assets/maps/lev06.png
index ba1686d43b..32d4916398 100644
Binary files a/assets/maps/lev06.png and b/assets/maps/lev06.png differ
diff --git a/assets/maps/lev07.json b/assets/maps/lev07.json
index 5385eb2d28..238de50aee 100644
--- a/assets/maps/lev07.json
+++ b/assets/maps/lev07.json
@@ -746,6 +746,22 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "grenades",
+          "kind": "item",
+          "position": {
+            "x": 36.699997,
+            "y": 217.32353
+          }
+        },
+        {
+          "id": "grenades",
+          "kind": "item",
+          "position": {
+            "x": 802.0353,
+            "y": 218.47058
+          }
+        },
         {
           "id": "crab",
           "kind": "environment",
@@ -1438,13 +1454,13 @@
         false
       ],
       "tile_attributes": {
-        "58": [
+        "60": [
           "jumpthrough"
         ],
         "56": [
           "jumpthrough"
         ],
-        "60": [
+        "58": [
           "jumpthrough"
         ]
       }
diff --git a/assets/maps/zyrafa01.json b/assets/maps/zyrafa01.json
index c4f0ec4060..3380d7ef01 100644
--- a/assets/maps/zyrafa01.json
+++ b/assets/maps/zyrafa01.json
@@ -687,52 +687,108 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "grenades",
+          "kind": "item",
+          "position": {
+            "x": 706.4,
+            "y": 313.525
+          }
+        },
+        {
+          "id": "kick_bomb",
+          "kind": "item",
+          "position": {
+            "x": 68.5,
+            "y": 301.0
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 437.15137,
+            "y": 454.3866
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 426.4284,
+            "y": 305.14282
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 767.923,
+            "y": 323.23077
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 632.07684,
+            "y": 437.76926
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 124.46149,
+            "y": 282.15387
+          }
+        },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 640.0,
-            "y": 256.0
+            "x": 690.7143,
+            "y": 323.14285
           }
         },
         {
           "id": "mines",
           "kind": "item",
           "position": {
-            "x": 224.0,
-            "y": 480.0
+            "x": 239.88235,
+            "y": 252.94118
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 288.0,
-            "y": 256.0
+            "x": 73.71431,
+            "y": 326.0
           }
         },
         {
-          "id": "sword",
+          "id": "blunderbass",
           "kind": "item",
           "position": {
-            "x": 464.0,
-            "y": 384.0
+            "x": 410.4353,
+            "y": 484.04706
           }
         },
         {
           "id": "mines",
           "kind": "item",
           "position": {
-            "x": 704.0,
-            "y": 480.0
+            "x": 592.2353,
+            "y": 252.94118
           }
         },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 464.0,
-            "y": 480.0
+            "x": 407.52942,
+            "y": 287.05884
           }
         }
       ],
@@ -1331,13 +1387,13 @@
         false
       ],
       "tile_attributes": {
-        "58": [
+        "56": [
           "jumpthrough"
         ],
         "60": [
           "jumpthrough"
         ],
-        "56": [
+        "58": [
           "jumpthrough"
         ]
       }
diff --git a/assets/maps/zyrafa01.png b/assets/maps/zyrafa01.png
index 4186a303f8..44c2ffc443 100644
Binary files a/assets/maps/zyrafa01.png and b/assets/maps/zyrafa01.png differ
diff --git a/assets/maps/zyrafa02.json b/assets/maps/zyrafa02.json
index 1d2d3708cc..ed27445977 100644
--- a/assets/maps/zyrafa02.json
+++ b/assets/maps/zyrafa02.json
@@ -718,44 +718,76 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 416.4546,
+            "y": 465.9091
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 352.66663,
+            "y": 308.1515
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 350.99994,
+            "y": 407.5
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 188.24997,
+            "y": 603.6665
+          }
+        },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 320.0,
-            "y": 256.0
+            "x": 241.66666,
+            "y": 286.55557
           }
         },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 448.0,
-            "y": 256.0
+            "x": 423.5556,
+            "y": 286.0
           }
         },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 288.0,
-            "y": 448.0
+            "x": 204.11111,
+            "y": 448.55554
           }
         },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 480.0,
-            "y": 448.0
+            "x": 465.0,
+            "y": 444.6667
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 400.0,
-            "y": 640.0
+            "x": 338.88892,
+            "y": 646.6666
           }
         }
       ],
@@ -764,22 +796,22 @@
   ],
   "tilesets": [
     {
-      "id": "decorations1",
-      "texture_id": "default_decoration",
+      "id": "tileset",
+      "texture_id": "default_tileset",
       "texture_size": {
-        "x": 240,
-        "y": 102
+        "x": 224,
+        "y": 288
       },
       "tile_size": {
-        "x": 48.0,
-        "y": 51.0
+        "x": 32.0,
+        "y": 32.0
       },
       "grid_size": {
-        "x": 5,
-        "y": 2
+        "x": 7,
+        "y": 9
       },
-      "first_tile_id": 64,
-      "tile_cnt": 10,
+      "first_tile_id": 1,
+      "tile_cnt": 63,
       "tile_subdivisions": {
         "x": 3,
         "y": 3
@@ -874,31 +906,6 @@
         false,
         false,
         false,
-        false
-      ]
-    },
-    {
-      "id": "tileset",
-      "texture_id": "default_tileset",
-      "texture_size": {
-        "x": 224,
-        "y": 288
-      },
-      "tile_size": {
-        "x": 32.0,
-        "y": 32.0
-      },
-      "grid_size": {
-        "x": 7,
-        "y": 9
-      },
-      "first_tile_id": 1,
-      "tile_cnt": 63,
-      "tile_subdivisions": {
-        "x": 3,
-        "y": 3
-      },
-      "autotile_mask": [
         false,
         false,
         false,
@@ -1376,6 +1383,42 @@
         false,
         false,
         false,
+        false
+      ],
+      "tile_attributes": {
+        "60": [
+          "jumpthrough"
+        ],
+        "56": [
+          "jumpthrough"
+        ],
+        "58": [
+          "jumpthrough"
+        ]
+      }
+    },
+    {
+      "id": "decorations1",
+      "texture_id": "default_decoration",
+      "texture_size": {
+        "x": 240,
+        "y": 102
+      },
+      "tile_size": {
+        "x": 48.0,
+        "y": 51.0
+      },
+      "grid_size": {
+        "x": 5,
+        "y": 2
+      },
+      "first_tile_id": 64,
+      "tile_cnt": 10,
+      "tile_subdivisions": {
+        "x": 3,
+        "y": 3
+      },
+      "autotile_mask": [
         false,
         false,
         false,
@@ -1466,18 +1509,7 @@
         false,
         false,
         false
-      ],
-      "tile_attributes": {
-        "58": [
-          "jumpthrough"
-        ],
-        "60": [
-          "jumpthrough"
-        ],
-        "56": [
-          "jumpthrough"
-        ]
-      }
+      ]
     }
   ],
   "spawn_points": [
diff --git a/assets/maps/zyrafa03.json b/assets/maps/zyrafa03.json
index 11af0a0081..1c4ade2f15 100644
--- a/assets/maps/zyrafa03.json
+++ b/assets/maps/zyrafa03.json
@@ -666,6 +666,14 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 32.0,
+            "y": 461.0
+          }
+        },
         {
           "id": "anemones",
           "kind": "decoration",
@@ -730,6 +738,54 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 575.9231,
+            "y": 196.76924
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 284.90906,
+            "y": 194.54543
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 507.72723,
+            "y": 506.1818
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 383.70593,
+            "y": 556.70593
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 448.14288,
+            "y": 557.1429
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 801.16675,
+            "y": 460.05554
+          }
+        },
         {
           "id": "musket",
           "kind": "item",
@@ -742,24 +798,24 @@
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 320.0,
-            "y": 544.0
+            "x": 266.25003,
+            "y": 544.7352
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 464.0,
-            "y": 320.0
+            "x": 403.375,
+            "y": 326.875
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 608.0,
-            "y": 224.0
+            "x": 566.125,
+            "y": 227.75
           }
         },
         {
diff --git a/assets/maps/zyrafa04.json b/assets/maps/zyrafa04.json
index 28a2e14b9b..8f1b9294d8 100644
--- a/assets/maps/zyrafa04.json
+++ b/assets/maps/zyrafa04.json
@@ -866,16 +866,16 @@
           "id": "seaweed",
           "kind": "decoration",
           "position": {
-            "x": 192.0,
-            "y": 593.0
+            "x": 146.16666,
+            "y": 493.0
           }
         },
         {
           "id": "seaweed",
           "kind": "decoration",
           "position": {
-            "x": 416.0,
-            "y": 237.0
+            "x": 417.6667,
+            "y": 238.66667
           }
         },
         {
@@ -902,27 +902,83 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 96.143555,
+            "y": 524.88995
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 961.0,
+            "y": 524.3334
+          }
+        },
+        {
+          "id": "sword",
+          "kind": "item",
+          "position": {
+            "x": 595.4545,
+            "y": 261.0909
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 142.91943,
+            "y": 483.826
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 858.0,
+            "y": 474.83337
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 410.00006,
+            "y": 230.0
+          }
+        },
+        {
+          "id": "musket",
+          "kind": "item",
+          "position": {
+            "x": 870.3333,
+            "y": 384.16666
+          }
+        },
         {
           "id": "grenades",
           "kind": "item",
           "position": {
-            "x": 224.0,
-            "y": 384.0
+            "x": 221.50003,
+            "y": 503.16666
           }
         },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 544.0,
-            "y": 256.0
+            "x": 125.66667,
+            "y": 376.0
           }
         },
         {
           "id": "sproinger",
           "kind": "environment",
           "position": {
-            "x": 531.0,
+            "x": 528.1428,
             "y": 461.5
           }
         },
@@ -930,24 +986,24 @@
           "id": "grenades",
           "kind": "item",
           "position": {
-            "x": 960.0,
-            "y": 384.0
+            "x": 840.83344,
+            "y": 504.0
           }
         },
         {
           "id": "grenades",
           "kind": "item",
           "position": {
-            "x": 640.0,
-            "y": 448.0
+            "x": 595.7143,
+            "y": 443.0
           }
         },
         {
           "id": "grenades",
           "kind": "item",
           "position": {
-            "x": 512.0,
-            "y": 448.0
+            "x": 466.52383,
+            "y": 440.9762
           }
         }
       ],
@@ -1660,10 +1716,10 @@
         false
       ],
       "tile_attributes": {
-        "60": [
+        "56": [
           "jumpthrough"
         ],
-        "56": [
+        "60": [
           "jumpthrough"
         ],
         "58": [
@@ -1674,12 +1730,12 @@
   ],
   "spawn_points": [
     {
-      "x": 128.0,
-      "y": 480.0
+      "x": 126.57143,
+      "y": 355.7143
     },
     {
-      "x": 960.0,
-      "y": 480.0
+      "x": 959.2857,
+      "y": 350.71432
     },
     {
       "x": 896.0,
diff --git a/assets/maps/zyrafa05.json b/assets/maps/zyrafa05.json
index 1161c46f56..91fdbb6aa7 100644
--- a/assets/maps/zyrafa05.json
+++ b/assets/maps/zyrafa05.json
@@ -808,6 +808,14 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 749.1538,
+            "y": 447.53845
+          }
+        },
         {
           "id": "anemones",
           "kind": "decoration",
@@ -820,8 +828,8 @@
           "id": "seaweed",
           "kind": "decoration",
           "position": {
-            "x": 64.0,
-            "y": 465.0
+            "x": 77.57143,
+            "y": 462.14285
           }
         },
         {
@@ -836,8 +844,8 @@
           "id": "seaweed",
           "kind": "decoration",
           "position": {
-            "x": 768.0,
-            "y": 465.0
+            "x": 757.28577,
+            "y": 462.14285
           }
         },
         {
@@ -856,20 +864,44 @@
       "kind": "object_layer",
       "has_collision": false,
       "objects": [
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 75.99994,
+            "y": 435.85715
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 501.14282,
+            "y": 402.2857
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 441.74994,
+            "y": 161.99997
+          }
+        },
         {
           "id": "sproinger",
           "kind": "environment",
           "position": {
-            "x": 160.0,
-            "y": 512.0
+            "x": 160.76923,
+            "y": 492.00003
           }
         },
         {
           "id": "sproinger",
           "kind": "environment",
           "position": {
-            "x": 832.0,
-            "y": 512.0
+            "x": 830.46155,
+            "y": 492.00003
           }
         },
         {
@@ -884,32 +916,32 @@
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 416.0,
-            "y": 192.0
+            "x": 366.00003,
+            "y": 200.46153
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 640.0,
-            "y": 192.0
+            "x": 597.6923,
+            "y": 199.6923
           }
         },
         {
           "id": "grenades",
           "kind": "item",
           "position": {
-            "x": 192.0,
-            "y": 192.0
+            "x": 195.84616,
+            "y": 185.84615
           }
         },
         {
           "id": "grenades",
           "kind": "item",
           "position": {
-            "x": 864.0,
-            "y": 192.0
+            "x": 865.53845,
+            "y": 185.07692
           }
         }
       ],
@@ -918,22 +950,22 @@
   ],
   "tilesets": [
     {
-      "id": "decorations1",
-      "texture_id": "default_decoration",
+      "id": "tileset",
+      "texture_id": "default_tileset",
       "texture_size": {
-        "x": 240,
-        "y": 102
+        "x": 224,
+        "y": 288
       },
       "tile_size": {
-        "x": 48.0,
-        "y": 51.0
+        "x": 32.0,
+        "y": 32.0
       },
       "grid_size": {
-        "x": 5,
-        "y": 2
+        "x": 7,
+        "y": 9
       },
-      "first_tile_id": 64,
-      "tile_cnt": 10,
+      "first_tile_id": 1,
+      "tile_cnt": 63,
       "tile_subdivisions": {
         "x": 3,
         "y": 3
@@ -1028,31 +1060,6 @@
         false,
         false,
         false,
-        false
-      ]
-    },
-    {
-      "id": "tileset",
-      "texture_id": "default_tileset",
-      "texture_size": {
-        "x": 224,
-        "y": 288
-      },
-      "tile_size": {
-        "x": 32.0,
-        "y": 32.0
-      },
-      "grid_size": {
-        "x": 7,
-        "y": 9
-      },
-      "first_tile_id": 1,
-      "tile_cnt": 63,
-      "tile_subdivisions": {
-        "x": 3,
-        "y": 3
-      },
-      "autotile_mask": [
         false,
         false,
         false,
@@ -1530,6 +1537,42 @@
         false,
         false,
         false,
+        false
+      ],
+      "tile_attributes": {
+        "58": [
+          "jumpthrough"
+        ],
+        "60": [
+          "jumpthrough"
+        ],
+        "56": [
+          "jumpthrough"
+        ]
+      }
+    },
+    {
+      "id": "decorations1",
+      "texture_id": "default_decoration",
+      "texture_size": {
+        "x": 240,
+        "y": 102
+      },
+      "tile_size": {
+        "x": 48.0,
+        "y": 51.0
+      },
+      "grid_size": {
+        "x": 5,
+        "y": 2
+      },
+      "first_tile_id": 64,
+      "tile_cnt": 10,
+      "tile_subdivisions": {
+        "x": 3,
+        "y": 3
+      },
+      "autotile_mask": [
         false,
         false,
         false,
@@ -1620,24 +1663,13 @@
         false,
         false,
         false
-      ],
-      "tile_attributes": {
-        "56": [
-          "jumpthrough"
-        ],
-        "58": [
-          "jumpthrough"
-        ],
-        "60": [
-          "jumpthrough"
-        ]
-      }
+      ]
     }
   ],
   "spawn_points": [
     {
-      "x": 128.0,
-      "y": 448.0
+      "x": 172.61539,
+      "y": 170.30772
     },
     {
       "x": 224.0,
@@ -1648,8 +1680,8 @@
       "y": 448.0
     },
     {
-      "x": 896.0,
-      "y": 448.0
+      "x": 842.1539,
+      "y": 172.61542
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/maps/zyrafa06.json b/assets/maps/zyrafa06.json
index 630f6d1c4a..0b94a292b3 100644
--- a/assets/maps/zyrafa06.json
+++ b/assets/maps/zyrafa06.json
@@ -621,35 +621,115 @@
       "has_collision": false,
       "objects": [
         {
-          "id": "sword",
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 191.3334,
+            "y": 304.6667
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 415.0,
+            "y": 240.33337
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 694.00006,
+            "y": 370.6667
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 861.6666,
+            "y": 188.33334
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 457.33334,
+            "y": 179.00003
+          }
+        },
+        {
+          "id": "musket",
           "kind": "item",
           "position": {
-            "x": 448.0,
-            "y": 160.0
+            "x": 232.88095,
+            "y": 350.97617
           }
         },
         {
-          "id": "sword",
+          "id": "musket",
           "kind": "item",
           "position": {
-            "x": 736.0,
-            "y": 96.0
+            "x": 622.2857,
+            "y": 348.7143
+          }
+        },
+        {
+          "id": "kick_bomb",
+          "kind": "item",
+          "position": {
+            "x": 433.0,
+            "y": 146.00003
+          }
+        },
+        {
+          "id": "kick_bomb",
+          "kind": "item",
+          "position": {
+            "x": 983.5714,
+            "y": 337.2857
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 321.5556,
+            "y": 364.6667
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 737.05554,
+            "y": 364.86102
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 928.71796,
+            "y": 364.87183
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 256.0,
-            "y": 128.0
+            "x": 687.4286,
+            "y": 103.14284
           }
         },
         {
           "id": "sword",
           "kind": "item",
           "position": {
-            "x": 896.0,
-            "y": 224.0
+            "x": 212.42856,
+            "y": 135.85715
           }
         }
       ],
diff --git a/config.toml b/config.toml
index af5eaf4d55..2a075c3131 100644
--- a/config.toml
+++ b/config.toml
@@ -24,7 +24,7 @@ slide = 'F'
 
 [[input.gamepads]]
 id = 0
-fire = 'A'
-jump = 'X'
+fire = 'X'
+jump = 'A'
 pickup = 'B'
 slide = 'Y'
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 03a469f93e..43b5f6a9e8 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 fishsticks = { version = "0.2.1", git = "https://github.com/fishfight/fishsticks", default-features = false, features = ["gilrs"] }
-macroquad = { version = "0.3.10" }
+macroquad = { version = "=0.3.16" } # Newer versions break is_key_pressed detection
 hecs = "0.7.1"
 serde = { version = "1.0", package = "serde", features = ["derive"] }
 serde_json = { version = "1.0" }
diff --git a/core/src/config.rs b/core/src/config.rs
index fc1c6b9a76..f1105a1aaa 100644
--- a/core/src/config.rs
+++ b/core/src/config.rs
@@ -7,6 +7,7 @@ use crate::input::mapping::InputMapping;
 use crate::Result;
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct Config {
     #[serde(default)]
     pub window: WindowConfig,
@@ -32,6 +33,7 @@ impl Config {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct WindowConfig {
     pub width: u32,
     pub height: u32,
diff --git a/core/src/input/mapping.rs b/core/src/input/mapping.rs
index 50200177e6..8064d5ba45 100644
--- a/core/src/input/mapping.rs
+++ b/core/src/input/mapping.rs
@@ -6,6 +6,7 @@ use crate::error::ErrorKind;
 use crate::Result;
 
 #[derive(Debug, Copy, Clone, PartialEq, Hash, Eq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub enum KeyCode {
     Space,
     Apostrophe,
@@ -387,6 +388,7 @@ impl From<KeyCode> for macroquad::input::KeyCode {
 }
 
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub enum Button {
     A,
     B,
@@ -460,6 +462,7 @@ impl From<Button> for fishsticks::Button {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct KeyMapping {
     primary: KeyCode,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -467,6 +470,7 @@ pub struct KeyMapping {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct KeyboardMapping {
     pub left: KeyCode,
     pub right: KeyCode,
@@ -504,6 +508,7 @@ impl KeyboardMapping {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct GamepadMapping {
     pub id: usize,
     pub fire: Button,
@@ -532,6 +537,7 @@ impl From<&GamepadId> for GamepadMapping {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct InputMapping {
     #[serde(
         default = "KeyboardMapping::default_primary",
diff --git a/core/src/input/mod.rs b/core/src/input/mod.rs
index be8ef2d29a..ef420f3243 100644
--- a/core/src/input/mod.rs
+++ b/core/src/input/mod.rs
@@ -14,6 +14,7 @@ pub use fishsticks::GamepadContext;
 use crate::{Config, Result};
 
 #[derive(Default, Debug, Clone, Copy, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct PlayerInput {
     pub left: bool,
     pub right: bool,
@@ -93,6 +94,8 @@ pub fn collect_local_input(input_scheme: GameInputScheme) -> PlayerInput {
                 .digital_inputs
                 .just_activated(input_mapping.jump.into());
 
+            input.float = gamepad.digital_inputs.activated(input_mapping.jump.into());
+
             input.pickup = gamepad
                 .digital_inputs
                 .just_activated(input_mapping.pickup.into());
diff --git a/core/src/json/helpers.rs b/core/src/json/helpers.rs
index 8e9784900f..c65404587b 100644
--- a/core/src/json/helpers.rs
+++ b/core/src/json/helpers.rs
@@ -19,6 +19,7 @@ pub fn is_false(val: &bool) -> bool {
 /// This can be used to wrap types in order to make serde accept both a value and a vector of
 /// values for a field, when deserializing.
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(untagged)]
 pub enum OneOrMany<T: Clone> {
     One(T),
@@ -55,6 +56,7 @@ impl<T: Clone> From<OneOrMany<T>> for Vec<T> {
 /// Furthermore, you can use `GenericParam::Vec` and `GenericParam::HashMap` to allow members of
 /// different types in the same collection, in your JSON objects.
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(untagged)]
 pub enum GenericParam {
     Bool(bool),
diff --git a/core/src/json/math.rs b/core/src/json/math.rs
index fde4b33087..9386d921c1 100644
--- a/core/src/json/math.rs
+++ b/core/src/json/math.rs
@@ -26,6 +26,7 @@ pub mod vec2_def {
         D: Deserializer<'de>,
     {
         #[derive(Deserialize)]
+        #[serde(deny_unknown_fields)]
         #[serde(field_identifier, rename_all = "snake_case")]
         enum Field {
             X,
@@ -102,6 +103,7 @@ pub mod uvec2_def {
         D: Deserializer<'de>,
     {
         #[derive(Deserialize)]
+        #[serde(deny_unknown_fields)]
         #[serde(field_identifier, rename_all = "snake_case")]
         enum Field {
             X,
@@ -178,6 +180,7 @@ pub mod ivec2_def {
         D: Deserializer<'de>,
     {
         #[derive(Deserialize)]
+        #[serde(deny_unknown_fields)]
         #[serde(field_identifier, rename_all = "snake_case")]
         enum Field {
             X,
@@ -237,6 +240,7 @@ pub mod vec2_opt {
         S: Serializer,
     {
         #[derive(Serialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper<'a>(#[serde(with = "super::vec2_def")] &'a Vec2);
 
         value.as_ref().map(Helper).serialize(serializer)
@@ -247,6 +251,7 @@ pub mod vec2_opt {
         D: Deserializer<'de>,
     {
         #[derive(Deserialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper(#[serde(with = "super::vec2_def")] Vec2);
 
         let helper = Option::deserialize(deserializer)?;
@@ -263,6 +268,7 @@ pub mod vec2_vec {
         S: Serializer,
     {
         #[derive(Serialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper<'a>(#[serde(with = "super::vec2_def")] &'a Vec2);
 
         let helper: Vec<Helper> = value.iter().map(Helper).collect();
@@ -274,6 +280,7 @@ pub mod vec2_vec {
         D: Deserializer<'de>,
     {
         #[derive(Deserialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper(#[serde(with = "super::vec2_def")] Vec2);
 
         let helper = Vec::deserialize(deserializer)?;
@@ -293,6 +300,7 @@ pub mod uvec2_opt {
         S: Serializer,
     {
         #[derive(Serialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper<'a>(#[serde(with = "super::uvec2_def")] &'a UVec2);
 
         value.as_ref().map(Helper).serialize(serializer)
@@ -303,6 +311,7 @@ pub mod uvec2_opt {
         D: Deserializer<'de>,
     {
         #[derive(Deserialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper(#[serde(with = "super::uvec2_def")] UVec2);
 
         let helper = Option::deserialize(deserializer)?;
@@ -319,6 +328,7 @@ pub mod ivec2_opt {
         S: Serializer,
     {
         #[derive(Serialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper<'a>(#[serde(with = "super::ivec2_def")] &'a IVec2);
 
         value.as_ref().map(Helper).serialize(serializer)
@@ -329,6 +339,7 @@ pub mod ivec2_opt {
         D: Deserializer<'de>,
     {
         #[derive(Deserialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper(#[serde(with = "super::ivec2_def")] IVec2);
 
         let helper = Option::deserialize(deserializer)?;
@@ -337,6 +348,7 @@ pub mod ivec2_opt {
 }
 
 #[derive(Copy, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(remote = "Rect")]
 pub struct RectDef {
     x: f32,
@@ -378,6 +390,7 @@ pub mod rect_opt {
         S: Serializer,
     {
         #[derive(Serialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper<'a>(#[serde(with = "RectDef")] &'a Rect);
 
         value.as_ref().map(Helper).serialize(serializer)
@@ -388,6 +401,7 @@ pub mod rect_opt {
         D: Deserializer<'de>,
     {
         #[derive(Deserialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper(#[serde(with = "RectDef")] Rect);
 
         let helper = Option::deserialize(deserializer)?;
diff --git a/core/src/json/render.rs b/core/src/json/render.rs
index a24512c950..3cf76f998c 100644
--- a/core/src/json/render.rs
+++ b/core/src/json/render.rs
@@ -7,6 +7,7 @@ pub fn default_scale() -> f32 {
 }
 
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(remote = "Color")]
 pub struct ColorDef {
     #[serde(rename = "red", alias = "r")]
@@ -50,6 +51,7 @@ pub mod color_opt {
         S: Serializer,
     {
         #[derive(Serialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper<'a>(#[serde(with = "super::ColorDef")] &'a Color);
 
         value.as_ref().map(Helper).serialize(serializer)
@@ -60,6 +62,7 @@ pub mod color_opt {
         D: Deserializer<'de>,
     {
         #[derive(Deserialize)]
+        #[serde(deny_unknown_fields)]
         struct Helper(#[serde(with = "super::ColorDef")] Color);
 
         let helper = Option::deserialize(deserializer)?;
@@ -68,6 +71,7 @@ pub mod color_opt {
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(remote = "FilterMode")]
 pub enum FilterModeDef {
     #[serde(rename = "linear")]
diff --git a/core/src/math.rs b/core/src/math.rs
index fb973d3ac6..d71a89810a 100644
--- a/core/src/math.rs
+++ b/core/src/math.rs
@@ -3,6 +3,7 @@ use macroquad::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Copy, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct URect {
     pub x: u32,
     pub y: u32,
diff --git a/core/src/network/event.rs b/core/src/network/event.rs
index c3c8bec980..a7f3bbb5bf 100644
--- a/core/src/network/event.rs
+++ b/core/src/network/event.rs
@@ -4,6 +4,7 @@ use super::PlayerId;
 use crate::network::Lobby;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum NetworkEvent {
     LobbyCreated {
diff --git a/core/src/network/message.rs b/core/src/network/message.rs
index 1c3178ad70..ddf7e3bbf5 100644
--- a/core/src/network/message.rs
+++ b/core/src/network/message.rs
@@ -5,6 +5,7 @@ use crate::input::PlayerInput;
 use super::PlayerId;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum NetworkMessage {
     UpdatePlayerInput {
diff --git a/core/src/network/mod.rs b/core/src/network/mod.rs
index 52cc76d29f..cbf5dc2905 100644
--- a/core/src/network/mod.rs
+++ b/core/src/network/mod.rs
@@ -16,6 +16,7 @@ pub type LobbyId = String;
 pub type PlayerId = String;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct Server {
     pub http: SocketAddr,
     pub udp: SocketAddr,
@@ -23,6 +24,7 @@ pub struct Server {
 }
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum LobbyPrivacy {
     Public,
@@ -30,6 +32,7 @@ pub enum LobbyPrivacy {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct Lobby {
     pub id: LobbyId,
     pub name: String,
@@ -44,6 +47,7 @@ pub struct Lobby {
 }
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub enum LobbyState {
     NotStarted,
     Ready,
@@ -54,6 +58,7 @@ pub enum LobbyState {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct Player {
     pub id: PlayerId,
     pub username: String,
@@ -71,6 +76,7 @@ impl Player {
 }
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub enum ClientState {
     Unknown,
     Joined,
diff --git a/core/src/network/status.rs b/core/src/network/status.rs
index dc7c44a485..ff20cfc1a5 100644
--- a/core/src/network/status.rs
+++ b/core/src/network/status.rs
@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum RequestStatus {
     Ok,
diff --git a/core/src/text.rs b/core/src/text.rs
index 76fc70f6dc..91b9d1fe20 100644
--- a/core/src/text.rs
+++ b/core/src/text.rs
@@ -5,6 +5,7 @@ use std::path::{Path, PathBuf};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum HorizontalAlignment {
     Left,
@@ -13,6 +14,7 @@ pub enum HorizontalAlignment {
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum VerticalAlignment {
     Top,
diff --git a/src/drawables/animated_sprite.rs b/src/drawables/animated_sprite.rs
index 24b4528cb1..c016ddcbb0 100644
--- a/src/drawables/animated_sprite.rs
+++ b/src/drawables/animated_sprite.rs
@@ -70,6 +70,7 @@ impl From<TweenMetadata> for Tween {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct Keyframe {
     pub frame: u32,
     #[serde(with = "core::json::vec2_def")]
@@ -555,6 +556,7 @@ impl From<&[(&str, AnimatedSprite)]> for AnimatedSpriteSet {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct AnimationMetadata {
     pub id: String,
     pub row: u32,
@@ -578,12 +580,14 @@ impl From<AnimationMetadata> for MQAnimation {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct TweenMetadata {
     pub id: String,
     pub keyframes: Vec<Keyframe>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct AnimatedSpriteMetadata {
     #[serde(rename = "texture")]
     pub texture_id: String,
diff --git a/src/drawables/sprite.rs b/src/drawables/sprite.rs
index 222cfc48a9..7d7b5490cb 100644
--- a/src/drawables/sprite.rs
+++ b/src/drawables/sprite.rs
@@ -14,6 +14,7 @@ use crate::Resources;
 
 /// Parameters for `Sprite` component.
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct SpriteMetadata {
     /// The id of the texture that will be used
     #[serde(rename = "texture")]
diff --git a/src/editor/gui/mod.rs b/src/editor/gui/mod.rs
index 2ace076d40..45fc38630c 100644
--- a/src/editor/gui/mod.rs
+++ b/src/editor/gui/mod.rs
@@ -23,7 +23,7 @@ use macroquad::{
     ui::{root_ui, widgets},
 };
 
-use super::{EditorAction, EditorContext};
+use super::{EditorAction, EditorCamera, EditorContext};
 
 use crate::{
     gui::{GuiResources, ELEMENT_MARGIN},
@@ -141,13 +141,17 @@ impl EditorGui {
             ContextMenuEntry::action("Redo", EditorAction::Redo),
         ];
 
+        let object_world_position = scene::find_node_by_type::<EditorCamera>()
+            .unwrap()
+            .to_world_space(position);
+
         if let Some(layer_id) = &ctx.selected_layer {
             let layer = &map.layers.get(layer_id).unwrap();
             if layer.kind == MapLayerKind::ObjectLayer {
                 entries.push(ContextMenuEntry::action(
                     "Create Object",
                     EditorAction::OpenCreateObjectWindow {
-                        position,
+                        position: object_world_position,
                         layer_id: layer_id.clone(),
                     },
                 ));
diff --git a/src/effects/active/mod.rs b/src/effects/active/mod.rs
index 4309cadee1..7e6b6f5e13 100644
--- a/src/effects/active/mod.rs
+++ b/src/effects/active/mod.rs
@@ -1,5 +1,4 @@
 use hecs::{Entity, World};
-use macroquad::audio::play_sound_once;
 use macroquad::color;
 
 use macroquad::experimental::collections::storage;
@@ -10,6 +9,7 @@ use serde::{Deserialize, Serialize};
 use core::math::{deg_to_rad, rotate_vector, IsZero};
 use core::Result;
 
+use crate::game::play_sound_effect;
 use crate::items::spawn_item;
 use crate::Resources;
 use crate::{PassiveEffectInstance, PassiveEffectMetadata};
@@ -53,10 +53,7 @@ pub fn spawn_active_effect(
     };
 
     if let Some(id) = &params.sound_effect_id {
-        let resources = storage::get::<Resources>();
-        let sound = resources.sounds.get(id).unwrap();
-
-        play_sound_once(*sound);
+        play_sound_effect(id, 1.0);
     }
 
     let mut damage = Vec::new();
@@ -227,6 +224,8 @@ pub fn spawn_active_effect(
 
 /// This holds all the common parameters, available to all implementations, as well as specialized
 /// parameters, in the `ActiveEffectKind`.
+// NOTE: We would prefer to `serde(deny_unknown_fields)` here, but we are blocked by this issue:
+// https://github.com/serde-rs/serde/issues/1358
 #[derive(Clone, Serialize, Deserialize)]
 pub struct ActiveEffectMetadata {
     /// This holds all the specialized parameters for the effect, dependent on the implementation,
@@ -254,6 +253,7 @@ pub struct ActiveEffectMetadata {
 /// The effects that have the `Collider` suffix denote effects that do an immediate collider check,
 /// upon attack, using the weapons `effect_offset` as origin.
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum ActiveEffectKind {
     /// Check for hits with a `Circle` collider.
diff --git a/src/effects/active/projectiles.rs b/src/effects/active/projectiles.rs
index dcbd69e46c..ac7a50bc38 100644
--- a/src/effects/active/projectiles.rs
+++ b/src/effects/active/projectiles.rs
@@ -18,6 +18,7 @@ use core::Transform;
 const PROJECTILE_DRAW_ORDER: u32 = 1;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum ProjectileKind {
     Circle {
diff --git a/src/effects/active/triggered.rs b/src/effects/active/triggered.rs
index 8a7b636ff4..b058a95434 100644
--- a/src/effects/active/triggered.rs
+++ b/src/effects/active/triggered.rs
@@ -20,6 +20,7 @@ const TRIGGERED_EFFECT_DRAW_ORDER: u32 = 5;
 
 /// The various collision types that can trigger a `TriggeredEffect`.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum TriggeredEffectTrigger {
     /// The player that deployed the effect
@@ -379,6 +380,7 @@ pub fn update_triggered_effects(world: &mut World) {
 }
 
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct TriggeredEffectMetadata {
     /// The effects to instantiate when the triggers condition is met
     #[serde(default, alias = "effect")]
@@ -477,6 +479,7 @@ impl Default for TriggeredEffectMetadata {
 }
 
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct TriggeredEffectGrabOptions {
     /// The size of the grab-zone
     #[serde(with = "core::json::vec2_def")]
diff --git a/src/effects/mod.rs b/src/effects/mod.rs
index dc7c6852e3..00f42b64cd 100644
--- a/src/effects/mod.rs
+++ b/src/effects/mod.rs
@@ -9,6 +9,7 @@ pub use active::{ActiveEffectKind, ActiveEffectMetadata, TriggeredEffectTrigger}
 
 /// This is used to allow both active and passive effects to be used as values in JSON
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(untagged)]
 pub enum AnyEffectParams {
     Active(ActiveEffectMetadata),
diff --git a/src/effects/passive/mod.rs b/src/effects/passive/mod.rs
index dddc298716..05dffd93ac 100644
--- a/src/effects/passive/mod.rs
+++ b/src/effects/passive/mod.rs
@@ -101,6 +101,7 @@ impl PassiveEffectInstance {
 }
 
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct PassiveEffectMetadata {
     pub name: String,
     #[serde(default, skip_serializing_if = "Option::is_none")]
diff --git a/src/game/mod.rs b/src/game/mod.rs
index 648577d451..093de572b3 100644
--- a/src/game/mod.rs
+++ b/src/game/mod.rs
@@ -1,5 +1,6 @@
 mod camera;
 mod music;
+pub mod sound;
 
 pub use camera::GameCamera;
 
@@ -33,7 +34,7 @@ use crate::{
 use crate::effects::active::debug_draw_active_effects;
 use crate::effects::active::projectiles::fixed_update_projectiles;
 use crate::effects::active::triggered::{fixed_update_triggered_effects, update_triggered_effects};
-use crate::items::spawn_item;
+use crate::items::{spawn_item, update_respawning_items};
 use crate::map::{
     debug_draw_fish_schools, fixed_update_sproingers, spawn_crab, spawn_decoration,
     spawn_fish_school, spawn_sproinger, update_crabs, update_fish_schools, update_map_kill_zone,
@@ -44,6 +45,7 @@ use crate::network::{
 };
 use crate::particles::{draw_particles, update_particle_emitters};
 pub use music::{start_music, stop_music};
+pub use sound::play_sound_effect;
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub enum GameMode {
@@ -118,6 +120,7 @@ impl Game {
 
         if matches!(mode, GameMode::Local | GameMode::NetworkHost) {
             updates_builder
+                .add_system(update_respawning_items)
                 .add_system(update_map_kill_zone)
                 .add_system(update_player_states)
                 .add_system(update_player_inventory)
diff --git a/src/game/sound.rs b/src/game/sound.rs
new file mode 100644
index 0000000000..3909bbc4ed
--- /dev/null
+++ b/src/game/sound.rs
@@ -0,0 +1,18 @@
+use macroquad::{audio::play_sound, prelude::collections::storage};
+
+use crate::Resources;
+
+/// This is a stand-in until we have volume settings
+pub const SOUND_EFFECT_VOLUME: f32 = 0.4;
+
+pub fn play_sound_effect(sound_id: &str, volume_multiplier: f32) {
+    let resources = storage::get::<Resources>();
+    let sound = resources.sounds[sound_id];
+    play_sound(
+        sound,
+        macroquad::audio::PlaySoundParams {
+            looped: false,
+            volume: SOUND_EFFECT_VOLUME * volume_multiplier,
+        },
+    );
+}
diff --git a/src/gui/main_menu.rs b/src/gui/main_menu.rs
index 83e9a7c8a7..9fd4297766 100644
--- a/src/gui/main_menu.rs
+++ b/src/gui/main_menu.rs
@@ -46,7 +46,8 @@ enum MainMenuState {
 
 const ROOT_OPTION_LOCAL_GAME: usize = 0;
 const ROOT_OPTION_EDITOR: usize = 1;
-const ROOT_OPTION_SETTINGS: usize = 2;
+// Settings haven't been implemented yet
+// const ROOT_OPTION_SETTINGS: usize = 2;
 const ROOT_OPTION_RELOAD_RESOURCES: usize = 3;
 const ROOT_OPTION_CREDITS: usize = 4;
 
@@ -70,12 +71,13 @@ fn build_main_menu() -> Menu {
                 title: "Editor".to_string(),
                 ..Default::default()
             },
-            MenuEntry {
-                index: ROOT_OPTION_SETTINGS,
-                title: "Settings".to_string(),
-                is_disabled: true,
-                ..Default::default()
-            },
+            // Settings haven't been implemented yet
+            // MenuEntry {
+            //     index: ROOT_OPTION_SETTINGS,
+            //     title: "Settings".to_string(),
+            //     is_disabled: true,
+            //     ..Default::default()
+            // },
             #[cfg(debug_assertions)]
             MenuEntry {
                 index: ROOT_OPTION_RELOAD_RESOURCES,
diff --git a/src/items.rs b/src/items.rs
index 4e1a2ecf2a..03b53737ed 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -2,15 +2,17 @@
 //! Proto-mods, eventually some of the items will move to some sort of a wasm runtime
 
 use hecs::{Entity, World};
-use macroquad::audio::{play_sound_once, Sound};
+use macroquad::audio::{play_sound, PlaySoundParams, Sound};
 use macroquad::experimental::collections::storage;
 use macroquad::prelude::*;
 
 use serde::{Deserialize, Serialize};
 
+use crate::game::sound::SOUND_EFFECT_VOLUME;
+use crate::utils::timer::Timer;
 use crate::{
-    ActiveEffectMetadata, AnimatedSpriteMetadata, CollisionWorld, Drawable, PassiveEffectMetadata,
-    PhysicsBody, QueuedAnimationAction, Resources,
+    ActiveEffectMetadata, AnimatedSprite, AnimatedSpriteMetadata, CollisionWorld, Drawable, Owner,
+    PassiveEffectMetadata, PhysicsBody, QueuedAnimationAction, Resources,
 };
 
 use core::{Result, Transform};
@@ -66,6 +68,7 @@ impl Default for ItemDepleteBehavior {
 }
 
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum MapItemKind {
     Weapon {
@@ -87,8 +90,10 @@ pub struct ItemParams {
     pub drop_behavior: ItemDropBehavior,
     pub deplete_behavior: ItemDepleteBehavior,
     pub is_hat: bool,
+    pub respawn_info: Option<RespawnInfo>,
 }
 
+#[derive(Clone)]
 pub struct Item {
     pub id: String,
     pub name: String,
@@ -101,6 +106,7 @@ pub struct Item {
     pub is_hat: bool,
     pub duration_timer: f32,
     pub use_cnt: u32,
+    pub respawn_info: Option<RespawnInfo>,
 }
 
 impl Item {
@@ -114,6 +120,7 @@ impl Item {
             mount_offset: params.mount_offset,
             drop_behavior: params.drop_behavior,
             deplete_behavior: params.deplete_behavior,
+            respawn_info: params.respawn_info,
             is_hat: params.is_hat,
             duration_timer: 0.0,
             use_cnt: 0,
@@ -136,6 +143,8 @@ pub struct ItemMetadata {
     pub is_hat: bool,
 }
 
+// NOTE: We would prefer to `serde(deny_unknown_fields)` here, but we are blocked by this issue:
+// https://github.com/serde-rs/serde/issues/1358
 #[derive(Clone, Serialize, Deserialize)]
 pub struct MapItemMetadata {
     pub id: String,
@@ -154,6 +163,10 @@ pub struct MapItemMetadata {
     pub drop_behavior: ItemDropBehavior,
     #[serde(default)]
     pub deplete_behavior: ItemDepleteBehavior,
+    /// If specified, the item will be respawned if it is depleted or falls off the map, after the
+    /// specified delay in seconds.
+    #[serde(default = "default_respawn_delay")]
+    pub respawn_delay: Option<f32>,
     /// This specifies the offset from the player position to where the equipped item is drawn
     #[serde(default, with = "core::json::vec2_def")]
     pub mount_offset: Vec2,
@@ -162,6 +175,10 @@ pub struct MapItemMetadata {
     pub sprite: AnimatedSpriteMetadata,
 }
 
+fn default_respawn_delay() -> Option<f32> {
+    Some(3.0)
+}
+
 pub fn spawn_item(world: &mut World, position: Vec2, meta: MapItemMetadata) -> Result<Entity> {
     let mut sprites = Vec::new();
 
@@ -203,6 +220,10 @@ pub fn spawn_item(world: &mut World, position: Vec2, meta: MapItemMetadata) -> R
     ));
 
     let uses = meta.uses;
+    let respawn_info = meta.respawn_delay.map(|respawn_delay| RespawnInfo {
+        position,
+        respawn_delay,
+    });
 
     let name = meta.name.clone();
 
@@ -227,6 +248,7 @@ pub fn spawn_item(world: &mut World, position: Vec2, meta: MapItemMetadata) -> R
                         drop_behavior,
                         deplete_behavior,
                         is_hat,
+                        respawn_info,
                     },
                 ),
             )?;
@@ -247,7 +269,8 @@ pub fn spawn_item(world: &mut World, position: Vec2, meta: MapItemMetadata) -> R
             }
 
             if let Some(effect_sprite) = meta.effect_sprite {
-                let sprite = effect_sprite.into();
+                let mut sprite: AnimatedSprite = effect_sprite.into();
+                sprite.is_deactivated = true;
 
                 sprites.push((EFFECT_ANIMATED_SPRITE_ID, sprite));
             }
@@ -272,6 +295,7 @@ pub fn spawn_item(world: &mut World, position: Vec2, meta: MapItemMetadata) -> R
                 effect_offset,
                 drop_behavior,
                 deplete_behavior,
+                respawn_info,
             };
 
             world.insert_one(
@@ -300,6 +324,7 @@ pub struct WeaponParams {
     pub effect_offset: Vec2,
     pub drop_behavior: ItemDropBehavior,
     pub deplete_behavior: ItemDepleteBehavior,
+    pub respawn_info: Option<RespawnInfo>,
 }
 
 impl Default for WeaponParams {
@@ -313,10 +338,12 @@ impl Default for WeaponParams {
             effect_offset: Vec2::ZERO,
             drop_behavior: Default::default(),
             deplete_behavior: Default::default(),
+            respawn_info: None,
         }
     }
 }
 
+#[derive(Clone)]
 pub struct Weapon {
     pub id: String,
     pub name: String,
@@ -332,6 +359,7 @@ pub struct Weapon {
     pub deplete_behavior: ItemDepleteBehavior,
     pub cooldown_timer: f32,
     pub use_cnt: u32,
+    pub respawn_info: Option<RespawnInfo>,
 }
 
 impl Weapon {
@@ -355,6 +383,7 @@ impl Weapon {
             effect_offset: params.effect_offset,
             drop_behavior: params.drop_behavior,
             deplete_behavior: params.deplete_behavior,
+            respawn_info: params.respawn_info,
             cooldown_timer: cooldown,
             use_cnt: 0,
         }
@@ -403,7 +432,13 @@ pub fn fire_weapon(world: &mut World, entity: Entity, owner: Entity) -> Result<(
             weapon.cooldown_timer = 0.0;
 
             if let Some(sound) = weapon.sound_effect {
-                play_sound_once(sound);
+                play_sound(
+                    sound,
+                    PlaySoundParams {
+                        looped: false,
+                        volume: SOUND_EFFECT_VOLUME,
+                    },
+                );
             }
 
             let mut drawable = world.get_mut::<Drawable>(entity).unwrap();
@@ -476,6 +511,7 @@ pub struct WeaponAnimationMetadata {
 /// This holds parameters specific to the `Weapon` variant of `ItemKind`, used to instantiate a
 /// `Weapon` struct instance, when an `Item` of type `Weapon` is picked up.
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct WeaponMetadata {
     /// This specifies the effects to instantiate when the weapon is used to attack
     #[serde(default)]
@@ -532,3 +568,89 @@ impl Default for WeaponMetadata {
         }
     }
 }
+
+#[derive(Clone, Copy, Debug)]
+pub struct RespawnInfo {
+    pub position: Vec2,
+    pub respawn_delay: f32,
+}
+
+/// An item that has been destroyed somehow that should respawn
+#[derive(Clone)]
+pub struct RespawningItem {
+    pub timer: Timer,
+    pub info: RespawnInfo,
+    pub kind: RespawningItemKind,
+}
+
+#[derive(Clone)]
+pub enum RespawningItemKind {
+    Weapon(Weapon),
+    Item(Item),
+}
+
+pub fn update_respawning_items(world: &mut World) {
+    let mut to_spawn = Vec::new();
+
+    for (respawning_item_entity, (respawning_item, transform, body, drawable)) in world
+        .query_mut::<(
+            &mut RespawningItem,
+            &mut Transform,
+            &mut PhysicsBody,
+            &mut Drawable,
+        )>()
+    {
+        let respawning_item: &mut RespawningItem = respawning_item;
+        let transform: &mut Transform = transform;
+        let body: &mut PhysicsBody = body;
+        let drawable: &mut Drawable = drawable;
+
+        respawning_item.timer.tick_frame_time();
+
+        if respawning_item.timer.has_finished() {
+            transform.position = respawning_item.info.position;
+            body.velocity = Vec2::ZERO;
+            body.is_deactivated = false;
+            match &mut drawable.kind {
+                crate::DrawableKind::Sprite(s) => s.is_deactivated = false,
+                crate::DrawableKind::SpriteSet(s) => {
+                    if let Some(sprite) = s.map.get_mut(SPRITE_ANIMATED_SPRITE_ID) {
+                        sprite.is_deactivated = false;
+                    }
+                }
+                crate::DrawableKind::AnimatedSprite(s) => s.is_deactivated = false,
+                crate::DrawableKind::AnimatedSpriteSet(s) => {
+                    if let Some(sprite) = s.map.get_mut(SPRITE_ANIMATED_SPRITE_ID) {
+                        sprite.is_deactivated = false;
+                    }
+                }
+            }
+            to_spawn.push(respawning_item_entity);
+        } else {
+            match &mut drawable.kind {
+                crate::DrawableKind::Sprite(s) => s.is_deactivated = true,
+                crate::DrawableKind::SpriteSet(s) => s.deactivate_all(),
+                crate::DrawableKind::AnimatedSprite(s) => s.is_deactivated = true,
+                crate::DrawableKind::AnimatedSpriteSet(s) => s.deactivate_all(),
+            }
+        }
+    }
+
+    for entity in to_spawn {
+        let respawning_item = world.remove_one::<RespawningItem>(entity).unwrap();
+        world.remove_one::<Owner>(entity).ok();
+
+        match respawning_item.kind {
+            RespawningItemKind::Weapon(mut weapon) => {
+                weapon.use_cnt = 0;
+                world.insert_one(entity, weapon)
+            }
+            RespawningItemKind::Item(mut item) => {
+                item.use_cnt = 0;
+                item.duration_timer = 0.0;
+                world.insert_one(entity, item)
+            }
+        }
+        .unwrap();
+    }
+}
diff --git a/src/json/map/mod.rs b/src/json/map/mod.rs
index 8ad82dd954..c13586ec4e 100644
--- a/src/json/map/mod.rs
+++ b/src/json/map/mod.rs
@@ -13,6 +13,7 @@ use crate::map::{
 pub use tiled::TiledMap;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub(crate) struct MapDef {
     #[serde(
         default = "Map::default_background_color",
@@ -200,6 +201,7 @@ impl From<MapDef> for Map {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct MapLayerDef {
     pub id: String,
     pub kind: MapLayerKind,
diff --git a/src/json/map/tiled.rs b/src/json/map/tiled.rs
index cb6f114718..6144c88a86 100644
--- a/src/json/map/tiled.rs
+++ b/src/json/map/tiled.rs
@@ -12,6 +12,7 @@ use crate::map::{Map, MapLayer, MapLayerKind, MapObject, MapProperty, MapTile, M
 const SPAWN_POINT_MAP_OBJECT_TYPE: &str = "spawn_point";
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case", tag = "type")]
 pub enum TiledProperty {
     Bool { name: String, value: bool },
@@ -24,6 +25,7 @@ pub enum TiledProperty {
 }
 
 #[derive(Debug, Clone, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct TiledObject {
     pub id: u32,
     pub name: String,
@@ -41,6 +43,7 @@ pub struct TiledObject {
 }
 
 #[derive(Debug, Clone, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct TiledTileAttribute {
     pub id: u32,
     #[serde(rename = "type")]
@@ -48,12 +51,14 @@ pub struct TiledTileAttribute {
 }
 
 #[derive(Debug, Clone, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct TiledPolyPoint {
     pub x: f32,
     pub y: f32,
 }
 
 #[derive(Debug, Clone, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct TiledTileset {
     pub columns: i32,
     pub image: String,
@@ -73,6 +78,7 @@ pub struct TiledTileset {
 }
 
 #[derive(Debug, Clone, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct TiledLayer {
     pub name: String,
     pub visible: bool,
@@ -87,6 +93,7 @@ pub struct TiledLayer {
 }
 
 #[derive(Debug, Clone, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct TiledMap {
     // Optional background color
     pub backgroundcolor: Option<String>,
diff --git a/src/map/decoration.rs b/src/map/decoration.rs
index 380f7997d7..f8dd4adb07 100644
--- a/src/map/decoration.rs
+++ b/src/map/decoration.rs
@@ -10,6 +10,7 @@ use core::Transform;
 const DECORATION_DRAW_ORDER: u32 = 0;
 
 #[derive(Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct DecorationMetadata {
     pub id: String,
     pub sprite: AnimatedSpriteMetadata,
diff --git a/src/map/mod.rs b/src/map/mod.rs
index 875132fd35..9ef650afd8 100644
--- a/src/map/mod.rs
+++ b/src/map/mod.rs
@@ -33,6 +33,7 @@ const EXTRA_PLAYABLE_WIDTH: f32 = 400.0;
 pub type MapProperty = core::json::GenericParam;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct MapBackgroundLayer {
     pub texture_id: String,
     pub depth: f32,
@@ -41,6 +42,7 @@ pub struct MapBackgroundLayer {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(into = "json::MapDef", from = "json::MapDef")]
 pub struct Map {
     #[serde(
@@ -455,6 +457,7 @@ impl<'a> Iterator for MapTileIterator<'a> {
 }
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum MapLayerKind {
     TileLayer,
@@ -495,6 +498,7 @@ impl Default for MapLayerKind {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct MapLayer {
     pub id: String,
     pub kind: MapLayerKind,
@@ -550,6 +554,7 @@ impl Default for MapLayer {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct MapTile {
     pub tile_id: u32,
     pub tileset_id: String,
@@ -561,6 +566,7 @@ pub struct MapTile {
 }
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum MapObjectKind {
     Item,
@@ -632,6 +638,7 @@ impl ComboBoxValue for MapObjectKind {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct MapObject {
     pub id: String,
     pub kind: MapObjectKind,
@@ -653,6 +660,7 @@ impl MapObject {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct MapTileset {
     pub id: String,
     pub texture_id: String,
diff --git a/src/map/player_interaction.rs b/src/map/player_interaction.rs
index bf80bb86f2..1c1ea7a075 100644
--- a/src/map/player_interaction.rs
+++ b/src/map/player_interaction.rs
@@ -1,11 +1,13 @@
 use core::Transform;
 
-use hecs::World;
+use hecs::{Entity, World};
 use macroquad::prelude::collections::storage;
 
 use crate::{
+    items::{RespawnInfo, RespawningItem, RespawningItemKind, Weapon},
     player::{Player, PlayerState},
-    PhysicsBody,
+    utils::timer::Timer,
+    Item, PhysicsBody,
 };
 
 use super::Map;
@@ -13,6 +15,7 @@ use super::Map;
 pub fn update_map_kill_zone(world: &mut World) {
     let map = storage::get::<Map>();
 
+    // Kill players out of bounds
     for (_, (player, transform, body)) in world
         .query::<(&mut Player, &Transform, &PhysicsBody)>()
         .iter()
@@ -27,4 +30,81 @@ pub fn update_map_kill_zone(world: &mut World) {
             player.state = PlayerState::Dead;
         }
     }
+
+    struct ToDestroy {
+        entity: Entity,
+        respawn_info: Option<RespawnInfo>,
+    }
+    let mut to_destroy = Vec::new();
+
+    // Despawn items out of bounds
+    for (entity, (item, transform, body)) in world
+        .query::<(&mut Item, &Transform, &PhysicsBody)>()
+        .iter()
+    {
+        let item: &mut Item = item;
+        let transform: &Transform = transform;
+        let body: &PhysicsBody = body;
+
+        let item_rect = body.as_rect(transform.position);
+
+        if !map.get_playable_area().overlaps(&item_rect) {
+            to_destroy.push(ToDestroy {
+                entity,
+                respawn_info: item.respawn_info,
+            })
+        }
+    }
+
+    // Despawn weapons out of bounds
+    for (entity, (weapon, transform, body)) in world
+        .query::<(&mut Weapon, &Transform, &PhysicsBody)>()
+        .iter()
+    {
+        let weapon: &mut Weapon = weapon;
+        let transform: &Transform = transform;
+        let body: &PhysicsBody = body;
+
+        let item_rect = body.as_rect(transform.position);
+
+        if !map.get_playable_area().overlaps(&item_rect) {
+            to_destroy.push(ToDestroy {
+                entity,
+                respawn_info: weapon.respawn_info,
+            })
+        }
+    }
+
+    for to_destroy in to_destroy {
+        let entity = to_destroy.entity;
+
+        if let Some(respawn_info) = to_destroy.respawn_info {
+            if let Ok(weapon) = world.remove_one::<Weapon>(entity) {
+                world
+                    .insert_one(
+                        entity,
+                        RespawningItem {
+                            timer: Timer::new(respawn_info.respawn_delay),
+                            info: respawn_info,
+                            kind: RespawningItemKind::Weapon(weapon),
+                        },
+                    )
+                    .unwrap();
+            } else if let Ok(item) = world.remove_one::<Item>(entity) {
+                world
+                    .insert_one(
+                        entity,
+                        RespawningItem {
+                            timer: Timer::new(respawn_info.respawn_delay),
+                            info: respawn_info,
+                            kind: RespawningItemKind::Item(item),
+                        },
+                    )
+                    .unwrap();
+            }
+        } else if let Err(err) = world.despawn(entity) {
+            #[cfg(debug_assertions)]
+            println!("WARNING: {}", err);
+        }
+    }
 }
diff --git a/src/map/sproinger.rs b/src/map/sproinger.rs
index 2879fb94ff..fe0235e3b7 100644
--- a/src/map/sproinger.rs
+++ b/src/map/sproinger.rs
@@ -1,5 +1,3 @@
-use macroquad::audio::play_sound_once;
-use macroquad::experimental::collections::storage;
 use macroquad::prelude::*;
 use std::collections::HashMap;
 
@@ -8,7 +6,8 @@ use hecs::{Entity, World};
 use core::Result;
 use core::Transform;
 
-use crate::{Animation, Drawable, PhysicsBody, QueuedAnimationAction, Resources};
+use crate::game::play_sound_effect;
+use crate::{Animation, Drawable, PhysicsBody, QueuedAnimationAction};
 
 const SPROINGER_DRAW_ORDER: u32 = 2;
 
@@ -104,11 +103,6 @@ pub fn fixed_update_sproingers(world: &mut World) {
     {
         sproinger.cooldown_timer += dt;
 
-        let sound = {
-            let resources = storage::get::<Resources>();
-            resources.sounds[SOUND_EFFECT_ID]
-        };
-
         if sproinger.cooldown_timer >= COOLDOWN {
             let sprite = drawable.get_animated_sprite_mut().unwrap();
             sprite.set_animation(IDLE_ANIMATION_ID, true);
@@ -128,7 +122,7 @@ pub fn fixed_update_sproingers(world: &mut World) {
                         CONTRACT_ANIMATION_ID.to_string(),
                     ));
 
-                    play_sound_once(sound);
+                    play_sound_effect(SOUND_EFFECT_ID, 1.0);
 
                     continue 'sproingers;
                 }
diff --git a/src/particles.rs b/src/particles.rs
index dedd948a30..3acd0b7e0d 100644
--- a/src/particles.rs
+++ b/src/particles.rs
@@ -14,6 +14,7 @@ use core::Transform;
 use crate::{AnimatedSpriteMetadata, Resources};
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct ParticleEmitterMetadata {
     /// The id of the particle effect.
     #[serde(rename = "particle_effect")]
diff --git a/src/physics.rs b/src/physics.rs
index 12bb7475fc..77d27c5524 100644
--- a/src/physics.rs
+++ b/src/physics.rs
@@ -221,6 +221,7 @@ pub fn debug_draw_physics_bodies(world: &mut World) {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct RigidBodyParams {
     #[serde(with = "core::json::vec2_def")]
     pub offset: Vec2,
diff --git a/src/player/animation.rs b/src/player/animation.rs
index 967d609dfb..a952830cd5 100644
--- a/src/player/animation.rs
+++ b/src/player/animation.rs
@@ -20,6 +20,7 @@ use crate::{Drawable, PhysicsBody};
 ///
 /// Refer to `crate::components::animation_player::AnimationParams` for detailed documentation
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct PlayerAnimationMetadata {
     #[serde(rename = "texture")]
     pub texture_id: String,
@@ -55,6 +56,7 @@ impl From<PlayerAnimationMetadata> for AnimatedSpriteMetadata {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct PlayerAnimations {
     #[serde(default = "PlayerAnimations::default_idle_animation")]
     pub idle: AnimationMetadata,
diff --git a/src/player/character.rs b/src/player/character.rs
index a77ae31477..1dce3b8fa0 100644
--- a/src/player/character.rs
+++ b/src/player/character.rs
@@ -10,6 +10,7 @@ use serde::{Deserialize, Serialize};
 use crate::player::PlayerAnimationMetadata;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct PlayerCharacterMetadata {
     /// This is the id of the player character. This should be unique, or it will either overwrite
     /// or be overwritten, depending on load order, if not.
@@ -86,7 +87,7 @@ impl PlayerCharacterMetadata {
 
     const DEFAULT_GRAVITY: f32 = 1.0;
 
-    const DEFAULT_JUMP_FORCE: f32 = 9.5;
+    const DEFAULT_JUMP_FORCE: f32 = 11.5;
     const DEFAULT_MOVE_SPEED: f32 = 5.0;
     const DEFAULT_SLIDE_SPEED_FACTOR: f32 = 3.0;
     const DEFAULT_SLIDE_DURATION: f32 = 0.1;
diff --git a/src/player/events.rs b/src/player/events.rs
index 4913ccc822..4a4f4df5d0 100644
--- a/src/player/events.rs
+++ b/src/player/events.rs
@@ -41,6 +41,7 @@ pub enum PlayerEvent {
 
 /// This is used in JSON to specify which event types an effect should apply to
 #[derive(Debug, Copy, Clone, Hash, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum PlayerEventKind {
     Update,
diff --git a/src/player/inventory.rs b/src/player/inventory.rs
index d95a827be7..9e969c8b58 100644
--- a/src/player/inventory.rs
+++ b/src/player/inventory.rs
@@ -5,11 +5,13 @@ use hecs::{Entity, With, Without, World};
 use core::Transform;
 
 use crate::items::{
-    fire_weapon, ItemDepleteBehavior, ItemDropBehavior, Weapon, EFFECT_ANIMATED_SPRITE_ID,
-    GROUND_ANIMATION_ID, ITEMS_DRAW_ORDER, SPRITE_ANIMATED_SPRITE_ID,
+    fire_weapon, ItemDepleteBehavior, ItemDropBehavior, RespawnInfo, RespawningItem,
+    RespawningItemKind, Weapon, EFFECT_ANIMATED_SPRITE_ID, GROUND_ANIMATION_ID, ITEMS_DRAW_ORDER,
+    SPRITE_ANIMATED_SPRITE_ID,
 };
 use crate::particles::ParticleEmitter;
 use crate::player::{Player, PlayerController, PlayerState, IDLE_ANIMATION_ID, PICKUP_GRACE_TIME};
+use crate::utils::timer::Timer;
 use crate::{Drawable, Item, Owner, PassiveEffectInstance, PhysicsBody};
 
 const THROW_FORCE: f32 = 5.0;
@@ -73,6 +75,10 @@ pub fn update_player_inventory(world: &mut World) {
 
     let mut to_drop = Vec::new();
     let mut to_fire = Vec::new();
+    struct ToDestroy {
+        entity: Entity,
+        respawn_info: Option<RespawnInfo>,
+    }
     let mut to_destroy = Vec::new();
 
     for (entity, (transform, player, controller, inventory, body)) in world
@@ -184,9 +190,11 @@ pub fn update_player_inventory(world: &mut World) {
                 sprite_set.set_all(IDLE_ANIMATION_ID, true);
             }
 
-            if let Some(weapon_entity) = inventory.weapon {
-                let mut weapon = world.get_mut::<Weapon>(weapon_entity).unwrap();
-
+            if let Some(Ok((weapon_entity, mut weapon))) = inventory.weapon.map(|entity| {
+                world
+                    .get_mut::<Weapon>(entity)
+                    .map(|weapon| (entity, weapon))
+            }) {
                 weapon.cooldown_timer += get_frame_time();
 
                 let mut weapon_transform = world.get_mut::<Transform>(weapon_entity).unwrap();
@@ -245,7 +253,10 @@ pub fn update_player_inventory(world: &mut World) {
                 if is_depleted {
                     match weapon.deplete_behavior {
                         ItemDepleteBehavior::Destroy => {
-                            to_destroy.push(weapon_entity);
+                            to_destroy.push(ToDestroy {
+                                entity: weapon_entity,
+                                respawn_info: weapon.respawn_info,
+                            });
                             inventory.weapon = None;
                         }
                         ItemDepleteBehavior::Drop => {
@@ -373,7 +384,7 @@ pub fn update_player_inventory(world: &mut World) {
     for entity in to_drop {
         world.remove_one::<Owner>(entity).unwrap();
 
-        let mut should_destroy = false;
+        let mut should_destroy = None;
 
         if let Ok(mut weapon) = world.get_mut::<Weapon>(entity) {
             match weapon.drop_behavior {
@@ -382,7 +393,10 @@ pub fn update_player_inventory(world: &mut World) {
                     weapon.cooldown_timer = weapon.cooldown;
                 }
                 ItemDropBehavior::Destroy => {
-                    should_destroy = true;
+                    should_destroy = Some(ToDestroy {
+                        entity,
+                        respawn_info: weapon.respawn_info,
+                    });
                 }
                 _ => {}
             }
@@ -394,17 +408,51 @@ pub fn update_player_inventory(world: &mut World) {
                 }
                 ItemDropBehavior::PersistState => {
                     if let Some(uses) = item.uses {
-                        should_destroy = item.use_cnt >= uses;
+                        should_destroy = if item.use_cnt >= uses {
+                            Some(ToDestroy {
+                                entity,
+                                respawn_info: item.respawn_info,
+                            })
+                        } else {
+                            None
+                        };
                     }
                 }
                 ItemDropBehavior::Destroy => {
-                    should_destroy = true;
+                    should_destroy = Some(ToDestroy {
+                        entity,
+                        respawn_info: item.respawn_info,
+                    });
                 }
             }
         }
 
-        if should_destroy {
-            if let Err(err) = world.despawn(entity) {
+        if let Some(to_destroy) = should_destroy {
+            if let Some(respawn_info) = to_destroy.respawn_info {
+                if let Ok(weapon) = world.remove_one::<Weapon>(entity) {
+                    world
+                        .insert_one(
+                            entity,
+                            RespawningItem {
+                                timer: Timer::new(respawn_info.respawn_delay),
+                                info: respawn_info,
+                                kind: RespawningItemKind::Weapon(weapon),
+                            },
+                        )
+                        .unwrap();
+                } else if let Ok(item) = world.remove_one::<Item>(entity) {
+                    world
+                        .insert_one(
+                            entity,
+                            RespawningItem {
+                                timer: Timer::new(respawn_info.respawn_delay),
+                                info: respawn_info,
+                                kind: RespawningItemKind::Item(item),
+                            },
+                        )
+                        .unwrap();
+                }
+            } else if let Err(err) = world.despawn(entity) {
                 #[cfg(debug_assertions)]
                 println!("WARNING: {}", err);
             }
@@ -445,8 +493,34 @@ pub fn update_player_inventory(world: &mut World) {
         }
     }
 
-    for entity in to_destroy {
-        if let Err(err) = world.despawn(entity) {
+    for to_destroy in to_destroy {
+        let entity = to_destroy.entity;
+        let to_destroy: ToDestroy = to_destroy;
+        if let Some(respawn_info) = to_destroy.respawn_info {
+            if let Ok(weapon) = world.remove_one::<Weapon>(to_destroy.entity) {
+                world
+                    .insert_one(
+                        entity,
+                        RespawningItem {
+                            timer: Timer::new(respawn_info.respawn_delay),
+                            info: respawn_info,
+                            kind: RespawningItemKind::Weapon(weapon),
+                        },
+                    )
+                    .unwrap();
+            } else if let Ok(item) = world.remove_one::<Item>(to_destroy.entity) {
+                world
+                    .insert_one(
+                        entity,
+                        RespawningItem {
+                            timer: Timer::new(respawn_info.respawn_delay),
+                            info: respawn_info,
+                            kind: RespawningItemKind::Item(item),
+                        },
+                    )
+                    .unwrap();
+            }
+        } else if let Err(err) = world.despawn(to_destroy.entity) {
             #[cfg(debug_assertions)]
             println!("WARNING: {}", err);
         }
@@ -473,8 +547,7 @@ const HUD_USE_COUNT_COLOR_EMPTY: Color = Color {
 
 pub fn draw_weapons_hud(world: &mut World) {
     for (_, (transform, inventory)) in world.query::<(&Transform, &PlayerInventory)>().iter() {
-        if let Some(weapon_entity) = inventory.weapon {
-            let weapon = world.get::<Weapon>(weapon_entity).unwrap();
+        if let Some(Ok(weapon)) = inventory.weapon.map(|entity| world.get::<Weapon>(entity)) {
             if let Some(uses) = weapon.uses {
                 let is_destroyed_on_depletion =
                     weapon.deplete_behavior == ItemDepleteBehavior::Destroy;
diff --git a/src/player/mod.rs b/src/player/mod.rs
index 3b4eabaa4c..45e706b8ed 100644
--- a/src/player/mod.rs
+++ b/src/player/mod.rs
@@ -70,6 +70,7 @@ pub struct Player {
     pub respawn_timer: f32,
     pub camera_box: Rect,
     pub passive_effects: Vec<PassiveEffectInstance>,
+    pub was_on_ground: bool,
 }
 
 impl Player {
@@ -83,6 +84,7 @@ impl Player {
             is_facing_left: false,
             is_upside_down: false,
             is_attacking: false,
+            was_on_ground: false,
             jump_frame_counter: 0,
             pickup_grace_timer: 0.0,
             attack_timer: 0.0,
diff --git a/src/player/state.rs b/src/player/state.rs
index 0b568740c8..d6588ac7fc 100644
--- a/src/player/state.rs
+++ b/src/player/state.rs
@@ -1,4 +1,3 @@
-use macroquad::audio::play_sound_once;
 use macroquad::experimental::collections::storage;
 use macroquad::prelude::*;
 
@@ -6,13 +5,12 @@ use hecs::{Entity, World};
 
 use core::Transform;
 
+use crate::game::play_sound_effect;
 use crate::player::{
     Player, PlayerAttributes, PlayerController, PlayerEventQueue, JUMP_SOUND_ID, LAND_SOUND_ID,
     RESPAWN_DELAY,
 };
-use crate::{
-    CollisionWorld, Drawable, DrawableKind, Item, Map, PhysicsBody, PlayerEvent, Resources,
-};
+use crate::{CollisionWorld, Drawable, DrawableKind, Item, Map, PhysicsBody, PlayerEvent};
 
 const SLIDE_STOP_THRESHOLD: f32 = 2.0;
 const JUMP_FRAME_COUNT: u16 = 8;
@@ -146,10 +144,7 @@ pub fn update_player_states(world: &mut World) {
 
                     player.state = PlayerState::Jumping;
 
-                    let resources = storage::get::<Resources>();
-                    let sound = resources.sounds[JUMP_SOUND_ID];
-
-                    play_sound_once(sound);
+                    play_sound_effect(JUMP_SOUND_ID, 0.4);
                 } else if player.state == PlayerState::Jumping {
                     player.jump_frame_counter += 1;
 
@@ -175,20 +170,22 @@ pub fn update_player_states(world: &mut World) {
                 }
             }
 
-            if body.is_on_ground && !body.was_on_ground {
+            // Note we can't use `body.was_on_ground` because it is only updated on fixed update,
+            // and this function may run multiple times in one fixed update, resulting in the
+            // landing sound being played more than once.
+            if body.is_on_ground && !player.was_on_ground {
                 if matches!(player.state, PlayerState::Jumping | PlayerState::Floating) {
                     player.state = PlayerState::None;
                 }
 
+                play_sound_effect(LAND_SOUND_ID, 0.4);
+
                 player.jump_frame_counter = 0;
                 body.has_mass = true;
-
-                let resources = storage::get::<Resources>();
-                let sound = resources.sounds[LAND_SOUND_ID];
-
-                play_sound_once(sound);
             }
         }
+
+        player.was_on_ground = body.is_on_ground;
     }
 }
 
diff --git a/src/resources.rs b/src/resources.rs
index c0555619d5..806884cefc 100644
--- a/src/resources.rs
+++ b/src/resources.rs
@@ -44,18 +44,21 @@ const ACTIVE_MODS_FILE_NAME: &str = "active_mods";
 const MOD_FILE_NAME: &str = "fishfight_mod";
 
 #[derive(Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct ParticleEffectMetadata {
     id: String,
     path: String,
 }
 
 #[derive(Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 struct SoundMetadata {
     id: String,
     path: String,
 }
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum TextureKind {
     Background,
@@ -64,6 +67,7 @@ pub enum TextureKind {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct TextureMetadata {
     pub id: String,
     pub path: String,
@@ -110,6 +114,7 @@ impl From<TextureResource> for Texture2D {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct ImageMetadata {
     pub id: String,
     pub path: String,
@@ -124,6 +129,7 @@ pub struct ImageResource {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct MapMetadata {
     pub name: String,
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -581,6 +587,7 @@ pub async fn load_resources(assets_dir: &str, mods_dir: &str) -> Result<()> {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct ModMetadata {
     pub id: String,
     #[serde(default)]
@@ -597,12 +604,14 @@ pub struct ModMetadata {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct DependencyMetadata {
     pub id: String,
     pub version: String,
 }
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields)]
 #[serde(rename_all = "snake_case")]
 pub enum ModKind {
     DataOnly,
diff --git a/src/utils/timer.rs b/src/utils/timer.rs
index a1c4977f74..e021649bfc 100644
--- a/src/utils/timer.rs
+++ b/src/utils/timer.rs
@@ -1,5 +1,5 @@
 /// A simple timer utility
-#[derive(Debug)]
+#[derive(Debug, Clone, Copy)]
 pub struct Timer {
     duration: f32,
     elapsed: f32,