diff --git a/AndorsTrail/res/drawable/map_bed_1.png b/AndorsTrail/res/drawable/map_bed_1.png
new file mode 100644
index 000000000..b637ce5a2
Binary files /dev/null and b/AndorsTrail/res/drawable/map_bed_1.png differ
diff --git a/AndorsTrail/res/drawable/map_border_1.png b/AndorsTrail/res/drawable/map_border_1.png
new file mode 100644
index 000000000..3265c8378
Binary files /dev/null and b/AndorsTrail/res/drawable/map_border_1.png differ
diff --git a/AndorsTrail/res/drawable/map_bridge_1.png b/AndorsTrail/res/drawable/map_bridge_1.png
new file mode 100644
index 000000000..94e7e7eed
Binary files /dev/null and b/AndorsTrail/res/drawable/map_bridge_1.png differ
diff --git a/AndorsTrail/res/drawable/map_broken_1.png b/AndorsTrail/res/drawable/map_broken_1.png
new file mode 100644
index 000000000..da30165bd
Binary files /dev/null and b/AndorsTrail/res/drawable/map_broken_1.png differ
diff --git a/AndorsTrail/res/drawable/map_cavewall_1.png b/AndorsTrail/res/drawable/map_cavewall_1.png
new file mode 100644
index 000000000..29114cadd
Binary files /dev/null and b/AndorsTrail/res/drawable/map_cavewall_1.png differ
diff --git a/AndorsTrail/res/drawable/map_cavewall_2.png b/AndorsTrail/res/drawable/map_cavewall_2.png
new file mode 100644
index 000000000..81ba283a4
Binary files /dev/null and b/AndorsTrail/res/drawable/map_cavewall_2.png differ
diff --git a/AndorsTrail/res/drawable/map_cavewall_3.png b/AndorsTrail/res/drawable/map_cavewall_3.png
new file mode 100644
index 000000000..d312a4e77
Binary files /dev/null and b/AndorsTrail/res/drawable/map_cavewall_3.png differ
diff --git a/AndorsTrail/res/drawable/map_chair_table_1.png b/AndorsTrail/res/drawable/map_chair_table_1.png
new file mode 100644
index 000000000..06415acb2
Binary files /dev/null and b/AndorsTrail/res/drawable/map_chair_table_1.png differ
diff --git a/AndorsTrail/res/drawable/map_crate_1.png b/AndorsTrail/res/drawable/map_crate_1.png
new file mode 100644
index 000000000..2c6c9c880
Binary files /dev/null and b/AndorsTrail/res/drawable/map_crate_1.png differ
diff --git a/AndorsTrail/res/drawable/map_cupboard_1.png b/AndorsTrail/res/drawable/map_cupboard_1.png
new file mode 100644
index 000000000..4aed48cc0
Binary files /dev/null and b/AndorsTrail/res/drawable/map_cupboard_1.png differ
diff --git a/AndorsTrail/res/drawable/map_curtain_1.png b/AndorsTrail/res/drawable/map_curtain_1.png
new file mode 100644
index 000000000..54855894c
Binary files /dev/null and b/AndorsTrail/res/drawable/map_curtain_1.png differ
diff --git a/AndorsTrail/res/drawable/map_entrance_1.png b/AndorsTrail/res/drawable/map_entrance_1.png
new file mode 100644
index 000000000..5be9e54cf
Binary files /dev/null and b/AndorsTrail/res/drawable/map_entrance_1.png differ
diff --git a/AndorsTrail/res/drawable/map_fence_1.png b/AndorsTrail/res/drawable/map_fence_1.png
new file mode 100644
index 000000000..e36891434
Binary files /dev/null and b/AndorsTrail/res/drawable/map_fence_1.png differ
diff --git a/AndorsTrail/res/drawable/map_fence_2.png b/AndorsTrail/res/drawable/map_fence_2.png
new file mode 100644
index 000000000..adf7b222c
Binary files /dev/null and b/AndorsTrail/res/drawable/map_fence_2.png differ
diff --git a/AndorsTrail/res/drawable/map_ground_1.png b/AndorsTrail/res/drawable/map_ground_1.png
new file mode 100644
index 000000000..4be46083f
Binary files /dev/null and b/AndorsTrail/res/drawable/map_ground_1.png differ
diff --git a/AndorsTrail/res/drawable/map_ground_2.png b/AndorsTrail/res/drawable/map_ground_2.png
new file mode 100644
index 000000000..e5c08da46
Binary files /dev/null and b/AndorsTrail/res/drawable/map_ground_2.png differ
diff --git a/AndorsTrail/res/drawable/map_ground_3.png b/AndorsTrail/res/drawable/map_ground_3.png
new file mode 100644
index 000000000..872474668
Binary files /dev/null and b/AndorsTrail/res/drawable/map_ground_3.png differ
diff --git a/AndorsTrail/res/drawable/map_ground_4.png b/AndorsTrail/res/drawable/map_ground_4.png
new file mode 100644
index 000000000..77e409ac9
Binary files /dev/null and b/AndorsTrail/res/drawable/map_ground_4.png differ
diff --git a/AndorsTrail/res/drawable/map_ground_5.png b/AndorsTrail/res/drawable/map_ground_5.png
new file mode 100644
index 000000000..d2dd6f189
Binary files /dev/null and b/AndorsTrail/res/drawable/map_ground_5.png differ
diff --git a/AndorsTrail/res/drawable/map_ground_6.png b/AndorsTrail/res/drawable/map_ground_6.png
new file mode 100644
index 000000000..141c587c1
Binary files /dev/null and b/AndorsTrail/res/drawable/map_ground_6.png differ
diff --git a/AndorsTrail/res/drawable/map_ground_7.png b/AndorsTrail/res/drawable/map_ground_7.png
new file mode 100644
index 000000000..59976419e
Binary files /dev/null and b/AndorsTrail/res/drawable/map_ground_7.png differ
diff --git a/AndorsTrail/res/drawable/map_ground_8.png b/AndorsTrail/res/drawable/map_ground_8.png
new file mode 100644
index 000000000..a63a80f84
Binary files /dev/null and b/AndorsTrail/res/drawable/map_ground_8.png differ
diff --git a/AndorsTrail/res/drawable/map_indoor_1.png b/AndorsTrail/res/drawable/map_indoor_1.png
new file mode 100644
index 000000000..8f6364708
Binary files /dev/null and b/AndorsTrail/res/drawable/map_indoor_1.png differ
diff --git a/AndorsTrail/res/drawable/map_kitchen_1.png b/AndorsTrail/res/drawable/map_kitchen_1.png
new file mode 100644
index 000000000..8bd126b48
Binary files /dev/null and b/AndorsTrail/res/drawable/map_kitchen_1.png differ
diff --git a/AndorsTrail/res/drawable/map_outdoor_1.png b/AndorsTrail/res/drawable/map_outdoor_1.png
new file mode 100644
index 000000000..3f9152440
Binary files /dev/null and b/AndorsTrail/res/drawable/map_outdoor_1.png differ
diff --git a/AndorsTrail/res/drawable/map_pillar_1.png b/AndorsTrail/res/drawable/map_pillar_1.png
new file mode 100644
index 000000000..272412aca
Binary files /dev/null and b/AndorsTrail/res/drawable/map_pillar_1.png differ
diff --git a/AndorsTrail/res/drawable/map_plant_1.png b/AndorsTrail/res/drawable/map_plant_1.png
new file mode 100644
index 000000000..4a8792154
Binary files /dev/null and b/AndorsTrail/res/drawable/map_plant_1.png differ
diff --git a/AndorsTrail/res/drawable/map_rock_1.png b/AndorsTrail/res/drawable/map_rock_1.png
new file mode 100644
index 000000000..fc8d46d37
Binary files /dev/null and b/AndorsTrail/res/drawable/map_rock_1.png differ
diff --git a/AndorsTrail/res/drawable/map_roof_1.png b/AndorsTrail/res/drawable/map_roof_1.png
new file mode 100644
index 000000000..db6e5dcdb
Binary files /dev/null and b/AndorsTrail/res/drawable/map_roof_1.png differ
diff --git a/AndorsTrail/res/drawable/map_roof_2.png b/AndorsTrail/res/drawable/map_roof_2.png
new file mode 100644
index 000000000..02b310585
Binary files /dev/null and b/AndorsTrail/res/drawable/map_roof_2.png differ
diff --git a/AndorsTrail/res/drawable/map_shop_1.png b/AndorsTrail/res/drawable/map_shop_1.png
new file mode 100644
index 000000000..88a621217
Binary files /dev/null and b/AndorsTrail/res/drawable/map_shop_1.png differ
diff --git a/AndorsTrail/res/drawable/map_sign_ladder_1.png b/AndorsTrail/res/drawable/map_sign_ladder_1.png
new file mode 100644
index 000000000..1b7b53a4d
Binary files /dev/null and b/AndorsTrail/res/drawable/map_sign_ladder_1.png differ
diff --git a/AndorsTrail/res/drawable/map_table_1.png b/AndorsTrail/res/drawable/map_table_1.png
new file mode 100644
index 000000000..1ce3e70c5
Binary files /dev/null and b/AndorsTrail/res/drawable/map_table_1.png differ
diff --git a/AndorsTrail/res/drawable/map_tiles_1_1.png b/AndorsTrail/res/drawable/map_tiles_1_1.png
deleted file mode 100644
index fcfd1bea3..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_1_1.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_1_2.png b/AndorsTrail/res/drawable/map_tiles_1_2.png
deleted file mode 100644
index 710e77ae4..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_1_2.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_1_3.png b/AndorsTrail/res/drawable/map_tiles_1_3.png
deleted file mode 100644
index 5be16bb63..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_1_3.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_1_4.png b/AndorsTrail/res/drawable/map_tiles_1_4.png
deleted file mode 100644
index 32095e040..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_1_4.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_1_5.png b/AndorsTrail/res/drawable/map_tiles_1_5.png
deleted file mode 100644
index b6bed60ee..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_1_5.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_1_6.png b/AndorsTrail/res/drawable/map_tiles_1_6.png
deleted file mode 100644
index 75a4466ec..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_1_6.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_1_7.png b/AndorsTrail/res/drawable/map_tiles_1_7.png
deleted file mode 100644
index 440afa19a..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_1_7.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_1_8.png b/AndorsTrail/res/drawable/map_tiles_1_8.png
deleted file mode 100644
index 56d7bf3f7..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_1_8.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_2_1.png b/AndorsTrail/res/drawable/map_tiles_2_1.png
deleted file mode 100644
index 7a33c9761..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_2_1.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_2_2.png b/AndorsTrail/res/drawable/map_tiles_2_2.png
deleted file mode 100644
index 0e9e54732..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_2_2.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_2_3.png b/AndorsTrail/res/drawable/map_tiles_2_3.png
deleted file mode 100644
index 800f846bc..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_2_3.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_2_4.png b/AndorsTrail/res/drawable/map_tiles_2_4.png
deleted file mode 100644
index a12746fe9..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_2_4.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_2_5.png b/AndorsTrail/res/drawable/map_tiles_2_5.png
deleted file mode 100644
index 75c3c308b..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_2_5.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_2_6.png b/AndorsTrail/res/drawable/map_tiles_2_6.png
deleted file mode 100644
index 2e287cffd..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_2_6.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_2_7.png b/AndorsTrail/res/drawable/map_tiles_2_7.png
deleted file mode 100644
index 17523ba25..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_2_7.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_tiles_2_8.png b/AndorsTrail/res/drawable/map_tiles_2_8.png
deleted file mode 100644
index b93222739..000000000
Binary files a/AndorsTrail/res/drawable/map_tiles_2_8.png and /dev/null differ
diff --git a/AndorsTrail/res/drawable/map_trail_1.png b/AndorsTrail/res/drawable/map_trail_1.png
new file mode 100644
index 000000000..bddbcc4e1
Binary files /dev/null and b/AndorsTrail/res/drawable/map_trail_1.png differ
diff --git a/AndorsTrail/res/drawable/map_tree_1.png b/AndorsTrail/res/drawable/map_tree_1.png
new file mode 100644
index 000000000..aec4b661e
Binary files /dev/null and b/AndorsTrail/res/drawable/map_tree_1.png differ
diff --git a/AndorsTrail/res/drawable/map_wall_1.png b/AndorsTrail/res/drawable/map_wall_1.png
new file mode 100644
index 000000000..8fd105737
Binary files /dev/null and b/AndorsTrail/res/drawable/map_wall_1.png differ
diff --git a/AndorsTrail/res/drawable/map_wall_2.png b/AndorsTrail/res/drawable/map_wall_2.png
new file mode 100644
index 000000000..570177faa
Binary files /dev/null and b/AndorsTrail/res/drawable/map_wall_2.png differ
diff --git a/AndorsTrail/res/drawable/map_wall_3.png b/AndorsTrail/res/drawable/map_wall_3.png
new file mode 100644
index 000000000..97e96de24
Binary files /dev/null and b/AndorsTrail/res/drawable/map_wall_3.png differ
diff --git a/AndorsTrail/res/drawable/map_window_1.png b/AndorsTrail/res/drawable/map_window_1.png
new file mode 100644
index 000000000..4a11d3b54
Binary files /dev/null and b/AndorsTrail/res/drawable/map_window_1.png differ
diff --git a/AndorsTrail/res/drawable/map_window_2.png b/AndorsTrail/res/drawable/map_window_2.png
new file mode 100644
index 000000000..62c084489
Binary files /dev/null and b/AndorsTrail/res/drawable/map_window_2.png differ
diff --git a/AndorsTrail/res/xml/template.tmx b/AndorsTrail/res/xml/template.tmx
index d90a9dfc5..0191eaae5 100644
--- a/AndorsTrail/res/xml/template.tmx
+++ b/AndorsTrail/res/xml/template.tmx
@@ -1,52 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
- <tileset firstgid="1" name="tiles_1_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_1.png"/>
+ <tileset firstgid="1" name="trail_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_trail_1.png"/>
  </tileset>
- <tileset firstgid="129" name="tiles_1_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_2.png"/>
+ <tileset firstgid="129" name="ground_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_1.png"/>
  </tileset>
- <tileset firstgid="257" name="tiles_2_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_1.png"/>
+ <tileset firstgid="257" name="ground_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_2.png"/>
  </tileset>
- <tileset firstgid="385" name="tiles_2_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_2.png"/>
+ <tileset firstgid="385" name="ground_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_3.png"/>
  </tileset>
- <tileset firstgid="513" name="tiles_2_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_3.png"/>
+ <tileset firstgid="513" name="ground_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_4.png"/>
  </tileset>
- <tileset firstgid="641" name="tiles_2_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_4.png"/>
+ <tileset firstgid="641" name="ground_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_5.png"/>
  </tileset>
- <tileset firstgid="769" name="tiles_2_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_5.png"/>
+ <tileset firstgid="769" name="ground_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_6.png"/>
  </tileset>
- <tileset firstgid="897" name="tiles_1_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_3.png"/>
+ <tileset firstgid="897" name="ground_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_7.png"/>
  </tileset>
- <tileset firstgid="1025" name="tiles_1_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_4.png"/>
+ <tileset firstgid="1025" name="ground_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_8.png"/>
  </tileset>
- <tileset firstgid="1153" name="tiles_1_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_5.png"/>
+ <tileset firstgid="1153" name="wall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_1.png"/>
  </tileset>
- <tileset firstgid="1281" name="tiles_1_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_6.png"/>
+ <tileset firstgid="1281" name="wall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_2.png"/>
  </tileset>
- <tileset firstgid="1409" name="tiles_1_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_7.png"/>
+ <tileset firstgid="1409" name="wall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_3.png"/>
  </tileset>
- <tileset firstgid="1537" name="tiles_1_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_1_8.png"/>
+ <tileset firstgid="1517" name="cavewall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_1.png"/>
  </tileset>
- <tileset firstgid="1649" name="tiles_2_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_6.png"/>
+ <tileset firstgid="1625" name="cavewall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_2.png"/>
  </tileset>
- <tileset firstgid="1777" name="tiles_2_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_7.png"/>
+ <tileset firstgid="1733" name="cavewall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_3.png"/>
  </tileset>
- <tileset firstgid="1905" name="tiles_2_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tiles_2_8.png"/>
+ <tileset firstgid="1861" name="roof_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_1.png"/>
+ </tileset>
+ <tileset firstgid="1989" name="roof_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_2.png"/>
+ </tileset>
+ <tileset firstgid="2117" name="window_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_1.png"/>
+ </tileset>
+ <tileset firstgid="2245" name="window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png"/>
+ </tileset>
+ <tileset firstgid="2373" name="entrance_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_1.png"/>
+ </tileset>
+ <tileset firstgid="2501" name="fence_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_1.png"/>
+ </tileset>
+ <tileset firstgid="2629" name="fence_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_2.png"/>
+ </tileset>
+ <tileset firstgid="2757" name="broken_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_broken_1.png"/>
+ </tileset>
+ <tileset firstgid="2885" name="bridge_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bridge_1.png"/>
+ </tileset>
+ <tileset firstgid="3013" name="tree_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_1.png"/>
+ </tileset>
+ <tileset firstgid="3141" name="plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png"/>
+ </tileset>
+ <tileset firstgid="3269" name="crate_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_crate_1.png"/>
+ </tileset>
+ <tileset firstgid="3397" name="outdoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_outdoor_1.png"/>
+ </tileset>
+ <tileset firstgid="3525" name="sign_ladder_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_sign_ladder_1.png"/>
+ </tileset>
+ <tileset firstgid="3653" name="border_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_border_1.png"/>
+ </tileset>
+ <tileset firstgid="3781" name="rock_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_1.png"/>
+ </tileset>
+ <tileset firstgid="3909" name="pillar_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_1.png"/>
+ </tileset>
+ <tileset firstgid="4037" name="curtain_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_curtain_1.png"/>
+ </tileset>
+ <tileset firstgid="4165" name="cupboard_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cupboard_1.png"/>
+ </tileset>
+ <tileset firstgid="4293" name="bed_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_bed_1.png"/>
+ </tileset>
+ <tileset firstgid="4421" name="chair_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_1.png"/>
+ </tileset>
+ <tileset firstgid="4549" name="kitchen_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_kitchen_1.png"/>
+ </tileset>
+ <tileset firstgid="4677" name="indoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_1.png"/>
+ </tileset>
+ <tileset firstgid="4805" name="shop_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_shop_1.png"/>
+ </tileset>
+ <tileset firstgid="4933" name="table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_table_1.png"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="gzip">