diff --git a/Cargo.toml b/Cargo.toml
index 377c80a..1981e05 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 notan = { version = "0.10.0", features = ["text", "audio"] }
 bracket-lib = { git = "https://github.com/amethyst/bracket-lib.git", rev = "851f6f08675444fb6fa088b9e67bee9fd75554c6", features = ["serde"] }
 regex = "1.3.6"
-specs = { version = "0.16.1", features = ["serde"] }
+specs = { version = "0.20.0", features = ["serde"] }
 specs-derive = "0.4.1"
 serde = { version = "1.0.93", features = ["derive"]}
 serde_json = "1.0.39"
diff --git a/resources/atlas.json b/resources/atlas.json
index 07e2052..dd8efd7 100644
--- a/resources/atlas.json
+++ b/resources/atlas.json
@@ -185,7 +185,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "beartrap",
+	"filename": "bars",
 	"frame": {"x":352,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -193,7 +193,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "bed",
+	"filename": "beartrap",
 	"frame": {"x":368,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -201,7 +201,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-7",
+	"filename": "bed",
 	"frame": {"x":384,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -209,7 +209,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-8",
+	"filename": "blood-7",
 	"frame": {"x":400,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -217,7 +217,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-9",
+	"filename": "blood-8",
 	"frame": {"x":416,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -225,7 +225,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-10",
+	"filename": "blood-9",
 	"frame": {"x":432,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -233,7 +233,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-11",
+	"filename": "blood-10",
 	"frame": {"x":448,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -241,7 +241,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-12",
+	"filename": "blood-11",
 	"frame": {"x":464,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -249,7 +249,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-13",
+	"filename": "blood-12",
 	"frame": {"x":480,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -257,7 +257,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood1",
+	"filename": "blood-13",
 	"frame": {"x":496,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -265,7 +265,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood2",
+	"filename": "blood1",
 	"frame": {"x":512,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -273,7 +273,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood3",
+	"filename": "blood2",
 	"frame": {"x":528,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -281,7 +281,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood4",
+	"filename": "blood3",
 	"frame": {"x":544,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -289,7 +289,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood5",
+	"filename": "blood4",
 	"frame": {"x":560,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -297,7 +297,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood6",
+	"filename": "blood5",
 	"frame": {"x":576,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -305,7 +305,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood7",
+	"filename": "blood6",
 	"frame": {"x":592,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -313,7 +313,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (1)",
+	"filename": "blood7",
 	"frame": {"x":608,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -321,7 +321,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (3)",
+	"filename": "body (1)",
 	"frame": {"x":624,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -329,7 +329,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (4)",
+	"filename": "body (3)",
 	"frame": {"x":640,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -337,7 +337,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (5)",
+	"filename": "body (4)",
 	"frame": {"x":656,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -345,7 +345,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (6)",
+	"filename": "body (5)",
 	"frame": {"x":672,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -353,7 +353,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (7)",
+	"filename": "body (6)",
 	"frame": {"x":688,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -361,7 +361,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (8)",
+	"filename": "body (7)",
 	"frame": {"x":704,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -369,7 +369,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (9)",
+	"filename": "body (8)",
 	"frame": {"x":720,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -377,7 +377,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (10)",
+	"filename": "body (9)",
 	"frame": {"x":736,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -385,7 +385,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body_leather",
+	"filename": "body (10)",
 	"frame": {"x":752,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -393,7 +393,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "candelabra",
+	"filename": "body_leather",
 	"frame": {"x":768,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -401,7 +401,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "cat",
+	"filename": "candelabra",
 	"frame": {"x":784,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -409,7 +409,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "cat_large",
+	"filename": "cat",
 	"frame": {"x":800,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -417,7 +417,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "caterpillar",
+	"filename": "cat_large",
 	"frame": {"x":816,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -425,7 +425,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "chair_r",
+	"filename": "caterpillar",
 	"frame": {"x":832,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -433,7 +433,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "cracked",
+	"filename": "chair_r",
 	"frame": {"x":848,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -441,7 +441,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "dagger",
+	"filename": "cracked",
 	"frame": {"x":864,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -449,7 +449,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "dog",
+	"filename": "dagger",
 	"frame": {"x":880,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -457,7 +457,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "door",
+	"filename": "dog",
 	"frame": {"x":896,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -465,7 +465,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "door_open",
+	"filename": "door",
 	"frame": {"x":912,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -473,7 +473,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "dot",
+	"filename": "door_open",
 	"frame": {"x":928,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -481,7 +481,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "dwarf",
+	"filename": "dot",
 	"frame": {"x":944,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -489,7 +489,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (1)",
+	"filename": "dwarf",
 	"frame": {"x":960,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -497,7 +497,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (2)",
+	"filename": "feet (1)",
 	"frame": {"x":976,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -505,7 +505,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (3)",
+	"filename": "feet (2)",
 	"frame": {"x":992,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -513,7 +513,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (4)",
+	"filename": "feet (3)",
 	"frame": {"x":1008,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -521,7 +521,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (5)",
+	"filename": "feet (4)",
 	"frame": {"x":1024,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -529,7 +529,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (6)",
+	"filename": "feet (5)",
 	"frame": {"x":1040,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -537,7 +537,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (7)",
+	"filename": "feet (6)",
 	"frame": {"x":1056,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -545,7 +545,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "fence",
+	"filename": "feet (7)",
 	"frame": {"x":1072,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -553,7 +553,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "fluff",
+	"filename": "fence",
 	"frame": {"x":1088,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -561,7 +561,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "fluff2",
+	"filename": "fluff",
 	"frame": {"x":1104,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -569,7 +569,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-0",
+	"filename": "fluff2",
 	"frame": {"x":1120,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -577,7 +577,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-1",
+	"filename": "general-0",
 	"frame": {"x":1136,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -585,7 +585,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-3",
+	"filename": "general-1",
 	"frame": {"x":1152,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -593,295 +593,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-4",
-	"frame": {"x":1168,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-5",
-	"frame": {"x":928,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-6",
-	"frame": {"x":1184,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-7",
-	"frame": {"x":1200,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-8",
-	"frame": {"x":928,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-9",
-	"frame": {"x":1216,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-10",
-	"frame": {"x":1232,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-11",
-	"frame": {"x":928,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-12",
-	"frame": {"x":1248,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-13",
-	"frame": {"x":1264,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-14",
-	"frame": {"x":1280,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-18",
-	"frame": {"x":1296,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-19",
-	"frame": {"x":1312,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-20",
-	"frame": {"x":1328,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-21",
-	"frame": {"x":1344,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-22",
-	"frame": {"x":1360,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-23",
-	"frame": {"x":1376,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-24",
-	"frame": {"x":1392,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-25",
-	"frame": {"x":1408,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-26",
-	"frame": {"x":1424,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-27",
-	"frame": {"x":1440,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-28",
-	"frame": {"x":1456,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-29",
-	"frame": {"x":1472,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-30",
-	"frame": {"x":1488,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-31",
-	"frame": {"x":1504,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-32",
-	"frame": {"x":1520,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-33",
-	"frame": {"x":1536,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-34",
-	"frame": {"x":1552,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-35",
-	"frame": {"x":1568,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-36",
-	"frame": {"x":1584,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-37",
-	"frame": {"x":1600,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-38",
-	"frame": {"x":1616,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-39",
-	"frame": {"x":1632,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-40",
-	"frame": {"x":1648,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-41",
-	"frame": {"x":1664,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-42",
-	"frame": {"x":1680,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-43",
+	"filename": "general-3",
 	"frame": {"x":0,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -889,7 +601,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-44",
+	"filename": "general-4",
 	"frame": {"x":16,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -897,7 +609,15 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-45",
+	"filename": "general-5",
+	"frame": {"x":944,"y":0,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "general-6",
 	"frame": {"x":32,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -905,7 +625,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-46",
+	"filename": "general-7",
 	"frame": {"x":48,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -913,7 +633,15 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-47",
+	"filename": "general-8",
+	"frame": {"x":944,"y":0,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "general-9",
 	"frame": {"x":64,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -921,7 +649,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-48",
+	"filename": "general-10",
 	"frame": {"x":80,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -929,7 +657,15 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-49",
+	"filename": "general-11",
+	"frame": {"x":944,"y":0,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "general-12",
 	"frame": {"x":96,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -937,7 +673,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-50",
+	"filename": "general-13",
 	"frame": {"x":112,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -945,7 +681,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-51",
+	"filename": "general-14",
 	"frame": {"x":128,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -953,7 +689,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-52",
+	"filename": "general-18",
 	"frame": {"x":144,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -961,7 +697,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-53",
+	"filename": "general-19",
 	"frame": {"x":160,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -969,7 +705,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-54",
+	"filename": "general-20",
 	"frame": {"x":176,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -977,7 +713,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-55",
+	"filename": "general-21",
 	"frame": {"x":192,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -985,7 +721,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "gnome",
+	"filename": "general-22",
 	"frame": {"x":208,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -993,7 +729,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "goblin",
+	"filename": "general-23",
 	"frame": {"x":224,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1001,7 +737,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "goblin_c",
+	"filename": "general-24",
 	"frame": {"x":240,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1009,7 +745,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "grass",
+	"filename": "general-25",
 	"frame": {"x":256,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1017,7 +753,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "grass_flower",
+	"filename": "general-26",
 	"frame": {"x":272,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1025,7 +761,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "grass_small",
+	"filename": "general-27",
 	"frame": {"x":288,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1033,7 +769,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "handaxe",
+	"filename": "general-28",
 	"frame": {"x":304,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1041,7 +777,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (1)",
+	"filename": "general-29",
 	"frame": {"x":320,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1049,7 +785,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (2)",
+	"filename": "general-30",
 	"frame": {"x":336,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1057,7 +793,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (3)",
+	"filename": "general-31",
 	"frame": {"x":352,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1065,7 +801,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (4)",
+	"filename": "general-32",
 	"frame": {"x":368,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1073,7 +809,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (5)",
+	"filename": "general-33",
 	"frame": {"x":384,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1081,7 +817,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (6)",
+	"filename": "general-34",
 	"frame": {"x":400,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1089,7 +825,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (7)",
+	"filename": "general-35",
 	"frame": {"x":416,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1097,7 +833,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (8)",
+	"filename": "general-36",
 	"frame": {"x":432,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1105,7 +841,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (9)",
+	"filename": "general-37",
 	"frame": {"x":448,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1113,7 +849,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (10)",
+	"filename": "general-38",
 	"frame": {"x":464,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1121,7 +857,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "horse",
+	"filename": "general-39",
 	"frame": {"x":480,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1129,7 +865,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "kobold",
+	"filename": "general-40",
 	"frame": {"x":496,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1137,7 +873,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "kobold_captain",
+	"filename": "general-41",
 	"frame": {"x":512,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1145,7 +881,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "kobold_large",
+	"filename": "general-42",
 	"frame": {"x":528,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1153,7 +889,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "legs (1)",
+	"filename": "general-43",
 	"frame": {"x":544,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1161,7 +897,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "legs (2)",
+	"filename": "general-44",
 	"frame": {"x":560,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1169,7 +905,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "legs (3)",
+	"filename": "general-45",
 	"frame": {"x":576,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1177,7 +913,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "legs (4)",
+	"filename": "general-46",
 	"frame": {"x":592,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1185,7 +921,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "legs (5)",
+	"filename": "general-47",
 	"frame": {"x":608,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1193,7 +929,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "magic_trap",
+	"filename": "general-48",
 	"frame": {"x":624,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1201,7 +937,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "meat",
+	"filename": "general-49",
 	"frame": {"x":640,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1209,7 +945,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "minimine",
+	"filename": "general-50",
 	"frame": {"x":656,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1217,7 +953,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "neck",
+	"filename": "general-51",
 	"frame": {"x":672,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1225,7 +961,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "ogre",
+	"filename": "general-52",
 	"frame": {"x":688,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1233,7 +969,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "orc",
+	"filename": "general-53",
 	"frame": {"x":704,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1241,7 +977,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "planks",
+	"filename": "general-54",
 	"frame": {"x":720,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1249,7 +985,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "planks_missing",
+	"filename": "general-55",
 	"frame": {"x":736,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1257,7 +993,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "planks_missing2",
+	"filename": "gnome",
 	"frame": {"x":752,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1265,7 +1001,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "plants",
+	"filename": "goblin",
 	"frame": {"x":768,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1273,7 +1009,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "potion",
+	"filename": "goblin_c",
 	"frame": {"x":784,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1281,7 +1017,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "potion_beaker",
+	"filename": "grass",
 	"frame": {"x":800,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1289,7 +1025,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "potion_conical",
+	"filename": "grass_flower",
 	"frame": {"x":816,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1297,7 +1033,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "potion_large",
+	"filename": "grass_small",
 	"frame": {"x":832,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1305,7 +1041,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-0",
+	"filename": "handaxe",
 	"frame": {"x":848,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1313,7 +1049,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-1",
+	"filename": "head (1)",
 	"frame": {"x":864,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1321,7 +1057,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-2",
+	"filename": "head (2)",
 	"frame": {"x":880,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1329,7 +1065,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-3",
+	"filename": "head (3)",
 	"frame": {"x":896,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1337,7 +1073,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-4",
+	"filename": "head (4)",
 	"frame": {"x":912,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1345,7 +1081,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-5",
+	"filename": "head (5)",
 	"frame": {"x":928,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1353,7 +1089,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-6",
+	"filename": "head (6)",
 	"frame": {"x":944,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1361,7 +1097,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-7",
+	"filename": "head (7)",
 	"frame": {"x":960,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1369,7 +1105,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-8",
+	"filename": "head (8)",
 	"frame": {"x":976,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1377,7 +1113,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-9",
+	"filename": "head (9)",
 	"frame": {"x":992,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1385,7 +1121,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-10",
+	"filename": "head (10)",
 	"frame": {"x":1008,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1393,7 +1129,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-11",
+	"filename": "horse",
 	"frame": {"x":1024,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1401,7 +1137,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-12",
+	"filename": "kobold",
 	"frame": {"x":1040,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1409,7 +1145,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-13",
+	"filename": "kobold_captain",
 	"frame": {"x":1056,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1417,7 +1153,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-14",
+	"filename": "kobold_large",
 	"frame": {"x":1072,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1425,7 +1161,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-15",
+	"filename": "legs (1)",
 	"frame": {"x":1088,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1433,7 +1169,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-16",
+	"filename": "legs (2)",
 	"frame": {"x":1104,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1441,7 +1177,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-17",
+	"filename": "legs (3)",
 	"frame": {"x":1120,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1449,7 +1185,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-18",
+	"filename": "legs (4)",
 	"frame": {"x":1136,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1457,16 +1193,288 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-19",
+	"filename": "legs (5)",
 	"frame": {"x":1152,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
 	"sourceSize": {"w":16,"h":24}
 },
+{
+	"filename": "magic_trap",
+	"frame": {"x":0,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "meat",
+	"frame": {"x":16,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "minimine",
+	"frame": {"x":32,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "neck",
+	"frame": {"x":48,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "ogre",
+	"frame": {"x":64,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "orc",
+	"frame": {"x":80,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "planks",
+	"frame": {"x":96,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "planks_missing",
+	"frame": {"x":112,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "planks_missing2",
+	"frame": {"x":128,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "plants",
+	"frame": {"x":144,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "potion",
+	"frame": {"x":160,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "potion_beaker",
+	"frame": {"x":176,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "potion_conical",
+	"frame": {"x":192,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "potion_large",
+	"frame": {"x":208,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-0",
+	"frame": {"x":224,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-1",
+	"frame": {"x":240,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-2",
+	"frame": {"x":256,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-3",
+	"frame": {"x":272,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-4",
+	"frame": {"x":288,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-5",
+	"frame": {"x":304,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-6",
+	"frame": {"x":320,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-7",
+	"frame": {"x":336,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-8",
+	"frame": {"x":352,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-9",
+	"frame": {"x":368,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-10",
+	"frame": {"x":384,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-11",
+	"frame": {"x":400,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-12",
+	"frame": {"x":416,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-13",
+	"frame": {"x":432,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-14",
+	"frame": {"x":448,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-15",
+	"frame": {"x":464,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-16",
+	"frame": {"x":480,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-17",
+	"frame": {"x":496,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-18",
+	"frame": {"x":512,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-19",
+	"frame": {"x":528,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
 {
 	"filename": "projectiles-20",
-	"frame": {"x":1168,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1474,7 +1482,7 @@
 },
 {
 	"filename": "projectiles-21",
-	"frame": {"x":1168,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1482,7 +1490,7 @@
 },
 {
 	"filename": "projectiles-22",
-	"frame": {"x":1168,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1490,7 +1498,7 @@
 },
 {
 	"filename": "projectiles-23",
-	"frame": {"x":1168,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1498,7 +1506,7 @@
 },
 {
 	"filename": "projectiles-24",
-	"frame": {"x":1168,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1506,7 +1514,7 @@
 },
 {
 	"filename": "projectiles-25",
-	"frame": {"x":1184,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1514,7 +1522,7 @@
 },
 {
 	"filename": "projectiles-26",
-	"frame": {"x":1184,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1522,7 +1530,7 @@
 },
 {
 	"filename": "projectiles-27",
-	"frame": {"x":1184,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1530,7 +1538,7 @@
 },
 {
 	"filename": "projectiles-28",
-	"frame": {"x":1184,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1538,7 +1546,7 @@
 },
 {
 	"filename": "projectiles-29",
-	"frame": {"x":1184,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1546,7 +1554,7 @@
 },
 {
 	"filename": "rat",
-	"frame": {"x":1200,"y":24,"w":16,"h":24},
+	"frame": {"x":576,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1554,7 +1562,7 @@
 },
 {
 	"filename": "rat_large",
-	"frame": {"x":1216,"y":24,"w":16,"h":24},
+	"frame": {"x":592,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1562,7 +1570,7 @@
 },
 {
 	"filename": "scimitar",
-	"frame": {"x":1232,"y":24,"w":16,"h":24},
+	"frame": {"x":608,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1570,7 +1578,7 @@
 },
 {
 	"filename": "scroll",
-	"frame": {"x":1248,"y":24,"w":16,"h":24},
+	"frame": {"x":624,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1578,7 +1586,7 @@
 },
 {
 	"filename": "scroll_writing",
-	"frame": {"x":1264,"y":24,"w":16,"h":24},
+	"frame": {"x":640,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1586,7 +1594,7 @@
 },
 {
 	"filename": "shield_large",
-	"frame": {"x":1280,"y":24,"w":16,"h":24},
+	"frame": {"x":656,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1594,7 +1602,7 @@
 },
 {
 	"filename": "shield_round",
-	"frame": {"x":1296,"y":24,"w":16,"h":24},
+	"frame": {"x":672,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1602,7 +1610,7 @@
 },
 {
 	"filename": "shield_small",
-	"frame": {"x":1312,"y":24,"w":16,"h":24},
+	"frame": {"x":688,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1610,7 +1618,7 @@
 },
 {
 	"filename": "shortsword",
-	"frame": {"x":1328,"y":24,"w":16,"h":24},
+	"frame": {"x":704,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1618,7 +1626,7 @@
 },
 {
 	"filename": "slash1",
-	"frame": {"x":1344,"y":24,"w":16,"h":24},
+	"frame": {"x":720,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1626,7 +1634,7 @@
 },
 {
 	"filename": "slash2",
-	"frame": {"x":1360,"y":24,"w":16,"h":24},
+	"frame": {"x":736,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1634,7 +1642,7 @@
 },
 {
 	"filename": "slash3",
-	"frame": {"x":1376,"y":24,"w":16,"h":24},
+	"frame": {"x":752,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1642,7 +1650,7 @@
 },
 {
 	"filename": "spider",
-	"frame": {"x":1392,"y":24,"w":16,"h":24},
+	"frame": {"x":768,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1650,7 +1658,7 @@
 },
 {
 	"filename": "spider_large",
-	"frame": {"x":1408,"y":24,"w":16,"h":24},
+	"frame": {"x":784,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1658,7 +1666,7 @@
 },
 {
 	"filename": "statue",
-	"frame": {"x":1424,"y":24,"w":16,"h":24},
+	"frame": {"x":800,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1666,7 +1674,7 @@
 },
 {
 	"filename": "stones",
-	"frame": {"x":1440,"y":24,"w":16,"h":24},
+	"frame": {"x":816,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1674,7 +1682,7 @@
 },
 {
 	"filename": "table",
-	"frame": {"x":1456,"y":24,"w":16,"h":24},
+	"frame": {"x":832,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1682,7 +1690,7 @@
 },
 {
 	"filename": "table_l_chair",
-	"frame": {"x":1472,"y":24,"w":16,"h":24},
+	"frame": {"x":848,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1690,7 +1698,7 @@
 },
 {
 	"filename": "table_r",
-	"frame": {"x":1488,"y":24,"w":16,"h":24},
+	"frame": {"x":864,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1698,7 +1706,7 @@
 },
 {
 	"filename": "tiles",
-	"frame": {"x":1504,"y":24,"w":16,"h":24},
+	"frame": {"x":880,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1706,7 +1714,7 @@
 },
 {
 	"filename": "tiles2",
-	"frame": {"x":1520,"y":24,"w":16,"h":24},
+	"frame": {"x":896,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1714,7 +1722,63 @@
 },
 {
 	"filename": "tiles3",
-	"frame": {"x":1536,"y":24,"w":16,"h":24},
+	"frame": {"x":912,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles4",
+	"frame": {"x":928,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing",
+	"frame": {"x":944,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing2",
+	"frame": {"x":960,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing3",
+	"frame": {"x":976,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing4",
+	"frame": {"x":992,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing5",
+	"frame": {"x":1008,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing6",
+	"frame": {"x":1024,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1722,7 +1786,7 @@
 },
 {
 	"filename": "trapdoor",
-	"frame": {"x":1552,"y":24,"w":16,"h":24},
+	"frame": {"x":1040,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1730,7 +1794,7 @@
 },
 {
 	"filename": "trapdoor_open",
-	"frame": {"x":1568,"y":24,"w":16,"h":24},
+	"frame": {"x":1056,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1738,7 +1802,7 @@
 },
 {
 	"filename": "trident",
-	"frame": {"x":1584,"y":24,"w":16,"h":24},
+	"frame": {"x":1072,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1746,7 +1810,7 @@
 },
 {
 	"filename": "wall",
-	"frame": {"x":1600,"y":24,"w":16,"h":24},
+	"frame": {"x":1088,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1754,7 +1818,7 @@
 },
 {
 	"filename": "wall_b",
-	"frame": {"x":1616,"y":24,"w":16,"h":24},
+	"frame": {"x":1104,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1762,7 +1826,7 @@
 },
 {
 	"filename": "wall_b_cracked",
-	"frame": {"x":1632,"y":24,"w":16,"h":24},
+	"frame": {"x":1120,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1770,7 +1834,7 @@
 },
 {
 	"filename": "water",
-	"frame": {"x":1648,"y":24,"w":16,"h":24},
+	"frame": {"x":1136,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1778,7 +1842,7 @@
 },
 {
 	"filename": "water2",
-	"frame": {"x":1664,"y":24,"w":16,"h":24},
+	"frame": {"x":1152,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1789,8 +1853,8 @@
 	"version": "1.0",
 	"image": "atlas.png",
 	"format": "RGBA8888",
-	"size": {"w":1696,"h":48},
+	"size": {"w":1168,"h":72},
 	"scale": "1",
-	"smartupdate": "$TexturePacker:SmartUpdate:e80637f80ce36daf70881837d579d889:415603bd51025bb7baa2d3213ac8015d:cbce6b53f0f49e0bf15173c25c41f876$"
+	"smartupdate": "$TexturePacker:SmartUpdate:b0e758ec509f6276e43ca3eb96af6b5a:b0ecaa10300e440b4ca12ec209a0969c:cbce6b53f0f49e0bf15173c25c41f876$"
 }
 }
diff --git a/resources/atlas.png b/resources/atlas.png
index af1dfb5..595ca02 100644
Binary files a/resources/atlas.png and b/resources/atlas.png differ
diff --git a/src/map/themes.rs b/src/map/themes.rs
index ff51738..c118f47 100644
--- a/src/map/themes.rs
+++ b/src/map/themes.rs
@@ -41,7 +41,7 @@ pub fn get_sprite_for_id(idx: usize, map: &Map, other_pos: Option<Point>) -> (&s
         }
     };
     // Apply our offsets to our base colour.
-    colour = apply_colour_offset(colour, map, idx, offset, false);
+    colour = apply_colour_offset(colour, map, idx, offset, true);
     // Apply our visibility modifier
     colour = colour.mul(visibility);
     // Convert to a notan colour.
diff --git a/src/map/tiletype.rs b/src/map/tiletype.rs
index 20958d0..063c3bd 100644
--- a/src/map/tiletype.rs
+++ b/src/map/tiletype.rs
@@ -49,12 +49,21 @@ impl TileType {
             TileType::ImpassableMountain => vec!["wall_b"],
             TileType::Wall => vec!["wall"],
             TileType::DeepWater => vec!["water", "water2"],
-            TileType::Fence => vec!["fence"],
+            TileType::Fence => vec!["tiles4"],
             TileType::Bars => vec!["wall_b"],
-            TileType::Floor => vec!["dot", "fluff", "fluff2"],
+            TileType::Floor => vec!["dot"],
             TileType::WoodFloor => vec!["planks", "planks_missing", "planks_missing2"],
             TileType::Gravel => vec!["fluff", "fluff2"],
-            TileType::Road => vec!["tiles"],
+            TileType::Road =>
+                vec![
+                    "tiles",
+                    "tiles_missing",
+                    "tiles_missing2",
+                    "tiles_missing3",
+                    "tiles_missing4",
+                    "tiles_missing5",
+                    "tiles_missing6"
+                ],
             TileType::Grass => vec!["fluff", "fluff2"],
             TileType::Foliage => vec!["grass_small", "grass"],
             TileType::HeavyFoliage => vec!["grass_flower"],