diff --git a/tiled/interiors/deniran/inn.tmx b/tiled/interiors/deniran/inn.tmx
new file mode 100644
index 0000000000..197ef518b4
--- /dev/null
+++ b/tiled/interiors/deniran/inn.tmx
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="32" tileheight="32" nextobjectid="1">
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+  <image source="../../tileset/logic/collision.png" width="32" height="32"/>
+ </tileset>
+ <tileset firstgid="2" name="wallpapers" tilewidth="32" tileheight="32">
+  <image source="../../tileset/building/wall/wallpapers.png" width="160" height="160"/>
+ </tileset>
+ <tileset firstgid="27" name="wood_trim" tilewidth="32" tileheight="32">
+  <image source="../../tileset/building/wall/wood_trim.png" width="320" height="160"/>
+ </tileset>
+ <tileset firstgid="77" name="int_windows_wood_centered" tilewidth="32" tileheight="32">
+  <image source="../../tileset/building/window/int_windows_wood_centered.png" width="320" height="96"/>
+ </tileset>
+ <tileset firstgid="107" name="dark_stairs" tilewidth="32" tileheight="32">
+  <image source="../../tileset/building/stairs/dark_stairs.png" width="32" height="64"/>
+ </tileset>
+ <tileset firstgid="109" name="brown_rug2" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/carpet/brown_rug2.png" width="96" height="128"/>
+ </tileset>
+ <tileset firstgid="121" name="bb_peach" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/bed/bb_peach.png" width="64" height="128"/>
+ </tileset>
+ <tileset firstgid="129" name="bb_dk_blue" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/bed/bb_dk_blue.png" width="64" height="128"/>
+ </tileset>
+ <tileset firstgid="137" name="drawer_shelf" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/shelve/drawer_shelf.png" width="64" height="96"/>
+ </tileset>
+ <tileset firstgid="143" name="green_bookshelf" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/shelve/green_bookshelf.png" width="64" height="96"/>
+ </tileset>
+ <tileset firstgid="149" name="wooden_pale" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/table/wooden_pale.png" width="32" height="32"/>
+ </tileset>
+ <tileset firstgid="150" name="wooden_pale" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/chair/wooden_pale.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="154" name="sofa_brown" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/chair/sofa_brown.png" width="96" height="64"/>
+ </tileset>
+ <tileset firstgid="160" name="lights_candle" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/light/lights_candle.png" width="192" height="192"/>
+ </tileset>
+ <tileset firstgid="196" name="throw_3" tilewidth="32" tileheight="32">
+  <image source="../../tileset/item/textile/throw_3.png" width="96" height="32"/>
+ </tileset>
+ <tileset firstgid="199" name="throw_pillows" tilewidth="32" tileheight="32">
+  <image source="../../tileset/item/textile/throw_pillows.png" width="128" height="64"/>
+ </tileset>
+ <tileset firstgid="207" name="oriental_plant" tilewidth="32" tileheight="32">
+  <image source="../../tileset/plant/indoor/oriental_plant.png" width="32" height="64"/>
+ </tileset>
+ <tileset firstgid="209" name="square" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/table/square.png" width="32" height="32"/>
+ </tileset>
+ <tileset firstgid="210" name="desk_wooden" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/table/desk_wooden.png" width="64" height="64"/>
+ </tileset>
+ <layer name="0_floor" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+2UMQ4AIQgEqe1o75H8v7zWEE93QW2OYspliJFtItICPMFcj5L0XjarzmsgIy+atfL+zrtilPNe9j8jdzab/bXT6v5nMG+p4Ey0c1jvzr5Cvaf6Kkt5y3vDy2LBHHvjHkvmX+Kbc6pgCQAA
+  </data>
+ </layer>
+ <layer name="1_terrain" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+2UuQ0CMRBFpxRzRFwRCCIQtEMNkEEHIG5q4uqHv2KRLMueY1mI+NILVp7vv7Y144ioAqpKaqBOLzmj1/c3QBO0lLRBJ8+1en1/5u2RXn691et7OO8MzEvIXYClIZf7Xyl3Lfh97waswLaE3NQ+3z6v5O+DAen6hoL6bpDrSO6rt2cMJqTrG4rUj4KzSH01DDzSvYSaGmpjcsTfTXiXnKQ3s8wr7b1kkt4sNa8uYAf24JB/c7qCW2IttVeqj47gBM6K893Bg1mP7VW0fz/VP/e3uZqei0EFPJY5mYIKePzZ+gSPjlFjYAkAAA==
+  </data>
+ </layer>
+ <layer name="2_object" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC2NggIB+IJ4AZfszkAc6gbgLiU+MOROBeBKUHQmlK4G4igR7u4G4B4kPM6cRiJtw6JkMxFNIsAMb6AXiPgrNGAWjYBQMHXAei9geOph1AUofAeKjQHwMiA+Rae8FJPZxKE2uWaNgFFACcLURkMVlobQ8GXpxgUgixNWBWAOINcnQCwMAg335/WAJAAA=
+  </data>
+ </layer>
+ <layer name="3_roof" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC2NgGAUwUA3ENVQwpxmIW6hgzigYBaNgFIyCUTAKhiYAAG/lZ4BgCQAA
+  </data>
+ </layer>
+ <layer name="4_roof_add" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+3BMQEAAADCoPVPbQlPoAAAeBoqs0udYAkAAA==
+  </data>
+ </layer>
+ <layer name="objects" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+3BMQEAAADCoPVPbQlPoAAAeBoqs0udYAkAAA==
+  </data>
+ </layer>
+ <layer name="collision" width="30" height="20" opacity="0.49">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+2TMQ4AIAgDy/8/7epiiwhhEBImCwekGgD7OFVEalg907xyd1105qp9VR8vV92we1+v327fsnzexWUx3BreScN6MW8Amsm4rFfkjhkx3B5uxOcV/7U6F2EI7kFgCQAA
+  </data>
+ </layer>
+ <layer name="protection" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+3BMQEAAADCoPVPbQlPoAAAeBoqs0udYAkAAA==
+  </data>
+ </layer>
+</map>
diff --git a/tiled/interiors/deniran/inn_1.tmx b/tiled/interiors/deniran/inn_1.tmx
new file mode 100644
index 0000000000..b5df4c128a
--- /dev/null
+++ b/tiled/interiors/deniran/inn_1.tmx
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="32" tileheight="32" nextobjectid="1">
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32">
+  <image source="../../tileset/logic/collision.png" width="32" height="32"/>
+ </tileset>
+ <tileset firstgid="2" name="wallpapers" tilewidth="32" tileheight="32">
+  <image source="../../tileset/building/wall/wallpapers.png" width="160" height="160"/>
+ </tileset>
+ <tileset firstgid="27" name="wood_trim" tilewidth="32" tileheight="32">
+  <image source="../../tileset/building/wall/wood_trim.png" width="320" height="160"/>
+ </tileset>
+ <tileset firstgid="77" name="int_windows_wood_centered" tilewidth="32" tileheight="32">
+  <image source="../../tileset/building/window/int_windows_wood_centered.png" width="320" height="96"/>
+ </tileset>
+ <tileset firstgid="107" name="single_blue" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/bed/single_blue.png" width="32" height="64"/>
+ </tileset>
+ <tileset firstgid="109" name="single_pink_roses" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/bed/single_pink_roses.png" width="96" height="96"/>
+ </tileset>
+ <tileset firstgid="118" name="small_shelf" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/shelve/small_shelf.png" width="64" height="128"/>
+ </tileset>
+ <tileset firstgid="126" name="bright_bookshelf_and_cupboard" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/shelve/bright_bookshelf_and_cupboard.png" width="96" height="64"/>
+ </tileset>
+ <tileset firstgid="132" name="desk" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/table/desk.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="136" name="wooden_pale" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/table/wooden_pale.png" width="32" height="32"/>
+ </tileset>
+ <tileset firstgid="137" name="wooden_pale" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/chair/wooden_pale.png" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="141" name="lights_candle" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/light/lights_candle.png" width="192" height="192"/>
+ </tileset>
+ <tileset firstgid="177" name="brown_rug2" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/carpet/brown_rug2.png" width="96" height="128"/>
+ </tileset>
+ <tileset firstgid="189" name="side_on_bluer" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/bed/side_on_bluer.png" width="64" height="32"/>
+ </tileset>
+ <tileset firstgid="191" name="oil_paintings" tilewidth="32" tileheight="32">
+  <image source="../../tileset/furniture/picture/oil_paintings.png" width="128" height="128"/>
+ </tileset>
+ <tileset firstgid="207" name="dark_stairs" tilewidth="32" tileheight="32">
+  <image source="../../tileset/building/stairs/dark_stairs.png" width="32" height="64"/>
+ </tileset>
+ <layer name="0_floor" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+NiYGDgIgNLkakPGQuSiJHtJVWvIJq9m4jE2OwlVu+mUXtHnL34MC592OwlJT0TymOEzMXnLnz5HxemJBzxmUtMmUNJ/FFaXpEazrQsr6gRHiMx/47aSx97B6LeH4h2DgCIxSYaYAkAAA==
+  </data>
+ </layer>
+ <layer name="1_terrain" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+2UQQqDQAxFc5SpdVW1K0VXSnu69nYeqYE68JE4SVTQQj/81cybDAk/gYgu7MzoKzunr4KTRf7GLtil0RX7PtX1ssi38I5FeN/LIrNX3fdBdV871E29cbY+r6nbkZ4Z5OL9mt3MzgOlsxWZB/tJemai8H7PHmbnWrYkZqknksYVDCrQcl+kPmpKzc26r6Se4D+l+afmtmVf4T+l+Ws6Q45+va5lV/73pM2YaS9r3ZNapr0s8h8oKQFHYAkAAA==
+  </data>
+ </layer>
+ <layer name="2_object" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC92WTQrCMBCF54auu3NfBUFQQUXxF9RDuHXlCdRWF1atnsmJTkiIkyZKacEPH5mmM5m01EcAFBXgsc1/k5N1P0CFFA9pDGl+7lg3oFHm1VEdVJfigCvSqNE4Nq5njjqJzGugeqg+xXkSvX5vNsa9piUWHADWKSpB6fPmGoI9vvqdev0fbFErj73aWOawBodr3/9CrH0DRXEqoWeZxJ55wldaqDbFgsmPPac0Cr8bgPJBDs5jfH3KRNYJvxuB8j2OLI/JmytA9YFy5fn87zmfMzmSN16w593o61NvIn3OhmvfNp/0ed6F5x6LJGvf+pngrOX4nDdS8iYu11WvnwluWl/XWUGQUF+ZG2keydU/AeRJZI1gCQAA
+  </data>
+ </layer>
+ <layer name="3_roof" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+3BMQEAAADCoPVPbQlPoAAAeBoqs0udYAkAAA==
+  </data>
+ </layer>
+ <layer name="4_roof_add" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+3BMQEAAADCoPVPbQlPoAAAeBoqs0udYAkAAA==
+  </data>
+ </layer>
+ <layer name="objects" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+3BMQEAAADCoPVPbQlPoAAAeBoqs0udYAkAAA==
+  </data>
+ </layer>
+ <layer name="collision" width="30" height="20" opacity="0.43">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+WSWwoAIAgE7f6X7iuIUHftSSVIVq6TUhKR9KEXq2Nrb2m9PHSOLMK14ggXzYp9u8f1arD9MroVc47yUd2e+9G/fpKL7DXu7DlrGrYf1H+7atw2f5SL9NH8XVyP36vT/garu7XfXzwDwxO2Y2AJAAA=
+  </data>
+ </layer>
+ <layer name="protection" width="30" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAC+3BMQEAAADCoPVPbQlPoAAAeBoqs0udYAkAAA==
+  </data>
+ </layer>
+</map>
diff --git a/tiled/template.tmx b/tiled/template.tmx
index 44e04a785c..20ae839be7 100644
--- a/tiled/template.tmx
+++ b/tiled/template.tmx
@@ -1,55 +1,58 @@
-<?xml version="1.0"?>
-<map version="0.99b" orientation="orthogonal" width="16" height="16" tilewidth="32" tileheight="32">
- <tileset name="wall" firstgid="1" tilewidth="32" tileheight="32">
-  <image source="tileset/building/wall/int_wall_pale.png"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="16" height="16" tilewidth="32" tileheight="32" nextobjectid="1">
+ <tileset firstgid="1" name="wall" tilewidth="32" tileheight="32">
+  <image source="tileset/building/wall/int_wall_pale.png" width="64" height="256"/>
  </tileset>
- <tileset name="wall2" firstgid="17" tilewidth="32" tileheight="32">
-  <image source="tileset/building/wall/int_wall_purple.png"/>
+ <tileset firstgid="17" name="wall2" tilewidth="32" tileheight="32">
+  <image source="tileset/building/wall/int_wall_purple.png" width="64" height="320"/>
  </tileset>
- <tileset name="entrance" firstgid="37" tilewidth="32" tileheight="32">
-  <image source="tileset/building/entrance/pale_red_ns.png"/>
+ <tileset firstgid="37" name="entrance" tilewidth="32" tileheight="32">
+  <image source="tileset/building/entrance/pale_red_ns.png" width="288" height="128"/>
  </tileset>
- <tileset name="entrance details" firstgid="73" tilewidth="32" tileheight="32">
-  <image source="tileset/building/entrance/detail_ns.png"/>
+ <tileset firstgid="73" name="entrance details" tilewidth="32" tileheight="32">
+  <image source="tileset/building/entrance/detail_ns.png" width="96" height="64"/>
+ </tileset>
+ <tileset firstgid="79" name="collision" tilewidth="32" tileheight="32">
+  <image source="tileset/logic/collision.png" width="32" height="32"/>
  </tileset>
  <layer name="0_floor" width="16" height="16">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAGNgGAWjYBSMVAAALq+17wAEAAA=
+   H4sIAAAAAAAAC2NgGAWjYBSMVAAALq+17wAEAAA=
   </data>
  </layer>
  <layer name="1_terrain" width="16" height="16">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAGNgGAWjYBSMVAAALq+17wAEAAA=
+   H4sIAAAAAAAAC2NgGAWjYBSMVAAALq+17wAEAAA=
   </data>
  </layer>
  <layer name="2_object" width="16" height="16">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAGNgGAWjYBSMVAAALq+17wAEAAA=
+   H4sIAAAAAAAAC2NgGAWjYBSMVAAALq+17wAEAAA=
   </data>
  </layer>
  <layer name="3_roof" width="16" height="16">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAGNgGAWjYBSMVAAALq+17wAEAAA=
+   H4sIAAAAAAAAC2NgGAWjYBSMVAAALq+17wAEAAA=
   </data>
  </layer>
  <layer name="4_roof_add" width="16" height="16">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAGNgGAWjYBSMVAAALq+17wAEAAA=
+   H4sIAAAAAAAAC2NgGAWjYBSMVAAALq+17wAEAAA=
   </data>
  </layer>
  <layer name="objects" width="16" height="16">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAGNgGAWjYBSMVAAALq+17wAEAAA=
+   H4sIAAAAAAAAC2NgGAWjYBSMVAAALq+17wAEAAA=
   </data>
  </layer>
  <layer name="collision" width="16" height="16">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAGNgGAWjYBSMVAAALq+17wAEAAA=
+   H4sIAAAAAAAAC2NgGAWjYBSMVAAALq+17wAEAAA=
   </data>
  </layer>
  <layer name="protection" width="16" height="16">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAAGNgGAWjYBSMVAAALq+17wAEAAA=
+   H4sIAAAAAAAAC2NgGAWjYBSMVAAALq+17wAEAAA=
   </data>
  </layer>
 </map>