diff --git a/src/assets/maps/crypt.tmx b/src/assets/maps/crypt.tmx
index dd7c34ef..b494c3d6 100644
--- a/src/assets/maps/crypt.tmx
+++ b/src/assets/maps/crypt.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="25" height="39" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="17">
+<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="25" height="39" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="18">
  <properties>
   <property name="combat" type="bool" value="true"/>
   <property name="dark" type="bool" value="true"/>
diff --git a/src/assets/maps/isle.tmx b/src/assets/maps/isle.tmx
index d1a1644b..f12c4f61 100644
--- a/src/assets/maps/isle.tmx
+++ b/src/assets/maps/isle.tmx
@@ -56,6 +56,7 @@
     <property name="buyRate" value="130"/>
     <property name="groups" value="[&quot;default&quot;,&quot;water&quot;]"/>
     <property name="icon" value="shop.png"/>
+    <property name="inventory" propertytype="DataWeapons" value="coral-staff,narwhal-sword"/>
     <property name="level" value="5"/>
     <property name="name" value="Buccaneer's Bazaar"/>
     <property name="sellRate" value="25"/>
diff --git a/src/assets/maps/keep.tmx b/src/assets/maps/keep.tmx
index 9f9c0231..019b92fd 100644
--- a/src/assets/maps/keep.tmx
+++ b/src/assets/maps/keep.tmx
@@ -156,21 +156,25 @@
   </object>
   <object id="14" name="Dwarven Armors" class="ArmorsStoreFeatureComponent" gid="97" x="112" y="96" width="16" height="16">
    <properties>
+    <property name="inventory" propertytype="DataArmors" value="coral-helm,chain-mail-armor,merman-shield,seaweed-armor"/>
     <property name="name" value="Dwarven Armors"/>
    </properties>
   </object>
   <object id="15" name="Dwarven Arms" class="WeaponsStoreFeatureComponent" gid="93" x="240" y="96" width="16" height="16">
    <properties>
+    <property name="inventory" propertytype="DataWeapons" value="magic-sword,heavy-axe,fine-bow,long-oak-staff"/>
     <property name="name" value="Dwarven Arms"/>
    </properties>
   </object>
-  <object id="16" name="Warvian Antiquities" class="ItemsStoreFeatureComponent" gid="96" x="112" y="160" width="16" height="16">
+  <object id="16" name="Warvian Antiquities" class="MagicsStoreFeatureComponent" gid="96" x="112" y="160" width="16" height="16">
    <properties>
+    <property name="inventory" propertytype="DataMagics" value="push,heal"/>
     <property name="name" value="Warvian Antiquities"/>
    </properties>
   </object>
-  <object id="17" name="Potions and Elixirs" class="MagicsStoreFeatureComponent" gid="95" x="240" y="160" width="16" height="16">
+  <object id="17" name="Potions and Elixirs" class="ItemsStoreFeatureComponent" gid="95" x="240" y="160" width="16" height="16">
    <properties>
+    <property name="inventory" propertytype="DataItems" value="potion,potion-large,ether"/>
     <property name="name" value="Potions and Elixirs"/>
    </properties>
   </object>
diff --git a/src/assets/maps/templates/combat-zone.tx b/src/assets/maps/templates/combat-zone.tx
deleted file mode 100644
index e3247b9b..00000000
--- a/src/assets/maps/templates/combat-zone.tx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<template>
- <object class="CombatZoneClass" width="128" height="128"/>
-</template>
diff --git a/src/assets/maps/templates/locked-door.tx b/src/assets/maps/templates/locked-door.tx
deleted file mode 100644
index 46ed9ca3..00000000
--- a/src/assets/maps/templates/locked-door.tx
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<template>
- <tileset firstgid="1" source="../tiles/objects.tsx"/>
- <object name="LockedGate" class="DoorFeatureComponent" gid="8" width="16" height="16">
-  <properties>
-   <property name="id" value="unique-door-id"/>
-   <property name="until" value="unique-door-id"/>
-   <property name="requiredKey" value="unique-door-key"/>
-   <property name="title" value="Locked Door"/>
-   <property name="lockedText" value="You encounter a locked door, but don't have the key. You walk away looking sad."/>
-   <property name="unlockText" value="You unlocked the door!"/>
-  </properties>
- </object>
-</template>
diff --git a/src/assets/maps/templates/static-sprite.tx b/src/assets/maps/templates/static-sprite.tx
deleted file mode 100644
index f923165e..00000000
--- a/src/assets/maps/templates/static-sprite.tx
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<template>
- <tileset firstgid="1" source="../tiles/environment.tsx"/>
- <object name="well" class="BlockFeatureComponent" gid="36" width="16" height="16"/>
-</template>