41 files changed, 150 insertions, 150 deletions
diff --git a/graphics/tilesets/artis-indoor-x2.png b/graphics/tilesets/artis-indoor-x1x2.png
index b23b82c5..b23b82c5 100644
--- a/graphics/tilesets/artis-indoor-x2.png
+++ b/graphics/tilesets/artis-indoor-x1x2.png
diff --git a/graphics/tilesets/artis-indoor-x3.png b/graphics/tilesets/artis-indoor-x1x3.png
index 1fdd208b..1fdd208b 100644
--- a/graphics/tilesets/artis-indoor-x3.png
+++ b/graphics/tilesets/artis-indoor-x1x3.png
diff --git a/graphics/tilesets/artis-indoor-x4.png b/graphics/tilesets/artis-indoor-x1x4.png
index ffb9b850..ffb9b850 100644
--- a/graphics/tilesets/artis-indoor-x4.png
+++ b/graphics/tilesets/artis-indoor-x1x4.png
diff --git a/graphics/tilesets/artis-indoor-x4x2.png b/graphics/tilesets/artis-indoor-x2x4.png
index 68d4abd8..68d4abd8 100644
--- a/graphics/tilesets/artis-indoor-x4x2.png
+++ b/graphics/tilesets/artis-indoor-x2x4.png
diff --git a/maps.xml b/maps.xml
index 8f6d0975..e5c1a6d5 100644
--- a/maps.xml
+++ b/maps.xml
@@ -244,10 +244,10 @@ Copyright (C) 2012-2016 Evol Online -->
         <file name="graphics/tilesets/ground.png"/>
         <file name="graphics/tilesets/artis-indoor.png"/>
         <file name="graphics/tilesets/artis-indoor-fringe.png"/>
-        <file name="graphics/tilesets/artis-indoor-x2.png"/>
-        <file name="graphics/tilesets/artis-indoor-x3.png"/>
-        <file name="graphics/tilesets/artis-indoor-x4.png"/>
-        <file name="graphics/tilesets/artis-indoor-x4x2.png"/>
+        <file name="graphics/tilesets/artis-indoor-x1x2.png"/>
+        <file name="graphics/tilesets/artis-indoor-x1x3.png"/>
+        <file name="graphics/tilesets/artis-indoor-x1x4.png"/>
+        <file name="graphics/tilesets/artis-indoor-x2x4.png"/>
         <file name="graphics/tilesets/artis-accessory.png"/>
         <file name="graphics/tilesets/artis-accessory-x1x2.png"/>
         <file name="graphics/tilesets/artis-pavement.png"/>
diff --git a/maps/001-2-0.tmx b/maps/001-2-0.tmx
index 3705ecbf..10b3d281 100644
--- a/maps/001-2-0.tmx
+++ b/maps/001-2-0.tmx
@@ -13,14 +13,14 @@
  <tileset firstgid="257" name="Indoor Fringe" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+ <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index a20e30b8..4ec2d9b4 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx
index 7b41357b..d2aa500b 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-11.tmx b/maps/001-2-11.tmx
index ccd65e3d..3e7360de 100644
--- a/maps/001-2-11.tmx
+++ b/maps/001-2-11.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx
index 1eb2f912..9e89c182 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -14,10 +14,10 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="561" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="561" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="569" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index 9dd21312..674fae9b 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -14,13 +14,13 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
index 0d1ed711..63dd5fee 100644
--- a/maps/001-2-14.tmx
+++ b/maps/001-2-14.tmx
@@ -14,10 +14,10 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index 5f273078..02dbc444 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -14,13 +14,13 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="593" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-16.tmx b/maps/001-2-16.tmx
index b13c13b9..bc52adca 100644
--- a/maps/001-2-16.tmx
+++ b/maps/001-2-16.tmx
@@ -14,10 +14,10 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
@@ -39,7 +39,7 @@
   <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="901" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="917" name="Sunlight" tilewidth="32" tileheight="160" tilecount="4" columns="4">
   <image source="../graphics/tilesets/ship-sunlight-x1x5.png" width="128" height="160"/>
diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx
index dcdba079..f1381a5a 100644
--- a/maps/001-2-17.tmx
+++ b/maps/001-2-17.tmx
@@ -14,13 +14,13 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-18.tmx b/maps/001-2-18.tmx
index c58103f8..213f85df 100644
--- a/maps/001-2-18.tmx
+++ b/maps/001-2-18.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index 80bf8105..01262714 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -14,13 +14,13 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="593" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-2.tmx b/maps/001-2-2.tmx
index 542b70c4..404649b3 100644
--- a/maps/001-2-2.tmx
+++ b/maps/001-2-2.tmx
@@ -14,13 +14,13 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-20.tmx b/maps/001-2-20.tmx
index 7bc405c8..4b88e041 100644
--- a/maps/001-2-20.tmx
+++ b/maps/001-2-20.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx
index 4d324ea0..dce7e464 100644
--- a/maps/001-2-25.tmx
+++ b/maps/001-2-25.tmx
@@ -14,13 +14,13 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-26.tmx b/maps/001-2-26.tmx
index 663a4817..eeba5fed 100644
--- a/maps/001-2-26.tmx
+++ b/maps/001-2-26.tmx
@@ -14,13 +14,13 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="593" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-27.tmx b/maps/001-2-27.tmx
index 0b58225a..06db08e4 100644
--- a/maps/001-2-27.tmx
+++ b/maps/001-2-27.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index 86c3a330..455e591d 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -15,16 +15,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-29.tmx b/maps/001-2-29.tmx
index 7c8bffb1..e3d71d17 100644
--- a/maps/001-2-29.tmx
+++ b/maps/001-2-29.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index 2c8a30f3..7683944c 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -14,13 +14,13 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
   <image source="../graphics/tilesets/box.png" width="192" height="192"/>
diff --git a/maps/001-2-30.tmx b/maps/001-2-30.tmx
index 47bdcd6e..785327cc 100644
--- a/maps/001-2-30.tmx
+++ b/maps/001-2-30.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index 8e3c5b7b..8847c881 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="577" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="577" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx
index a455ce8e..6884e22b 100644
--- a/maps/001-2-32.tmx
+++ b/maps/001-2-32.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx
index 2f310213..c69ceb5c 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-34.tmx b/maps/001-2-34.tmx
index 0970cda1..212a3c35 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-35.tmx b/maps/001-2-35.tmx
index d82912d2..00cdcd99 100644
--- a/maps/001-2-35.tmx
+++ b/maps/001-2-35.tmx
@@ -15,7 +15,7 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-36.tmx b/maps/001-2-36.tmx
index d6b8b0bd..f7e177db 100644
--- a/maps/001-2-36.tmx
+++ b/maps/001-2-36.tmx
@@ -15,16 +15,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-37.tmx b/maps/001-2-37.tmx
index 4ba8d774..90d964cd 100644
--- a/maps/001-2-37.tmx
+++ b/maps/001-2-37.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index 43193b62..25866093 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-39.tmx b/maps/001-2-39.tmx
index e717d8b9..ee6340ca 100644
--- a/maps/001-2-39.tmx
+++ b/maps/001-2-39.tmx
@@ -14,13 +14,13 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="585" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index feb35efc..46421688 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -14,10 +14,10 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="561" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="577" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-5.tmx b/maps/001-2-5.tmx
index 3680fd2a..2d69fb4d 100644
--- a/maps/001-2-5.tmx
+++ b/maps/001-2-5.tmx
@@ -14,7 +14,7 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="561" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx
index 5444cb88..ab5106ac 100644
--- a/maps/001-2-6.tmx
+++ b/maps/001-2-6.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x2 x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-7.tmx b/maps/001-2-7.tmx
index 4c47d453..bb1e5b5d 100644
--- a/maps/001-2-7.tmx
+++ b/maps/001-2-7.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-8.tmx b/maps/001-2-8.tmx
index 6b0d3180..4bc3198b 100644
--- a/maps/001-2-8.tmx
+++ b/maps/001-2-8.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>
diff --git a/maps/001-2-9.tmx b/maps/001-2-9.tmx
index f4262978..a19f9e5d 100644
--- a/maps/001-2-9.tmx
+++ b/maps/001-2-9.tmx
@@ -14,16 +14,16 @@
   <image source="../graphics/tilesets/artis-indoor-fringe.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="513" name="Indoor x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x2.png" width="512" height="64"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="529" name="Indoor x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x3.png" width="512" height="288"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x3.png" width="512" height="288"/>
  </tileset>
  <tileset firstgid="577" name="Indoor x4" tilewidth="32" tileheight="128" tilecount="16" columns="16">
-  <image source="../graphics/tilesets/artis-indoor-x4.png" width="512" height="128"/>
+  <image source="../graphics/tilesets/artis-indoor-x1x4.png" width="512" height="128"/>
  </tileset>
- <tileset firstgid="593" name="Indoor x4x2" tilewidth="64" tileheight="128" tilecount="8" columns="8">
-  <image source="../graphics/tilesets/artis-indoor-x4x2.png" width="512" height="128"/>
+ <tileset firstgid="593" name="Indoor x2x4" tilewidth="64" tileheight="128" tilecount="8" columns="8">
+  <image source="../graphics/tilesets/artis-indoor-x2x4.png" width="512" height="128"/>
  </tileset>
  <tileset firstgid="601" name="Accessory" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../graphics/tilesets/artis-accessory.png" width="512" height="256"/>