diff --git a/resources/atlas.json b/resources/atlas.json
index 0ad4d09..1f10ce2 100644
--- a/resources/atlas.json
+++ b/resources/atlas.json
@@ -146,7 +146,7 @@
 },
 {
 	"filename": "back (3)",
-	"frame": {"x":0,"y":24,"w":16,"h":24},
+	"frame": {"x":272,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -154,7 +154,7 @@
 },
 {
 	"filename": "back (4)",
-	"frame": {"x":16,"y":24,"w":16,"h":24},
+	"frame": {"x":288,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -162,7 +162,7 @@
 },
 {
 	"filename": "back (5)",
-	"frame": {"x":32,"y":24,"w":16,"h":24},
+	"frame": {"x":304,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -170,7 +170,7 @@
 },
 {
 	"filename": "back (6)",
-	"frame": {"x":48,"y":24,"w":16,"h":24},
+	"frame": {"x":320,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -178,7 +178,7 @@
 },
 {
 	"filename": "back (7)",
-	"frame": {"x":64,"y":24,"w":16,"h":24},
+	"frame": {"x":336,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -186,7 +186,7 @@
 },
 {
 	"filename": "bars",
-	"frame": {"x":80,"y":24,"w":16,"h":24},
+	"frame": {"x":352,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -194,7 +194,7 @@
 },
 {
 	"filename": "beartrap",
-	"frame": {"x":96,"y":24,"w":16,"h":24},
+	"frame": {"x":368,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -202,7 +202,7 @@
 },
 {
 	"filename": "bed",
-	"frame": {"x":112,"y":24,"w":16,"h":24},
+	"frame": {"x":384,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -210,7 +210,7 @@
 },
 {
 	"filename": "blood-7",
-	"frame": {"x":128,"y":24,"w":16,"h":24},
+	"frame": {"x":400,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -218,7 +218,7 @@
 },
 {
 	"filename": "blood-8",
-	"frame": {"x":144,"y":24,"w":16,"h":24},
+	"frame": {"x":416,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -226,7 +226,7 @@
 },
 {
 	"filename": "blood-9",
-	"frame": {"x":160,"y":24,"w":16,"h":24},
+	"frame": {"x":432,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -234,7 +234,7 @@
 },
 {
 	"filename": "blood-10",
-	"frame": {"x":176,"y":24,"w":16,"h":24},
+	"frame": {"x":448,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -242,7 +242,7 @@
 },
 {
 	"filename": "blood-11",
-	"frame": {"x":192,"y":24,"w":16,"h":24},
+	"frame": {"x":464,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -250,7 +250,7 @@
 },
 {
 	"filename": "blood-12",
-	"frame": {"x":208,"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},
@@ -258,7 +258,7 @@
 },
 {
 	"filename": "blood-13",
-	"frame": {"x":224,"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},
@@ -266,7 +266,7 @@
 },
 {
 	"filename": "blood1",
-	"frame": {"x":240,"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},
@@ -274,7 +274,7 @@
 },
 {
 	"filename": "blood2",
-	"frame": {"x":256,"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},
@@ -282,7 +282,7 @@
 },
 {
 	"filename": "blood3",
-	"frame": {"x":0,"y":48,"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},
@@ -290,7 +290,7 @@
 },
 {
 	"filename": "blood4",
-	"frame": {"x":16,"y":48,"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},
@@ -298,7 +298,7 @@
 },
 {
 	"filename": "blood5",
-	"frame": {"x":32,"y":48,"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},
@@ -306,7 +306,7 @@
 },
 {
 	"filename": "blood6",
-	"frame": {"x":48,"y":48,"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},
@@ -314,7 +314,7 @@
 },
 {
 	"filename": "blood7",
-	"frame": {"x":64,"y":48,"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},
@@ -322,7 +322,7 @@
 },
 {
 	"filename": "body (1)",
-	"frame": {"x":80,"y":48,"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},
@@ -330,7 +330,7 @@
 },
 {
 	"filename": "body (3)",
-	"frame": {"x":96,"y":48,"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},
@@ -338,7 +338,7 @@
 },
 {
 	"filename": "body (4)",
-	"frame": {"x":112,"y":48,"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},
@@ -346,7 +346,7 @@
 },
 {
 	"filename": "body (5)",
-	"frame": {"x":128,"y":48,"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},
@@ -354,7 +354,7 @@
 },
 {
 	"filename": "body (6)",
-	"frame": {"x":144,"y":48,"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},
@@ -362,7 +362,7 @@
 },
 {
 	"filename": "body (7)",
-	"frame": {"x":160,"y":48,"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},
@@ -370,7 +370,7 @@
 },
 {
 	"filename": "body (8)",
-	"frame": {"x":176,"y":48,"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},
@@ -378,7 +378,7 @@
 },
 {
 	"filename": "body (9)",
-	"frame": {"x":192,"y":48,"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},
@@ -386,7 +386,7 @@
 },
 {
 	"filename": "body (10)",
-	"frame": {"x":208,"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},
@@ -394,7 +394,7 @@
 },
 {
 	"filename": "body_leather",
-	"frame": {"x":224,"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},
@@ -402,7 +402,7 @@
 },
 {
 	"filename": "candelabra",
-	"frame": {"x":240,"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},
@@ -410,7 +410,7 @@
 },
 {
 	"filename": "cat",
-	"frame": {"x":256,"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},
@@ -418,7 +418,7 @@
 },
 {
 	"filename": "cat_large",
-	"frame": {"x":0,"y":72,"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},
@@ -426,7 +426,7 @@
 },
 {
 	"filename": "caterpillar",
-	"frame": {"x":16,"y":72,"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},
@@ -434,7 +434,7 @@
 },
 {
 	"filename": "chair_r",
-	"frame": {"x":32,"y":72,"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},
@@ -442,7 +442,7 @@
 },
 {
 	"filename": "cracked",
-	"frame": {"x":48,"y":72,"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},
@@ -450,7 +450,7 @@
 },
 {
 	"filename": "dagger",
-	"frame": {"x":64,"y":72,"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},
@@ -458,7 +458,7 @@
 },
 {
 	"filename": "dog",
-	"frame": {"x":80,"y":72,"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},
@@ -466,7 +466,7 @@
 },
 {
 	"filename": "door",
-	"frame": {"x":96,"y":72,"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},
@@ -474,7 +474,7 @@
 },
 {
 	"filename": "door_open",
-	"frame": {"x":112,"y":72,"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},
@@ -482,7 +482,7 @@
 },
 {
 	"filename": "dot",
-	"frame": {"x":128,"y":72,"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},
@@ -490,7 +490,7 @@
 },
 {
 	"filename": "dwarf",
-	"frame": {"x":144,"y":72,"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},
@@ -498,7 +498,7 @@
 },
 {
 	"filename": "feet (1)",
-	"frame": {"x":160,"y":72,"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},
@@ -506,7 +506,7 @@
 },
 {
 	"filename": "feet (2)",
-	"frame": {"x":176,"y":72,"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},
@@ -514,7 +514,7 @@
 },
 {
 	"filename": "feet (3)",
-	"frame": {"x":192,"y":72,"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},
@@ -522,7 +522,7 @@
 },
 {
 	"filename": "feet (4)",
-	"frame": {"x":208,"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},
@@ -530,7 +530,7 @@
 },
 {
 	"filename": "feet (5)",
-	"frame": {"x":224,"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},
@@ -538,7 +538,7 @@
 },
 {
 	"filename": "feet (6)",
-	"frame": {"x":240,"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},
@@ -546,7 +546,7 @@
 },
 {
 	"filename": "feet (7)",
-	"frame": {"x":256,"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},
@@ -554,7 +554,7 @@
 },
 {
 	"filename": "fence",
-	"frame": {"x":0,"y":96,"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},
@@ -562,7 +562,7 @@
 },
 {
 	"filename": "fluff",
-	"frame": {"x":16,"y":96,"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},
@@ -570,7 +570,7 @@
 },
 {
 	"filename": "fluff2",
-	"frame": {"x":32,"y":96,"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},
@@ -578,7 +578,7 @@
 },
 {
 	"filename": "general-0",
-	"frame": {"x":48,"y":96,"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},
@@ -586,7 +586,7 @@
 },
 {
 	"filename": "general-1",
-	"frame": {"x":64,"y":96,"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},
@@ -594,7 +594,7 @@
 },
 {
 	"filename": "general-3",
-	"frame": {"x":80,"y":96,"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},
@@ -602,7 +602,7 @@
 },
 {
 	"filename": "general-4",
-	"frame": {"x":96,"y":96,"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},
@@ -610,7 +610,7 @@
 },
 {
 	"filename": "general-5",
-	"frame": {"x":128,"y":72,"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},
@@ -618,7 +618,7 @@
 },
 {
 	"filename": "general-6",
-	"frame": {"x":112,"y":96,"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},
@@ -626,7 +626,7 @@
 },
 {
 	"filename": "general-7",
-	"frame": {"x":128,"y":96,"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},
@@ -634,7 +634,7 @@
 },
 {
 	"filename": "general-8",
-	"frame": {"x":128,"y":72,"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},
@@ -642,7 +642,7 @@
 },
 {
 	"filename": "general-9",
-	"frame": {"x":144,"y":96,"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},
@@ -650,7 +650,7 @@
 },
 {
 	"filename": "general-10",
-	"frame": {"x":160,"y":96,"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},
@@ -658,7 +658,7 @@
 },
 {
 	"filename": "general-11",
-	"frame": {"x":128,"y":72,"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},
@@ -666,7 +666,7 @@
 },
 {
 	"filename": "general-12",
-	"frame": {"x":176,"y":96,"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},
@@ -674,7 +674,7 @@
 },
 {
 	"filename": "general-13",
-	"frame": {"x":192,"y":96,"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},
@@ -682,7 +682,7 @@
 },
 {
 	"filename": "general-14",
-	"frame": {"x":208,"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},
@@ -690,7 +690,7 @@
 },
 {
 	"filename": "general-18",
-	"frame": {"x":224,"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},
@@ -698,7 +698,7 @@
 },
 {
 	"filename": "general-19",
-	"frame": {"x":240,"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},
@@ -706,7 +706,7 @@
 },
 {
 	"filename": "general-20",
-	"frame": {"x":256,"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},
@@ -714,7 +714,7 @@
 },
 {
 	"filename": "general-21",
-	"frame": {"x":0,"y":120,"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},
@@ -722,7 +722,7 @@
 },
 {
 	"filename": "general-22",
-	"frame": {"x":16,"y":120,"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},
@@ -730,7 +730,7 @@
 },
 {
 	"filename": "general-23",
-	"frame": {"x":32,"y":120,"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},
@@ -738,7 +738,7 @@
 },
 {
 	"filename": "general-24",
-	"frame": {"x":48,"y":120,"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},
@@ -746,7 +746,7 @@
 },
 {
 	"filename": "general-25",
-	"frame": {"x":64,"y":120,"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},
@@ -754,7 +754,7 @@
 },
 {
 	"filename": "general-26",
-	"frame": {"x":80,"y":120,"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},
@@ -762,7 +762,7 @@
 },
 {
 	"filename": "general-27",
-	"frame": {"x":96,"y":120,"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},
@@ -770,7 +770,7 @@
 },
 {
 	"filename": "general-28",
-	"frame": {"x":112,"y":120,"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},
@@ -778,7 +778,7 @@
 },
 {
 	"filename": "general-29",
-	"frame": {"x":128,"y":120,"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},
@@ -786,7 +786,7 @@
 },
 {
 	"filename": "general-30",
-	"frame": {"x":144,"y":120,"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},
@@ -794,7 +794,7 @@
 },
 {
 	"filename": "general-31",
-	"frame": {"x":160,"y":120,"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},
@@ -802,7 +802,7 @@
 },
 {
 	"filename": "general-32",
-	"frame": {"x":176,"y":120,"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},
@@ -810,7 +810,7 @@
 },
 {
 	"filename": "general-33",
-	"frame": {"x":192,"y":120,"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},
@@ -818,7 +818,7 @@
 },
 {
 	"filename": "general-34",
-	"frame": {"x":208,"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},
@@ -826,7 +826,7 @@
 },
 {
 	"filename": "general-35",
-	"frame": {"x":224,"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},
@@ -834,7 +834,7 @@
 },
 {
 	"filename": "general-36",
-	"frame": {"x":240,"y":120,"w":16,"h":24},
+	"frame": {"x":1600,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -842,7 +842,7 @@
 },
 {
 	"filename": "general-37",
-	"frame": {"x":256,"y":120,"w":16,"h":24},
+	"frame": {"x":1616,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -850,7 +850,7 @@
 },
 {
 	"filename": "general-38",
-	"frame": {"x":0,"y":144,"w":16,"h":24},
+	"frame": {"x":1632,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -858,7 +858,7 @@
 },
 {
 	"filename": "general-39",
-	"frame": {"x":16,"y":144,"w":16,"h":24},
+	"frame": {"x":1648,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -866,7 +866,7 @@
 },
 {
 	"filename": "general-40",
-	"frame": {"x":32,"y":144,"w":16,"h":24},
+	"frame": {"x":1664,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -874,7 +874,7 @@
 },
 {
 	"filename": "general-41",
-	"frame": {"x":48,"y":144,"w":16,"h":24},
+	"frame": {"x":1680,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -882,7 +882,7 @@
 },
 {
 	"filename": "general-42",
-	"frame": {"x":64,"y":144,"w":16,"h":24},
+	"frame": {"x":1696,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -890,7 +890,7 @@
 },
 {
 	"filename": "general-43",
-	"frame": {"x":80,"y":144,"w":16,"h":24},
+	"frame": {"x":1712,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -898,7 +898,7 @@
 },
 {
 	"filename": "general-44",
-	"frame": {"x":96,"y":144,"w":16,"h":24},
+	"frame": {"x":1728,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -906,7 +906,7 @@
 },
 {
 	"filename": "general-45",
-	"frame": {"x":112,"y":144,"w":16,"h":24},
+	"frame": {"x":1744,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -914,7 +914,7 @@
 },
 {
 	"filename": "general-46",
-	"frame": {"x":128,"y":144,"w":16,"h":24},
+	"frame": {"x":1760,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -922,7 +922,7 @@
 },
 {
 	"filename": "general-47",
-	"frame": {"x":144,"y":144,"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},
@@ -930,7 +930,7 @@
 },
 {
 	"filename": "general-48",
-	"frame": {"x":160,"y":144,"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},
@@ -938,7 +938,7 @@
 },
 {
 	"filename": "general-49",
-	"frame": {"x":176,"y":144,"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},
@@ -946,7 +946,7 @@
 },
 {
 	"filename": "general-50",
-	"frame": {"x":192,"y":144,"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},
@@ -954,7 +954,7 @@
 },
 {
 	"filename": "general-51",
-	"frame": {"x":208,"y":144,"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},
@@ -962,7 +962,7 @@
 },
 {
 	"filename": "general-52",
-	"frame": {"x":224,"y":144,"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},
@@ -970,7 +970,7 @@
 },
 {
 	"filename": "general-53",
-	"frame": {"x":240,"y":144,"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},
@@ -978,7 +978,7 @@
 },
 {
 	"filename": "general-54",
-	"frame": {"x":256,"y":144,"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},
@@ -986,7 +986,7 @@
 },
 {
 	"filename": "general-55",
-	"frame": {"x":0,"y":168,"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},
@@ -994,7 +994,7 @@
 },
 {
 	"filename": "gnome",
-	"frame": {"x":16,"y":168,"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},
@@ -1002,7 +1002,7 @@
 },
 {
 	"filename": "goblin",
-	"frame": {"x":32,"y":168,"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},
@@ -1010,7 +1010,7 @@
 },
 {
 	"filename": "goblin_c",
-	"frame": {"x":48,"y":168,"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},
@@ -1018,7 +1018,7 @@
 },
 {
 	"filename": "grass",
-	"frame": {"x":64,"y":168,"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},
@@ -1026,7 +1026,7 @@
 },
 {
 	"filename": "grass_flower",
-	"frame": {"x":80,"y":168,"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},
@@ -1034,7 +1034,7 @@
 },
 {
 	"filename": "grass_small",
-	"frame": {"x":96,"y":168,"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},
@@ -1042,7 +1042,7 @@
 },
 {
 	"filename": "handaxe",
-	"frame": {"x":112,"y":168,"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},
@@ -1050,7 +1050,7 @@
 },
 {
 	"filename": "head (1)",
-	"frame": {"x":128,"y":168,"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},
@@ -1058,7 +1058,7 @@
 },
 {
 	"filename": "head (2)",
-	"frame": {"x":144,"y":168,"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},
@@ -1066,7 +1066,7 @@
 },
 {
 	"filename": "head (3)",
-	"frame": {"x":160,"y":168,"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},
@@ -1074,7 +1074,7 @@
 },
 {
 	"filename": "head (4)",
-	"frame": {"x":176,"y":168,"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},
@@ -1082,7 +1082,7 @@
 },
 {
 	"filename": "head (5)",
-	"frame": {"x":192,"y":168,"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},
@@ -1090,7 +1090,7 @@
 },
 {
 	"filename": "head (6)",
-	"frame": {"x":208,"y":168,"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},
@@ -1098,7 +1098,7 @@
 },
 {
 	"filename": "head (7)",
-	"frame": {"x":224,"y":168,"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},
@@ -1106,7 +1106,7 @@
 },
 {
 	"filename": "head (8)",
-	"frame": {"x":240,"y":168,"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},
@@ -1114,7 +1114,7 @@
 },
 {
 	"filename": "head (9)",
-	"frame": {"x":256,"y":168,"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},
@@ -1122,7 +1122,7 @@
 },
 {
 	"filename": "head (10)",
-	"frame": {"x":0,"y":192,"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},
@@ -1130,7 +1130,7 @@
 },
 {
 	"filename": "horse",
-	"frame": {"x":16,"y":192,"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},
@@ -1138,7 +1138,7 @@
 },
 {
 	"filename": "kobold",
-	"frame": {"x":32,"y":192,"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},
@@ -1146,7 +1146,7 @@
 },
 {
 	"filename": "kobold_captain",
-	"frame": {"x":48,"y":192,"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},
@@ -1154,7 +1154,7 @@
 },
 {
 	"filename": "kobold_large",
-	"frame": {"x":64,"y":192,"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},
@@ -1162,7 +1162,7 @@
 },
 {
 	"filename": "legs (1)",
-	"frame": {"x":80,"y":192,"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},
@@ -1170,7 +1170,7 @@
 },
 {
 	"filename": "legs (2)",
-	"frame": {"x":96,"y":192,"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},
@@ -1178,7 +1178,7 @@
 },
 {
 	"filename": "legs (3)",
-	"frame": {"x":112,"y":192,"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},
@@ -1186,7 +1186,7 @@
 },
 {
 	"filename": "legs (4)",
-	"frame": {"x":128,"y":192,"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},
@@ -1194,7 +1194,7 @@
 },
 {
 	"filename": "legs (5)",
-	"frame": {"x":144,"y":192,"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},
@@ -1202,7 +1202,7 @@
 },
 {
 	"filename": "magic_trap",
-	"frame": {"x":160,"y":192,"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},
@@ -1210,7 +1210,7 @@
 },
 {
 	"filename": "meat",
-	"frame": {"x":176,"y":192,"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},
@@ -1218,7 +1218,7 @@
 },
 {
 	"filename": "minimine",
-	"frame": {"x":192,"y":192,"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},
@@ -1226,7 +1226,7 @@
 },
 {
 	"filename": "neck",
-	"frame": {"x":208,"y":192,"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},
@@ -1234,7 +1234,7 @@
 },
 {
 	"filename": "ogre",
-	"frame": {"x":224,"y":192,"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},
@@ -1242,7 +1242,7 @@
 },
 {
 	"filename": "orc",
-	"frame": {"x":240,"y":192,"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},
@@ -1250,7 +1250,7 @@
 },
 {
 	"filename": "planks",
-	"frame": {"x":256,"y":192,"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},
@@ -1258,7 +1258,7 @@
 },
 {
 	"filename": "planks_missing",
-	"frame": {"x":0,"y":216,"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},
@@ -1266,7 +1266,7 @@
 },
 {
 	"filename": "planks_missing2",
-	"frame": {"x":16,"y":216,"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},
@@ -1274,7 +1274,7 @@
 },
 {
 	"filename": "plants",
-	"frame": {"x":32,"y":216,"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},
@@ -1282,7 +1282,7 @@
 },
 {
 	"filename": "potion",
-	"frame": {"x":48,"y":216,"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},
@@ -1290,7 +1290,7 @@
 },
 {
 	"filename": "potion_beaker",
-	"frame": {"x":64,"y":216,"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},
@@ -1298,7 +1298,7 @@
 },
 {
 	"filename": "potion_conical",
-	"frame": {"x":80,"y":216,"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},
@@ -1306,7 +1306,7 @@
 },
 {
 	"filename": "potion_large",
-	"frame": {"x":96,"y":216,"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},
@@ -1314,7 +1314,7 @@
 },
 {
 	"filename": "projectiles-0",
-	"frame": {"x":112,"y":216,"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},
@@ -1322,7 +1322,7 @@
 },
 {
 	"filename": "projectiles-1",
-	"frame": {"x":128,"y":216,"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},
@@ -1330,7 +1330,7 @@
 },
 {
 	"filename": "projectiles-2",
-	"frame": {"x":144,"y":216,"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},
@@ -1338,7 +1338,7 @@
 },
 {
 	"filename": "projectiles-3",
-	"frame": {"x":160,"y":216,"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},
@@ -1346,7 +1346,7 @@
 },
 {
 	"filename": "projectiles-4",
-	"frame": {"x":176,"y":216,"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},
@@ -1354,7 +1354,7 @@
 },
 {
 	"filename": "projectiles-5",
-	"frame": {"x":192,"y":216,"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},
@@ -1362,7 +1362,7 @@
 },
 {
 	"filename": "projectiles-6",
-	"frame": {"x":208,"y":216,"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},
@@ -1370,7 +1370,7 @@
 },
 {
 	"filename": "projectiles-7",
-	"frame": {"x":224,"y":216,"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},
@@ -1378,7 +1378,7 @@
 },
 {
 	"filename": "projectiles-8",
-	"frame": {"x":240,"y":216,"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},
@@ -1386,7 +1386,7 @@
 },
 {
 	"filename": "projectiles-9",
-	"frame": {"x":256,"y":216,"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},
@@ -1394,7 +1394,7 @@
 },
 {
 	"filename": "projectiles-10",
-	"frame": {"x":0,"y":240,"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},
@@ -1402,7 +1402,7 @@
 },
 {
 	"filename": "projectiles-11",
-	"frame": {"x":16,"y":240,"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},
@@ -1410,7 +1410,7 @@
 },
 {
 	"filename": "projectiles-12",
-	"frame": {"x":32,"y":240,"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},
@@ -1418,7 +1418,7 @@
 },
 {
 	"filename": "projectiles-13",
-	"frame": {"x":48,"y":240,"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},
@@ -1426,7 +1426,7 @@
 },
 {
 	"filename": "projectiles-14",
-	"frame": {"x":64,"y":240,"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},
@@ -1434,7 +1434,7 @@
 },
 {
 	"filename": "projectiles-15",
-	"frame": {"x":80,"y":240,"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},
@@ -1442,7 +1442,7 @@
 },
 {
 	"filename": "projectiles-16",
-	"frame": {"x":96,"y":240,"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},
@@ -1450,7 +1450,7 @@
 },
 {
 	"filename": "projectiles-17",
-	"frame": {"x":112,"y":240,"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},
@@ -1458,7 +1458,7 @@
 },
 {
 	"filename": "projectiles-18",
-	"frame": {"x":128,"y":240,"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},
@@ -1466,7 +1466,7 @@
 },
 {
 	"filename": "projectiles-19",
-	"frame": {"x":144,"y":240,"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},
@@ -1474,7 +1474,7 @@
 },
 {
 	"filename": "projectiles-20",
-	"frame": {"x":160,"y":240,"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},
@@ -1482,7 +1482,7 @@
 },
 {
 	"filename": "projectiles-21",
-	"frame": {"x":160,"y":240,"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},
@@ -1490,7 +1490,7 @@
 },
 {
 	"filename": "projectiles-22",
-	"frame": {"x":160,"y":240,"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},
@@ -1498,7 +1498,7 @@
 },
 {
 	"filename": "projectiles-23",
-	"frame": {"x":160,"y":240,"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},
@@ -1506,7 +1506,7 @@
 },
 {
 	"filename": "projectiles-24",
-	"frame": {"x":160,"y":240,"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},
@@ -1514,7 +1514,7 @@
 },
 {
 	"filename": "projectiles-25",
-	"frame": {"x":176,"y":240,"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},
@@ -1522,7 +1522,7 @@
 },
 {
 	"filename": "projectiles-26",
-	"frame": {"x":176,"y":240,"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},
@@ -1530,7 +1530,7 @@
 },
 {
 	"filename": "projectiles-27",
-	"frame": {"x":176,"y":240,"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},
@@ -1538,7 +1538,7 @@
 },
 {
 	"filename": "projectiles-28",
-	"frame": {"x":176,"y":240,"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},
@@ -1546,7 +1546,7 @@
 },
 {
 	"filename": "projectiles-29",
-	"frame": {"x":176,"y":240,"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},
@@ -1554,7 +1554,7 @@
 },
 {
 	"filename": "rat",
-	"frame": {"x":192,"y":240,"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},
@@ -1562,7 +1562,7 @@
 },
 {
 	"filename": "rat_large",
-	"frame": {"x":208,"y":240,"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},
@@ -1570,7 +1570,7 @@
 },
 {
 	"filename": "scimitar",
-	"frame": {"x":224,"y":240,"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},
@@ -1578,7 +1578,7 @@
 },
 {
 	"filename": "scroll",
-	"frame": {"x":240,"y":240,"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},
@@ -1586,7 +1586,15 @@
 },
 {
 	"filename": "scroll_writing",
-	"frame": {"x":256,"y":240,"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},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "select1",
+	"frame": {"x":1216,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1594,7 +1602,7 @@
 },
 {
 	"filename": "shield_large",
-	"frame": {"x":0,"y":264,"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},
@@ -1602,7 +1610,7 @@
 },
 {
 	"filename": "shield_round",
-	"frame": {"x":16,"y":264,"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},
@@ -1610,7 +1618,7 @@
 },
 {
 	"filename": "shield_small",
-	"frame": {"x":32,"y":264,"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},
@@ -1618,7 +1626,7 @@
 },
 {
 	"filename": "shortsword",
-	"frame": {"x":48,"y":264,"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},
@@ -1626,7 +1634,7 @@
 },
 {
 	"filename": "slash1",
-	"frame": {"x":64,"y":264,"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},
@@ -1634,7 +1642,7 @@
 },
 {
 	"filename": "slash2",
-	"frame": {"x":80,"y":264,"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},
@@ -1642,7 +1650,7 @@
 },
 {
 	"filename": "slash3",
-	"frame": {"x":96,"y":264,"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},
@@ -1650,7 +1658,7 @@
 },
 {
 	"filename": "spider",
-	"frame": {"x":112,"y":264,"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},
@@ -1658,7 +1666,7 @@
 },
 {
 	"filename": "spider_large",
-	"frame": {"x":128,"y":264,"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},
@@ -1666,7 +1674,7 @@
 },
 {
 	"filename": "stair_down",
-	"frame": {"x":144,"y":264,"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},
@@ -1674,7 +1682,7 @@
 },
 {
 	"filename": "stair_up",
-	"frame": {"x":160,"y":264,"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},
@@ -1682,7 +1690,7 @@
 },
 {
 	"filename": "statue",
-	"frame": {"x":176,"y":264,"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},
@@ -1690,7 +1698,7 @@
 },
 {
 	"filename": "stones",
-	"frame": {"x":192,"y":264,"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},
@@ -1698,7 +1706,7 @@
 },
 {
 	"filename": "table",
-	"frame": {"x":208,"y":264,"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},
@@ -1706,7 +1714,7 @@
 },
 {
 	"filename": "table_l_chair",
-	"frame": {"x":224,"y":264,"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},
@@ -1714,7 +1722,7 @@
 },
 {
 	"filename": "table_r",
-	"frame": {"x":240,"y":264,"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},
@@ -1722,7 +1730,7 @@
 },
 {
 	"filename": "tiles",
-	"frame": {"x":256,"y":264,"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},
@@ -1730,7 +1738,7 @@
 },
 {
 	"filename": "tiles2",
-	"frame": {"x":0,"y":288,"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},
@@ -1738,7 +1746,7 @@
 },
 {
 	"filename": "tiles3",
-	"frame": {"x":16,"y":288,"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},
@@ -1746,7 +1754,7 @@
 },
 {
 	"filename": "tiles4",
-	"frame": {"x":32,"y":288,"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},
@@ -1754,7 +1762,7 @@
 },
 {
 	"filename": "tiles_missing",
-	"frame": {"x":48,"y":288,"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},
@@ -1762,7 +1770,7 @@
 },
 {
 	"filename": "tiles_missing2",
-	"frame": {"x":64,"y":288,"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},
@@ -1770,7 +1778,7 @@
 },
 {
 	"filename": "tiles_missing3",
-	"frame": {"x":80,"y":288,"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},
@@ -1778,7 +1786,7 @@
 },
 {
 	"filename": "tiles_missing4",
-	"frame": {"x":96,"y":288,"w":16,"h":24},
+	"frame": {"x":1600,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1786,7 +1794,7 @@
 },
 {
 	"filename": "tiles_missing5",
-	"frame": {"x":112,"y":288,"w":16,"h":24},
+	"frame": {"x":1616,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1794,7 +1802,7 @@
 },
 {
 	"filename": "tiles_missing6",
-	"frame": {"x":128,"y":288,"w":16,"h":24},
+	"frame": {"x":1632,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1802,7 +1810,7 @@
 },
 {
 	"filename": "trapdoor",
-	"frame": {"x":144,"y":288,"w":16,"h":24},
+	"frame": {"x":1648,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1810,7 +1818,7 @@
 },
 {
 	"filename": "trapdoor_open",
-	"frame": {"x":160,"y":288,"w":16,"h":24},
+	"frame": {"x":1664,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1818,7 +1826,7 @@
 },
 {
 	"filename": "trident",
-	"frame": {"x":176,"y":288,"w":16,"h":24},
+	"frame": {"x":1680,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1826,7 +1834,7 @@
 },
 {
 	"filename": "wall",
-	"frame": {"x":192,"y":288,"w":16,"h":24},
+	"frame": {"x":1696,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1834,7 +1842,7 @@
 },
 {
 	"filename": "wall_b",
-	"frame": {"x":208,"y":288,"w":16,"h":24},
+	"frame": {"x":1712,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1842,7 +1850,7 @@
 },
 {
 	"filename": "wall_b_cracked",
-	"frame": {"x":224,"y":288,"w":16,"h":24},
+	"frame": {"x":1728,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1850,7 +1858,7 @@
 },
 {
 	"filename": "water",
-	"frame": {"x":240,"y":288,"w":16,"h":24},
+	"frame": {"x":1744,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1858,7 +1866,7 @@
 },
 {
 	"filename": "water2",
-	"frame": {"x":256,"y":288,"w":16,"h":24},
+	"frame": {"x":1760,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1869,8 +1877,8 @@
 	"version": "1.0",
 	"image": "atlas.png",
 	"format": "RGBA8888",
-	"size": {"w":272,"h":312},
+	"size": {"w":1776,"h":48},
 	"scale": "1",
-	"smartupdate": "$TexturePacker:SmartUpdate:b7a7dab3cef0dc663cf3764b68e914db:1ae1f8b2ac3e9eea50616f5300211637:cbce6b53f0f49e0bf15173c25c41f876$"
+	"smartupdate": "$TexturePacker:SmartUpdate:fd16d00f63ad5efff2a8369d469daa64:6efd3d3d31e2ef7389221fe30073fbfb:cbce6b53f0f49e0bf15173c25c41f876$"
 }
 }
diff --git a/resources/atlas.png b/resources/atlas.png
index 0448051..5956df8 100644
Binary files a/resources/atlas.png and b/resources/atlas.png differ
diff --git a/src/consts/mod.rs b/src/consts/mod.rs
index 9b58095..cb80d4d 100644
--- a/src/consts/mod.rs
+++ b/src/consts/mod.rs
@@ -21,7 +21,7 @@ pub struct Spritesize {
 
 pub const TILESIZE: Spritesize = Spritesize {
     x: 16.0,
-    y: 24.0,
+    y: 16.0,
     sprite_x: 16.0 * ZOOM_FACTOR,
     sprite_y: 24.0 * ZOOM_FACTOR,
 };
diff --git a/src/gui/farlook.rs b/src/gui/farlook.rs
index 3841a38..2f21317 100644
--- a/src/gui/farlook.rs
+++ b/src/gui/farlook.rs
@@ -1,8 +1,9 @@
-use super::{ State, RunState, tooltip::draw_tooltips, camera::get_offset, VIEWPORT_H, VIEWPORT_W };
+use super::{ State, RunState, World, tooltip::draw_tooltips, camera::get_offset };
 use bracket_lib::prelude::*;
 use notan::prelude::*;
 use notan::draw::{ Draw, DrawImages };
 use std::collections::HashMap;
+use crate::consts::visuals::{ TILES_IN_VIEWPORT_H, TILES_IN_VIEWPORT_W };
 use crate::consts::TILESIZE;
 
 #[derive(PartialEq, Copy, Clone)]
@@ -16,10 +17,9 @@ pub enum FarlookResult {
 
 pub fn show_farlook(gs: &mut State, ctx: &mut App) -> FarlookResult {
     let runstate = gs.ecs.fetch::<RunState>();
-    let offsets = get_offset();
     if let RunState::Farlook { x, y } = *runstate {
-        let x = x.clamp(offsets.x, offsets.x - 1 + VIEWPORT_W);
-        let y = y.clamp(offsets.y, offsets.y - 1 + VIEWPORT_H);
+        let x = x.clamp(0, TILES_IN_VIEWPORT_W - 1);
+        let y = y.clamp(0, TILES_IN_VIEWPORT_H - 1);
         let key = &ctx.keyboard;
         // Movement
         for keycode in key.pressed.iter() {
@@ -56,14 +56,21 @@ pub fn show_farlook(gs: &mut State, ctx: &mut App) -> FarlookResult {
         }
         return FarlookResult::NoResponse { x, y };
     } else {
-        let ppos = gs.ecs.fetch::<Point>();
-        return FarlookResult::NoResponse { x: ppos.x + offsets.x, y: ppos.x + offsets.y };
+        return FarlookResult::NoResponse { x: TILES_IN_VIEWPORT_W / 2, y: TILES_IN_VIEWPORT_H / 2 };
     }
 }
 
-pub fn draw_farlook(x: i32, y: i32, draw: &mut Draw, atlas: &HashMap<String, Texture>) {
-    draw.image(atlas.get("ui_select_c1").unwrap()).position(
-        (x as f32) * TILESIZE.x,
-        (y as f32) * TILESIZE.x
-    );
+pub fn draw_farlook(
+    ecs: &World,
+    x: i32,
+    y: i32,
+    draw: &mut Draw,
+    atlas: &HashMap<String, Texture>
+) {
+    let placement = super::viewport_tile_to_px(x, y);
+    draw.image(atlas.get("select1").unwrap())
+        .position(placement.x, placement.y)
+        .size(TILESIZE.sprite_x, TILESIZE.sprite_y);
+    let _idx = super::viewport_tile_to_map_idx(ecs, x, y);
+    // Get tooltip for idx, etc.
 }
diff --git a/src/gui/mod.rs b/src/gui/mod.rs
index 979e638..891645c 100644
--- a/src/gui/mod.rs
+++ b/src/gui/mod.rs
@@ -1880,3 +1880,32 @@ pub fn with_article(name: &String) -> String {
     }
     format!("a {}", name)
 }
+
+/// Returns the map index of a tile in the viewport.
+pub fn viewport_tile_to_map_idx(ecs: &World, x: i32, y: i32) -> usize {
+    let bounds = crate::camera::get_screen_bounds(ecs, false);
+    let x = x + bounds.min_x;
+    let y = y + bounds.min_y;
+    return ecs.fetch::<Map>().xy_idx(x, y);
+}
+
+/// Denotes a pixel location on the screen.
+pub struct Px {
+    x: f32,
+    y: f32,
+}
+
+impl Px {
+    pub fn new(x: f32, y: f32) -> Self {
+        Self { x, y }
+    }
+}
+
+/// Returns the pixel location of a tile in the viewport.
+pub fn viewport_tile_to_px(x: i32, y: i32) -> Px {
+    let offsets = crate::camera::get_offset();
+    Px::new(
+        (x as f32) * TILESIZE.sprite_x + (offsets.x as f32) * TILESIZE.x,
+        (y as f32) * TILESIZE.sprite_y + (offsets.y as f32) * TILESIZE.y
+    )
+}
diff --git a/src/main.rs b/src/main.rs
index 5a469c1..7d94437 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -542,7 +542,7 @@ fn draw(app: &mut App, gfx: &mut Graphics, gs: &mut State) {
     }
     match runstate {
         RunState::Farlook { x, y } => {
-            gui::draw_farlook(x, y, &mut draw, &gs.atlas);
+            gui::draw_farlook(&gs.ecs, x, y, &mut draw, &gs.atlas);
             //draw_tooltips(&gs.ecs, ctx, Some((x, y))); TODO: Put this in draw loop
         }
         RunState::ShowCheatMenu => {
diff --git a/src/map/mod.rs b/src/map/mod.rs
index 527cd87..d33ac00 100644
--- a/src/map/mod.rs
+++ b/src/map/mod.rs
@@ -1,4 +1,5 @@
 use bracket_lib::prelude::*;
+use specs::prelude::*;
 use serde::{ Deserialize, Serialize };
 use std::collections::{ HashSet, HashMap };
 mod tiletype;