diff --git a/Cargo.toml b/Cargo.toml
index 6606f3c..377c80a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-notan = { version = "0.10.0", features = ["text"] }
+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"] }
diff --git a/resources/atlas.json b/resources/atlas.json
index d8f4207..7ae0372 100644
--- a/resources/atlas.json
+++ b/resources/atlas.json
@@ -17,7 +17,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "back (1)",
+	"filename": "Avatar-0",
 	"frame": {"x":32,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -25,7 +25,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "back (2)",
+	"filename": "Avatar-2",
 	"frame": {"x":48,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -33,7 +33,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "back (3)",
+	"filename": "Avatar-3",
 	"frame": {"x":64,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -41,7 +41,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "back (4)",
+	"filename": "Avatar-4",
 	"frame": {"x":80,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -49,7 +49,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "back (5)",
+	"filename": "Avatar-5",
 	"frame": {"x":96,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -57,7 +57,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "back (6)",
+	"filename": "Avatar-6",
 	"frame": {"x":112,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -65,7 +65,15 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "back (7)",
+	"filename": "Avatar-7",
+	"frame": {"x":32,"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": "Avatar-8",
 	"frame": {"x":128,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -73,7 +81,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "beartrap",
+	"filename": "Avatar-9",
 	"frame": {"x":144,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -81,7 +89,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "bed",
+	"filename": "Avatar-10",
 	"frame": {"x":160,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -89,7 +97,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-0",
+	"filename": "Avatar-11",
 	"frame": {"x":176,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -97,7 +105,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-1",
+	"filename": "Avatar-12",
 	"frame": {"x":192,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -105,7 +113,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-2",
+	"filename": "Avatar-13",
 	"frame": {"x":208,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -113,7 +121,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-3",
+	"filename": "avatar",
 	"frame": {"x":224,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -121,7 +129,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-4",
+	"filename": "back (1)",
 	"frame": {"x":240,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -129,16 +137,120 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-5",
+	"filename": "back (2)",
 	"frame": {"x":256,"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": "back (3)",
+	"frame": {"x":272,"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": "back (4)",
+	"frame": {"x":288,"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": "back (5)",
+	"frame": {"x":304,"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": "back (6)",
+	"frame": {"x":320,"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": "back (7)",
+	"frame": {"x":336,"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": "beartrap",
+	"frame": {"x":352,"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": "bed",
+	"frame": {"x":368,"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": "blood-0",
+	"frame": {"x":384,"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": "blood-1",
+	"frame": {"x":400,"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": "blood-2",
+	"frame": {"x":416,"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": "blood-3",
+	"frame": {"x":432,"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": "blood-4",
+	"frame": {"x":448,"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": "blood-5",
+	"frame": {"x":464,"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": "blood-6",
-	"frame": {"x":0,"y":24,"w":16,"h":24},
+	"frame": {"x":480,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -146,7 +258,7 @@
 },
 {
 	"filename": "blood-7",
-	"frame": {"x":16,"y":24,"w":16,"h":24},
+	"frame": {"x":496,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -154,7 +266,7 @@
 },
 {
 	"filename": "blood-8",
-	"frame": {"x":32,"y":24,"w":16,"h":24},
+	"frame": {"x":512,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -162,7 +274,7 @@
 },
 {
 	"filename": "blood-9",
-	"frame": {"x":48,"y":24,"w":16,"h":24},
+	"frame": {"x":528,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -170,7 +282,7 @@
 },
 {
 	"filename": "blood-10",
-	"frame": {"x":64,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -178,7 +290,7 @@
 },
 {
 	"filename": "blood-11",
-	"frame": {"x":80,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -186,7 +298,7 @@
 },
 {
 	"filename": "blood-12",
-	"frame": {"x":96,"y":24,"w":16,"h":24},
+	"frame": {"x":576,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -194,7 +306,7 @@
 },
 {
 	"filename": "blood-13",
-	"frame": {"x":112,"y":24,"w":16,"h":24},
+	"frame": {"x":592,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -202,7 +314,7 @@
 },
 {
 	"filename": "body (1)",
-	"frame": {"x":128,"y":24,"w":16,"h":24},
+	"frame": {"x":608,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -210,7 +322,7 @@
 },
 {
 	"filename": "body (3)",
-	"frame": {"x":144,"y":24,"w":16,"h":24},
+	"frame": {"x":624,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -218,7 +330,7 @@
 },
 {
 	"filename": "body (4)",
-	"frame": {"x":160,"y":24,"w":16,"h":24},
+	"frame": {"x":640,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -226,7 +338,7 @@
 },
 {
 	"filename": "body (5)",
-	"frame": {"x":176,"y":24,"w":16,"h":24},
+	"frame": {"x":656,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -234,7 +346,7 @@
 },
 {
 	"filename": "body (6)",
-	"frame": {"x":192,"y":24,"w":16,"h":24},
+	"frame": {"x":672,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -242,7 +354,7 @@
 },
 {
 	"filename": "body (7)",
-	"frame": {"x":208,"y":24,"w":16,"h":24},
+	"frame": {"x":688,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -250,7 +362,7 @@
 },
 {
 	"filename": "body (8)",
-	"frame": {"x":224,"y":24,"w":16,"h":24},
+	"frame": {"x":704,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -258,7 +370,7 @@
 },
 {
 	"filename": "body (9)",
-	"frame": {"x":240,"y":24,"w":16,"h":24},
+	"frame": {"x":720,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -266,7 +378,7 @@
 },
 {
 	"filename": "body (10)",
-	"frame": {"x":256,"y":24,"w":16,"h":24},
+	"frame": {"x":736,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -274,7 +386,7 @@
 },
 {
 	"filename": "body_leather",
-	"frame": {"x":0,"y":48,"w":16,"h":24},
+	"frame": {"x":752,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -282,7 +394,7 @@
 },
 {
 	"filename": "candelabra",
-	"frame": {"x":16,"y":48,"w":16,"h":24},
+	"frame": {"x":768,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -290,7 +402,7 @@
 },
 {
 	"filename": "cat",
-	"frame": {"x":32,"y":48,"w":16,"h":24},
+	"frame": {"x":784,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -298,7 +410,7 @@
 },
 {
 	"filename": "cat_large",
-	"frame": {"x":48,"y":48,"w":16,"h":24},
+	"frame": {"x":800,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -306,7 +418,7 @@
 },
 {
 	"filename": "caterpillar",
-	"frame": {"x":64,"y":48,"w":16,"h":24},
+	"frame": {"x":816,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -314,7 +426,7 @@
 },
 {
 	"filename": "chair_r",
-	"frame": {"x":80,"y":48,"w":16,"h":24},
+	"frame": {"x":832,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -322,7 +434,7 @@
 },
 {
 	"filename": "cracked",
-	"frame": {"x":96,"y":48,"w":16,"h":24},
+	"frame": {"x":848,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -330,7 +442,7 @@
 },
 {
 	"filename": "dagger",
-	"frame": {"x":112,"y":48,"w":16,"h":24},
+	"frame": {"x":864,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -338,7 +450,7 @@
 },
 {
 	"filename": "dog",
-	"frame": {"x":128,"y":48,"w":16,"h":24},
+	"frame": {"x":880,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -346,7 +458,7 @@
 },
 {
 	"filename": "door",
-	"frame": {"x":144,"y":48,"w":16,"h":24},
+	"frame": {"x":896,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -354,7 +466,7 @@
 },
 {
 	"filename": "door_open",
-	"frame": {"x":160,"y":48,"w":16,"h":24},
+	"frame": {"x":912,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -362,7 +474,7 @@
 },
 {
 	"filename": "dwarf",
-	"frame": {"x":176,"y":48,"w":16,"h":24},
+	"frame": {"x":928,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -370,7 +482,7 @@
 },
 {
 	"filename": "feet (1)",
-	"frame": {"x":192,"y":48,"w":16,"h":24},
+	"frame": {"x":944,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -378,7 +490,7 @@
 },
 {
 	"filename": "feet (2)",
-	"frame": {"x":208,"y":48,"w":16,"h":24},
+	"frame": {"x":960,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -386,7 +498,7 @@
 },
 {
 	"filename": "feet (3)",
-	"frame": {"x":224,"y":48,"w":16,"h":24},
+	"frame": {"x":976,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -394,7 +506,7 @@
 },
 {
 	"filename": "feet (4)",
-	"frame": {"x":240,"y":48,"w":16,"h":24},
+	"frame": {"x":992,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -402,7 +514,7 @@
 },
 {
 	"filename": "feet (5)",
-	"frame": {"x":256,"y":48,"w":16,"h":24},
+	"frame": {"x":1008,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -410,7 +522,7 @@
 },
 {
 	"filename": "feet (6)",
-	"frame": {"x":0,"y":72,"w":16,"h":24},
+	"frame": {"x":1024,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -418,7 +530,7 @@
 },
 {
 	"filename": "feet (7)",
-	"frame": {"x":16,"y":72,"w":16,"h":24},
+	"frame": {"x":1040,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -426,7 +538,7 @@
 },
 {
 	"filename": "fluff",
-	"frame": {"x":32,"y":72,"w":16,"h":24},
+	"frame": {"x":1056,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -434,7 +546,7 @@
 },
 {
 	"filename": "fluff2",
-	"frame": {"x":48,"y":72,"w":16,"h":24},
+	"frame": {"x":1072,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -442,7 +554,7 @@
 },
 {
 	"filename": "general-0",
-	"frame": {"x":64,"y":72,"w":16,"h":24},
+	"frame": {"x":1088,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -450,7 +562,7 @@
 },
 {
 	"filename": "general-1",
-	"frame": {"x":80,"y":72,"w":16,"h":24},
+	"frame": {"x":1104,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -458,7 +570,7 @@
 },
 {
 	"filename": "general-2",
-	"frame": {"x":96,"y":72,"w":16,"h":24},
+	"frame": {"x":1120,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -466,7 +578,7 @@
 },
 {
 	"filename": "general-3",
-	"frame": {"x":112,"y":72,"w":16,"h":24},
+	"frame": {"x":1136,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -474,7 +586,7 @@
 },
 {
 	"filename": "general-4",
-	"frame": {"x":128,"y":72,"w":16,"h":24},
+	"frame": {"x":1152,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -482,7 +594,7 @@
 },
 {
 	"filename": "general-5",
-	"frame": {"x":96,"y":72,"w":16,"h":24},
+	"frame": {"x":1120,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -490,7 +602,7 @@
 },
 {
 	"filename": "general-6",
-	"frame": {"x":144,"y":72,"w":16,"h":24},
+	"frame": {"x":1168,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -498,7 +610,7 @@
 },
 {
 	"filename": "general-7",
-	"frame": {"x":160,"y":72,"w":16,"h":24},
+	"frame": {"x":1184,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -506,7 +618,7 @@
 },
 {
 	"filename": "general-8",
-	"frame": {"x":96,"y":72,"w":16,"h":24},
+	"frame": {"x":1120,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -514,7 +626,7 @@
 },
 {
 	"filename": "general-9",
-	"frame": {"x":176,"y":72,"w":16,"h":24},
+	"frame": {"x":1200,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -522,7 +634,7 @@
 },
 {
 	"filename": "general-10",
-	"frame": {"x":192,"y":72,"w":16,"h":24},
+	"frame": {"x":1216,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -530,7 +642,7 @@
 },
 {
 	"filename": "general-11",
-	"frame": {"x":96,"y":72,"w":16,"h":24},
+	"frame": {"x":1120,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -538,7 +650,7 @@
 },
 {
 	"filename": "general-12",
-	"frame": {"x":208,"y":72,"w":16,"h":24},
+	"frame": {"x":1232,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -546,7 +658,7 @@
 },
 {
 	"filename": "general-13",
-	"frame": {"x":224,"y":72,"w":16,"h":24},
+	"frame": {"x":1248,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -554,7 +666,7 @@
 },
 {
 	"filename": "general-14",
-	"frame": {"x":240,"y":72,"w":16,"h":24},
+	"frame": {"x":1264,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -562,7 +674,7 @@
 },
 {
 	"filename": "general-18",
-	"frame": {"x":256,"y":72,"w":16,"h":24},
+	"frame": {"x":1280,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -570,7 +682,7 @@
 },
 {
 	"filename": "general-19",
-	"frame": {"x":0,"y":96,"w":16,"h":24},
+	"frame": {"x":1296,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -578,7 +690,7 @@
 },
 {
 	"filename": "general-20",
-	"frame": {"x":16,"y":96,"w":16,"h":24},
+	"frame": {"x":1312,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -586,7 +698,7 @@
 },
 {
 	"filename": "general-21",
-	"frame": {"x":32,"y":96,"w":16,"h":24},
+	"frame": {"x":1328,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -594,7 +706,7 @@
 },
 {
 	"filename": "general-22",
-	"frame": {"x":48,"y":96,"w":16,"h":24},
+	"frame": {"x":1344,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -602,7 +714,7 @@
 },
 {
 	"filename": "general-23",
-	"frame": {"x":64,"y":96,"w":16,"h":24},
+	"frame": {"x":1360,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -610,7 +722,7 @@
 },
 {
 	"filename": "general-24",
-	"frame": {"x":80,"y":96,"w":16,"h":24},
+	"frame": {"x":1376,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -618,7 +730,7 @@
 },
 {
 	"filename": "general-25",
-	"frame": {"x":96,"y":96,"w":16,"h":24},
+	"frame": {"x":1392,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -626,7 +738,7 @@
 },
 {
 	"filename": "general-26",
-	"frame": {"x":112,"y":96,"w":16,"h":24},
+	"frame": {"x":1408,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -634,7 +746,7 @@
 },
 {
 	"filename": "general-27",
-	"frame": {"x":128,"y":96,"w":16,"h":24},
+	"frame": {"x":1424,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -642,7 +754,7 @@
 },
 {
 	"filename": "general-28",
-	"frame": {"x":144,"y":96,"w":16,"h":24},
+	"frame": {"x":1440,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -650,7 +762,7 @@
 },
 {
 	"filename": "general-29",
-	"frame": {"x":160,"y":96,"w":16,"h":24},
+	"frame": {"x":1456,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -658,7 +770,7 @@
 },
 {
 	"filename": "general-30",
-	"frame": {"x":176,"y":96,"w":16,"h":24},
+	"frame": {"x":1472,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -666,7 +778,7 @@
 },
 {
 	"filename": "general-31",
-	"frame": {"x":192,"y":96,"w":16,"h":24},
+	"frame": {"x":1488,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -674,7 +786,7 @@
 },
 {
 	"filename": "general-32",
-	"frame": {"x":208,"y":96,"w":16,"h":24},
+	"frame": {"x":1504,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -682,7 +794,7 @@
 },
 {
 	"filename": "general-33",
-	"frame": {"x":224,"y":96,"w":16,"h":24},
+	"frame": {"x":1520,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -690,7 +802,7 @@
 },
 {
 	"filename": "general-34",
-	"frame": {"x":240,"y":96,"w":16,"h":24},
+	"frame": {"x":1536,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -698,7 +810,7 @@
 },
 {
 	"filename": "general-35",
-	"frame": {"x":256,"y":96,"w":16,"h":24},
+	"frame": {"x":1552,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -706,7 +818,7 @@
 },
 {
 	"filename": "general-36",
-	"frame": {"x":0,"y":120,"w":16,"h":24},
+	"frame": {"x":1568,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -714,7 +826,7 @@
 },
 {
 	"filename": "general-37",
-	"frame": {"x":16,"y":120,"w":16,"h":24},
+	"frame": {"x":1584,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -722,7 +834,7 @@
 },
 {
 	"filename": "general-38",
-	"frame": {"x":32,"y":120,"w":16,"h":24},
+	"frame": {"x":0,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -730,7 +842,7 @@
 },
 {
 	"filename": "general-39",
-	"frame": {"x":48,"y":120,"w":16,"h":24},
+	"frame": {"x":16,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -738,7 +850,7 @@
 },
 {
 	"filename": "general-40",
-	"frame": {"x":64,"y":120,"w":16,"h":24},
+	"frame": {"x":32,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -746,7 +858,7 @@
 },
 {
 	"filename": "general-41",
-	"frame": {"x":80,"y":120,"w":16,"h":24},
+	"frame": {"x":48,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -754,7 +866,7 @@
 },
 {
 	"filename": "general-42",
-	"frame": {"x":96,"y":120,"w":16,"h":24},
+	"frame": {"x":64,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -762,7 +874,7 @@
 },
 {
 	"filename": "general-43",
-	"frame": {"x":112,"y":120,"w":16,"h":24},
+	"frame": {"x":80,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -770,7 +882,7 @@
 },
 {
 	"filename": "general-44",
-	"frame": {"x":128,"y":120,"w":16,"h":24},
+	"frame": {"x":96,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -778,7 +890,7 @@
 },
 {
 	"filename": "general-45",
-	"frame": {"x":144,"y":120,"w":16,"h":24},
+	"frame": {"x":112,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -786,7 +898,7 @@
 },
 {
 	"filename": "general-46",
-	"frame": {"x":160,"y":120,"w":16,"h":24},
+	"frame": {"x":128,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -794,7 +906,7 @@
 },
 {
 	"filename": "general-47",
-	"frame": {"x":176,"y":120,"w":16,"h":24},
+	"frame": {"x":144,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -802,7 +914,7 @@
 },
 {
 	"filename": "general-48",
-	"frame": {"x":192,"y":120,"w":16,"h":24},
+	"frame": {"x":160,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -810,7 +922,7 @@
 },
 {
 	"filename": "general-49",
-	"frame": {"x":208,"y":120,"w":16,"h":24},
+	"frame": {"x":176,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -818,7 +930,7 @@
 },
 {
 	"filename": "general-50",
-	"frame": {"x":224,"y":120,"w":16,"h":24},
+	"frame": {"x":192,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -826,7 +938,7 @@
 },
 {
 	"filename": "general-51",
-	"frame": {"x":240,"y":120,"w":16,"h":24},
+	"frame": {"x":208,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -834,7 +946,7 @@
 },
 {
 	"filename": "general-52",
-	"frame": {"x":256,"y":120,"w":16,"h":24},
+	"frame": {"x":224,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -842,7 +954,7 @@
 },
 {
 	"filename": "general-53",
-	"frame": {"x":0,"y":144,"w":16,"h":24},
+	"frame": {"x":240,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -850,7 +962,7 @@
 },
 {
 	"filename": "general-54",
-	"frame": {"x":16,"y":144,"w":16,"h":24},
+	"frame": {"x":256,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -858,7 +970,7 @@
 },
 {
 	"filename": "general-55",
-	"frame": {"x":32,"y":144,"w":16,"h":24},
+	"frame": {"x":272,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -866,7 +978,7 @@
 },
 {
 	"filename": "gnome",
-	"frame": {"x":48,"y":144,"w":16,"h":24},
+	"frame": {"x":288,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -874,7 +986,7 @@
 },
 {
 	"filename": "goblin",
-	"frame": {"x":64,"y":144,"w":16,"h":24},
+	"frame": {"x":304,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -882,7 +994,7 @@
 },
 {
 	"filename": "goblin_c",
-	"frame": {"x":80,"y":144,"w":16,"h":24},
+	"frame": {"x":320,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -890,7 +1002,7 @@
 },
 {
 	"filename": "handaxe",
-	"frame": {"x":96,"y":144,"w":16,"h":24},
+	"frame": {"x":336,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -898,7 +1010,7 @@
 },
 {
 	"filename": "head (1)",
-	"frame": {"x":112,"y":144,"w":16,"h":24},
+	"frame": {"x":352,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -906,7 +1018,7 @@
 },
 {
 	"filename": "head (2)",
-	"frame": {"x":128,"y":144,"w":16,"h":24},
+	"frame": {"x":368,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -914,7 +1026,7 @@
 },
 {
 	"filename": "head (3)",
-	"frame": {"x":144,"y":144,"w":16,"h":24},
+	"frame": {"x":384,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -922,7 +1034,7 @@
 },
 {
 	"filename": "head (4)",
-	"frame": {"x":160,"y":144,"w":16,"h":24},
+	"frame": {"x":400,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -930,7 +1042,7 @@
 },
 {
 	"filename": "head (5)",
-	"frame": {"x":176,"y":144,"w":16,"h":24},
+	"frame": {"x":416,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -938,7 +1050,7 @@
 },
 {
 	"filename": "head (6)",
-	"frame": {"x":192,"y":144,"w":16,"h":24},
+	"frame": {"x":432,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -946,7 +1058,7 @@
 },
 {
 	"filename": "head (7)",
-	"frame": {"x":208,"y":144,"w":16,"h":24},
+	"frame": {"x":448,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -954,7 +1066,7 @@
 },
 {
 	"filename": "head (8)",
-	"frame": {"x":224,"y":144,"w":16,"h":24},
+	"frame": {"x":464,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -962,7 +1074,7 @@
 },
 {
 	"filename": "head (9)",
-	"frame": {"x":240,"y":144,"w":16,"h":24},
+	"frame": {"x":480,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -970,7 +1082,7 @@
 },
 {
 	"filename": "head (10)",
-	"frame": {"x":256,"y":144,"w":16,"h":24},
+	"frame": {"x":496,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -978,7 +1090,7 @@
 },
 {
 	"filename": "horse",
-	"frame": {"x":0,"y":168,"w":16,"h":24},
+	"frame": {"x":512,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -986,7 +1098,7 @@
 },
 {
 	"filename": "kobold",
-	"frame": {"x":16,"y":168,"w":16,"h":24},
+	"frame": {"x":528,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -994,7 +1106,7 @@
 },
 {
 	"filename": "kobold_captain",
-	"frame": {"x":32,"y":168,"w":16,"h":24},
+	"frame": {"x":544,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1002,7 +1114,7 @@
 },
 {
 	"filename": "kobold_large",
-	"frame": {"x":48,"y":168,"w":16,"h":24},
+	"frame": {"x":560,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1010,7 +1122,7 @@
 },
 {
 	"filename": "legs (1)",
-	"frame": {"x":64,"y":168,"w":16,"h":24},
+	"frame": {"x":576,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1018,7 +1130,7 @@
 },
 {
 	"filename": "legs (2)",
-	"frame": {"x":80,"y":168,"w":16,"h":24},
+	"frame": {"x":592,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1026,7 +1138,7 @@
 },
 {
 	"filename": "legs (3)",
-	"frame": {"x":96,"y":168,"w":16,"h":24},
+	"frame": {"x":608,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1034,7 +1146,7 @@
 },
 {
 	"filename": "legs (4)",
-	"frame": {"x":112,"y":168,"w":16,"h":24},
+	"frame": {"x":624,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1042,7 +1154,7 @@
 },
 {
 	"filename": "legs (5)",
-	"frame": {"x":128,"y":168,"w":16,"h":24},
+	"frame": {"x":640,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1050,7 +1162,7 @@
 },
 {
 	"filename": "magic_trap",
-	"frame": {"x":144,"y":168,"w":16,"h":24},
+	"frame": {"x":656,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1058,7 +1170,7 @@
 },
 {
 	"filename": "meat",
-	"frame": {"x":160,"y":168,"w":16,"h":24},
+	"frame": {"x":672,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1066,7 +1178,7 @@
 },
 {
 	"filename": "minimine",
-	"frame": {"x":176,"y":168,"w":16,"h":24},
+	"frame": {"x":688,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1074,7 +1186,7 @@
 },
 {
 	"filename": "neck",
-	"frame": {"x":192,"y":168,"w":16,"h":24},
+	"frame": {"x":704,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1082,7 +1194,7 @@
 },
 {
 	"filename": "ogre",
-	"frame": {"x":208,"y":168,"w":16,"h":24},
+	"frame": {"x":720,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1090,7 +1202,7 @@
 },
 {
 	"filename": "orc",
-	"frame": {"x":224,"y":168,"w":16,"h":24},
+	"frame": {"x":736,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1098,7 +1210,7 @@
 },
 {
 	"filename": "plants",
-	"frame": {"x":240,"y":168,"w":16,"h":24},
+	"frame": {"x":752,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1106,7 +1218,7 @@
 },
 {
 	"filename": "potion",
-	"frame": {"x":256,"y":168,"w":16,"h":24},
+	"frame": {"x":768,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1114,7 +1226,7 @@
 },
 {
 	"filename": "potion_beaker",
-	"frame": {"x":0,"y":192,"w":16,"h":24},
+	"frame": {"x":784,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1122,7 +1234,7 @@
 },
 {
 	"filename": "potion_conical",
-	"frame": {"x":16,"y":192,"w":16,"h":24},
+	"frame": {"x":800,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1130,7 +1242,7 @@
 },
 {
 	"filename": "potion_large",
-	"frame": {"x":32,"y":192,"w":16,"h":24},
+	"frame": {"x":816,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1138,7 +1250,7 @@
 },
 {
 	"filename": "projectiles-0",
-	"frame": {"x":48,"y":192,"w":16,"h":24},
+	"frame": {"x":832,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1146,7 +1258,7 @@
 },
 {
 	"filename": "projectiles-1",
-	"frame": {"x":64,"y":192,"w":16,"h":24},
+	"frame": {"x":848,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1154,7 +1266,7 @@
 },
 {
 	"filename": "projectiles-2",
-	"frame": {"x":80,"y":192,"w":16,"h":24},
+	"frame": {"x":864,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1162,7 +1274,7 @@
 },
 {
 	"filename": "projectiles-3",
-	"frame": {"x":96,"y":192,"w":16,"h":24},
+	"frame": {"x":880,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1170,7 +1282,7 @@
 },
 {
 	"filename": "projectiles-4",
-	"frame": {"x":112,"y":192,"w":16,"h":24},
+	"frame": {"x":896,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1178,7 +1290,7 @@
 },
 {
 	"filename": "projectiles-5",
-	"frame": {"x":128,"y":192,"w":16,"h":24},
+	"frame": {"x":912,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1186,7 +1298,7 @@
 },
 {
 	"filename": "projectiles-6",
-	"frame": {"x":144,"y":192,"w":16,"h":24},
+	"frame": {"x":928,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1194,7 +1306,7 @@
 },
 {
 	"filename": "projectiles-7",
-	"frame": {"x":160,"y":192,"w":16,"h":24},
+	"frame": {"x":944,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1202,7 +1314,7 @@
 },
 {
 	"filename": "projectiles-8",
-	"frame": {"x":176,"y":192,"w":16,"h":24},
+	"frame": {"x":960,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1210,7 +1322,7 @@
 },
 {
 	"filename": "projectiles-9",
-	"frame": {"x":192,"y":192,"w":16,"h":24},
+	"frame": {"x":976,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1218,7 +1330,7 @@
 },
 {
 	"filename": "projectiles-10",
-	"frame": {"x":208,"y":192,"w":16,"h":24},
+	"frame": {"x":992,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1226,7 +1338,7 @@
 },
 {
 	"filename": "projectiles-11",
-	"frame": {"x":224,"y":192,"w":16,"h":24},
+	"frame": {"x":1008,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1234,7 +1346,7 @@
 },
 {
 	"filename": "projectiles-12",
-	"frame": {"x":240,"y":192,"w":16,"h":24},
+	"frame": {"x":1024,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1242,7 +1354,7 @@
 },
 {
 	"filename": "projectiles-13",
-	"frame": {"x":256,"y":192,"w":16,"h":24},
+	"frame": {"x":1040,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1250,7 +1362,7 @@
 },
 {
 	"filename": "projectiles-14",
-	"frame": {"x":0,"y":216,"w":16,"h":24},
+	"frame": {"x":1056,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1258,7 +1370,7 @@
 },
 {
 	"filename": "projectiles-15",
-	"frame": {"x":16,"y":216,"w":16,"h":24},
+	"frame": {"x":1072,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1266,7 +1378,7 @@
 },
 {
 	"filename": "projectiles-16",
-	"frame": {"x":32,"y":216,"w":16,"h":24},
+	"frame": {"x":1088,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1274,7 +1386,7 @@
 },
 {
 	"filename": "projectiles-17",
-	"frame": {"x":48,"y":216,"w":16,"h":24},
+	"frame": {"x":1104,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1282,7 +1394,7 @@
 },
 {
 	"filename": "projectiles-18",
-	"frame": {"x":64,"y":216,"w":16,"h":24},
+	"frame": {"x":1120,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1290,7 +1402,7 @@
 },
 {
 	"filename": "projectiles-19",
-	"frame": {"x":80,"y":216,"w":16,"h":24},
+	"frame": {"x":1136,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1298,7 +1410,7 @@
 },
 {
 	"filename": "projectiles-20",
-	"frame": {"x":96,"y":216,"w":16,"h":24},
+	"frame": {"x":1152,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1306,7 +1418,7 @@
 },
 {
 	"filename": "projectiles-21",
-	"frame": {"x":96,"y":216,"w":16,"h":24},
+	"frame": {"x":1152,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1314,7 +1426,7 @@
 },
 {
 	"filename": "projectiles-22",
-	"frame": {"x":96,"y":216,"w":16,"h":24},
+	"frame": {"x":1152,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1322,7 +1434,7 @@
 },
 {
 	"filename": "projectiles-23",
-	"frame": {"x":96,"y":216,"w":16,"h":24},
+	"frame": {"x":1152,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1330,7 +1442,7 @@
 },
 {
 	"filename": "projectiles-24",
-	"frame": {"x":96,"y":216,"w":16,"h":24},
+	"frame": {"x":1152,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1338,7 +1450,7 @@
 },
 {
 	"filename": "projectiles-25",
-	"frame": {"x":112,"y":216,"w":16,"h":24},
+	"frame": {"x":1168,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1346,7 +1458,7 @@
 },
 {
 	"filename": "projectiles-26",
-	"frame": {"x":112,"y":216,"w":16,"h":24},
+	"frame": {"x":1168,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1354,7 +1466,7 @@
 },
 {
 	"filename": "projectiles-27",
-	"frame": {"x":112,"y":216,"w":16,"h":24},
+	"frame": {"x":1168,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1362,7 +1474,7 @@
 },
 {
 	"filename": "projectiles-28",
-	"frame": {"x":112,"y":216,"w":16,"h":24},
+	"frame": {"x":1168,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1370,7 +1482,7 @@
 },
 {
 	"filename": "projectiles-29",
-	"frame": {"x":112,"y":216,"w":16,"h":24},
+	"frame": {"x":1168,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1378,7 +1490,7 @@
 },
 {
 	"filename": "rat",
-	"frame": {"x":128,"y":216,"w":16,"h":24},
+	"frame": {"x":1184,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1386,7 +1498,7 @@
 },
 {
 	"filename": "rat_large",
-	"frame": {"x":144,"y":216,"w":16,"h":24},
+	"frame": {"x":1200,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1394,7 +1506,7 @@
 },
 {
 	"filename": "scimitar",
-	"frame": {"x":160,"y":216,"w":16,"h":24},
+	"frame": {"x":1216,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1402,7 +1514,7 @@
 },
 {
 	"filename": "scroll",
-	"frame": {"x":176,"y":216,"w":16,"h":24},
+	"frame": {"x":1232,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1410,7 +1522,7 @@
 },
 {
 	"filename": "scroll_writing",
-	"frame": {"x":192,"y":216,"w":16,"h":24},
+	"frame": {"x":1248,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1418,7 +1530,7 @@
 },
 {
 	"filename": "shield_large",
-	"frame": {"x":208,"y":216,"w":16,"h":24},
+	"frame": {"x":1264,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1426,7 +1538,7 @@
 },
 {
 	"filename": "shield_round",
-	"frame": {"x":224,"y":216,"w":16,"h":24},
+	"frame": {"x":1280,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1434,7 +1546,7 @@
 },
 {
 	"filename": "shield_small",
-	"frame": {"x":240,"y":216,"w":16,"h":24},
+	"frame": {"x":1296,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1442,7 +1554,7 @@
 },
 {
 	"filename": "shortsword",
-	"frame": {"x":256,"y":216,"w":16,"h":24},
+	"frame": {"x":1312,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1450,7 +1562,7 @@
 },
 {
 	"filename": "slash1",
-	"frame": {"x":0,"y":240,"w":16,"h":24},
+	"frame": {"x":1328,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1458,7 +1570,7 @@
 },
 {
 	"filename": "slash2",
-	"frame": {"x":16,"y":240,"w":16,"h":24},
+	"frame": {"x":1344,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1466,7 +1578,7 @@
 },
 {
 	"filename": "slash3",
-	"frame": {"x":32,"y":240,"w":16,"h":24},
+	"frame": {"x":1360,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1474,7 +1586,7 @@
 },
 {
 	"filename": "spider",
-	"frame": {"x":48,"y":240,"w":16,"h":24},
+	"frame": {"x":1376,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1482,7 +1594,7 @@
 },
 {
 	"filename": "spider_large",
-	"frame": {"x":64,"y":240,"w":16,"h":24},
+	"frame": {"x":1392,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1490,7 +1602,7 @@
 },
 {
 	"filename": "statue",
-	"frame": {"x":80,"y":240,"w":16,"h":24},
+	"frame": {"x":1408,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1498,7 +1610,7 @@
 },
 {
 	"filename": "stones",
-	"frame": {"x":96,"y":240,"w":16,"h":24},
+	"frame": {"x":1424,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1506,7 +1618,7 @@
 },
 {
 	"filename": "table",
-	"frame": {"x":112,"y":240,"w":16,"h":24},
+	"frame": {"x":1440,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1514,7 +1626,7 @@
 },
 {
 	"filename": "table_l_chair",
-	"frame": {"x":128,"y":240,"w":16,"h":24},
+	"frame": {"x":1456,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1522,7 +1634,7 @@
 },
 {
 	"filename": "table_r",
-	"frame": {"x":144,"y":240,"w":16,"h":24},
+	"frame": {"x":1472,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1530,7 +1642,7 @@
 },
 {
 	"filename": "trapdoor",
-	"frame": {"x":160,"y":240,"w":16,"h":24},
+	"frame": {"x":1488,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1538,7 +1650,7 @@
 },
 {
 	"filename": "trapdoor_open",
-	"frame": {"x":176,"y":240,"w":16,"h":24},
+	"frame": {"x":1504,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1546,7 +1658,7 @@
 },
 {
 	"filename": "trident",
-	"frame": {"x":192,"y":240,"w":16,"h":24},
+	"frame": {"x":1520,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1554,7 +1666,7 @@
 },
 {
 	"filename": "wall_b",
-	"frame": {"x":208,"y":240,"w":16,"h":24},
+	"frame": {"x":1536,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1562,7 +1674,7 @@
 },
 {
 	"filename": "wall_top",
-	"frame": {"x":224,"y":240,"w":16,"h":24},
+	"frame": {"x":1552,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1570,7 +1682,7 @@
 },
 {
 	"filename": "water",
-	"frame": {"x":240,"y":240,"w":16,"h":24},
+	"frame": {"x":1568,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1578,7 +1690,7 @@
 },
 {
 	"filename": "water2",
-	"frame": {"x":256,"y":240,"w":16,"h":24},
+	"frame": {"x":1584,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1589,8 +1701,8 @@
 	"version": "1.0",
 	"image": "atlas.png",
 	"format": "RGBA8888",
-	"size": {"w":272,"h":264},
+	"size": {"w":1600,"h":48},
 	"scale": "1",
-	"smartupdate": "$TexturePacker:SmartUpdate:3a870f491fe43c591dcdbc6c94f6576d:905da6d8a2ce02e7a3ab02201100fc06:cbce6b53f0f49e0bf15173c25c41f876$"
+	"smartupdate": "$TexturePacker:SmartUpdate:9bbb2bb33921630488c25287454e0acd:45a90134887424ac22af9ca274ff99bb:cbce6b53f0f49e0bf15173c25c41f876$"
 }
 }
diff --git a/resources/atlas.png b/resources/atlas.png
index 78153b7..911f062 100644
Binary files a/resources/atlas.png and b/resources/atlas.png differ
diff --git a/resources/sounds/hit.wav b/resources/sounds/hit.wav
new file mode 100644
index 0000000..44fd686
Binary files /dev/null and b/resources/sounds/hit.wav differ
diff --git a/src/consts/entity.rs b/src/consts/entity.rs
index a34c526..7251e5d 100644
--- a/src/consts/entity.rs
+++ b/src/consts/entity.rs
@@ -1,4 +1,4 @@
-pub const DEFAULT_VIEWSHED_STANDARD: i32 = 16; //       Standard viewshed radius for almost all entities.
+pub const DEFAULT_VIEWSHED_STANDARD: i32 = 6; //       Standard viewshed radius for almost all entities.
 pub const CARRY_CAPACITY_PER_STRENGTH: i32 = 5; //      How much weight can be carried per point of strength.
 pub const NORMAL_SPEED: i32 = 12; //                    Normal speed for almost all entities.
 pub const SPEED_MOD_BURDENED: f32 = 0.75;
diff --git a/src/consts/visuals.rs b/src/consts/visuals.rs
index 728dacd..f063f2c 100644
--- a/src/consts/visuals.rs
+++ b/src/consts/visuals.rs
@@ -24,11 +24,11 @@ pub const GLOBAL_OFFSET_MAX_CLAMP: f32 = 1.0;
 pub const SPRITE_OFFSET_MIN_CLAMP: f32 = 0.85;
 pub const SPRITE_OFFSET_MAX_CLAMP: f32 = 1.0;
 pub const WITH_SCANLINES_BRIGHTEN_AMOUNT: f32 = 0.1; // 0.0 = no brightening, 1.0 = full brightening.
-pub const NON_VISIBLE_MULTIPLIER: f32 = 0.3; // 0.0 = black, 1.0 = full colour.
+pub const NON_VISIBLE_MULTIPLIER: f32 = 0.2; // 0.0 = black, 1.0 = full colour.
 pub const NON_VISIBLE_MULTIPLIER_IF_SCANLINES: f32 = 0.8; // as above, but when using scanlines. should be higher.
-pub const MAX_DARKENING: f32 = 0.35; // 0.0 = black, 1.0 = full colour - only used if WITH_DARKEN_BY_DISTANCE is true.
+pub const MAX_DARKENING: f32 = 0.2; // 0.0 = black, 1.0 = full colour - only used if WITH_DARKEN_BY_DISTANCE is true.
 pub const MAX_DARKENING_IF_SCANLINES: f32 = 0.9; // as above, but when using scanlines. should be higher.
-pub const START_DARKEN_AT_N_TILES: f32 = 7.0; // start darkening at this distance (should always be less than entity::DEFAULT_VIEWSHED_STANDARD).
+pub const START_DARKEN_AT_N_TILES: f32 = 1.0; // start darkening at this distance (should always be less than entity::DEFAULT_VIEWSHED_STANDARD).
 
 pub const SHORT_PARTICLE_LIFETIME: f32 = 100.0; // in ms
 pub const DEFAULT_PARTICLE_LIFETIME: f32 = 200.0;
diff --git a/src/gui/character_creation.rs b/src/gui/character_creation.rs
index b16f13a..17136f0 100644
--- a/src/gui/character_creation.rs
+++ b/src/gui/character_creation.rs
@@ -255,31 +255,9 @@ pub fn setup_player_ancestry(ecs: &mut World, ancestry: Ancestry) {
     match ancestry {
         Ancestry::Human => {}
         Ancestry::Dwarf => {
-            renderables
-                .insert(
-                    *player,
-                    Renderable::new(
-                        to_cp437(DWARF_GLYPH),
-                        "gnome".to_string(),
-                        RGB::named(DWARF_COLOUR),
-                        2
-                    )
-                )
-                .expect("Unable to insert renderable component");
             *player_skills.skills.entry(Skill::Defence).or_insert(0) += DWARF_DEFENCE_MOD;
         }
         Ancestry::Elf => {
-            renderables
-                .insert(
-                    *player,
-                    Renderable::new(
-                        to_cp437(ELF_GLYPH),
-                        "gnome".to_string(),
-                        RGB::named(ELF_COLOUR),
-                        2
-                    )
-                )
-                .expect("Unable to insert renderable component");
             let mut telepaths = ecs.write_storage::<Telepath>();
             telepaths
                 .insert(*player, Telepath {
@@ -297,17 +275,6 @@ pub fn setup_player_ancestry(ecs: &mut World, ancestry: Ancestry) {
                 .expect("Unable to insert energy component");
         }
         Ancestry::Catfolk => {
-            renderables
-                .insert(
-                    *player,
-                    Renderable::new(
-                        to_cp437(CATFOLK_GLYPH),
-                        "gnome".to_string(),
-                        RGB::named(CATFOLK_COLOUR),
-                        2
-                    )
-                )
-                .expect("Unable to insert renderable component");
             let mut speeds = ecs.write_storage::<Energy>();
             speeds
                 .insert(*player, Energy {
diff --git a/src/main.rs b/src/main.rs
index 2a57f84..05967a5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,7 +26,14 @@ fn main() -> Result<(), String> {
         .build()
 }
 
-fn setup(gfx: &mut Graphics) -> State {
+fn setup(app: &mut App, gfx: &mut Graphics) -> State {
+    /*
+    let sound = app.audio.create_source(include_bytes!("../resources/sounds/hit.wav")).unwrap();
+    let sounds: HashMap<String, AudioSource> = vec![("hit".to_string(), sound)]
+        .into_iter()
+        .collect();
+    */
+
     let texture = gfx
         .create_texture()
         .from_image(include_bytes!("../resources/atlas.png"))
@@ -52,6 +59,7 @@ fn setup(gfx: &mut Graphics) -> State {
     );
     let mut gs = State {
         ecs: World::new(),
+        //audio: sounds,
         atlas,
         interface,
         font,
@@ -263,14 +271,10 @@ fn draw_entities(
                     } else {
                         panic!("No entity sprite found for ID: {}", &renderable.sprite);
                     };
-                    console::log(&format!("offset_x: {}, offset_y: {}", offset_x, offset_y));
                     let x_pos = (entry.0.x as f32) * TILESIZE.sprite_x + offset_x;
                     let y_pos = (entry.0.y as f32) * TILESIZE.sprite_y + offset_y;
                     let mul = themes::darken_by_distance(
-                        Point::new(
-                            entry.0.x + bounds.min_x - bounds.x_offset,
-                            entry.0.y + bounds.min_y - bounds.y_offset
-                        ),
+                        Point::new(entry.0.x, entry.0.y),
                         *ecs.fetch::<Point>()
                     );
                     let col = Color::from_rgb(
@@ -356,7 +360,7 @@ fn render_map_in_view(
                             let mut sorted: Vec<_> = memories.iter().collect();
                             sorted.sort_by(|a, b| a.render_order.cmp(&b.render_order));
                             for memory in sorted.iter() {
-                                let mult = 0.3;
+                                let mult = consts::visuals::NON_VISIBLE_MULTIPLIER;
                                 let col = Color::from_rgb(
                                     memory.fg.r * mult,
                                     memory.fg.g * mult,
@@ -489,7 +493,7 @@ fn draw_bg(_ecs: &World, draw: &mut Draw, atlas: &HashMap<String, Texture>) {
     draw_spritebox(sidebox, draw, atlas);
 }
 
-fn draw(_app: &mut App, gfx: &mut Graphics, gs: &mut State) {
+fn draw(app: &mut App, gfx: &mut Graphics, gs: &mut State) {
     let mut draw = gfx.create_draw();
     draw.clear(Color::BLACK);
     let mut log = false;
diff --git a/src/spawner.rs b/src/spawner.rs
index f39bed1..47b4747 100644
--- a/src/spawner.rs
+++ b/src/spawner.rs
@@ -55,7 +55,7 @@ pub fn player(ecs: &mut World, player_x: i32, player_y: i32) -> Entity {
         .create_entity()
         .with(Position { x: player_x, y: player_y })
         .with(BlocksTile {}) // FIXME: Put in actual player sprite
-        .with(Renderable::new(to_cp437('@'), "gnome".to_string(), RGB::named(YELLOW), 2))
+        .with(Renderable::new(to_cp437('@'), "avatar".to_string(), RGB::named(WHITE), 2))
         .with(Bleeds { colour: RGB::named(BLOODSTAIN_COLOUR) })
         .with(Player {})
         .with(Mind {})
diff --git a/src/states/state.rs b/src/states/state.rs
index a346b3e..d97f901 100644
--- a/src/states/state.rs
+++ b/src/states/state.rs
@@ -61,6 +61,7 @@ impl Fonts {
 #[derive(AppState)]
 pub struct State {
     pub ecs: World,
+    //pub audio: HashMap<String, AudioSource>,
     pub atlas: HashMap<String, Texture>,
     pub interface: HashMap<String, Texture>,
     pub font: Fonts,