diff --git a/src/components/EntranceSection.vue b/src/components/EntranceSection.vue
index 68aeece..bcf6dfb 100644
--- a/src/components/EntranceSection.vue
+++ b/src/components/EntranceSection.vue
@@ -1,12 +1,22 @@
 <script>
 import { defineComponent } from "vue";
 
+import spoilerTranslation from "@/data/spoiler-translation.yaml";
+
 export default defineComponent({
   props: {
     label: "",
     entrances: {},
     entrance_arrow: null,
   },
+  methods: {
+    translate_interior(interior) {
+      return spoilerTranslation.entrance_interiors[interior] || interior;
+    },
+    translate_exterior(exterior) {
+      return spoilerTranslation.entrance_exteriors[exterior] || exterior;
+    },
+  },
 });
 </script>
 
@@ -25,7 +35,7 @@ export default defineComponent({
     <tbody>
       <template v-for="entrance in entrances">
         <tr>
-          <td>{{ entrance.exit }}</td>
+          <td>{{ translate_interior(entrance.exit) }}</td>
           <td class="px-3">
             <template v-if="entrance.direction == 'both'">
               <i class="bi bi-arrow-left-right"></i>
@@ -42,7 +52,7 @@ export default defineComponent({
               <i class="bi bi-arrow-right"></i>
             </template>
           </td>
-          <td>{{ entrance.entrance }}</td>
+          <td>{{ translate_exterior(entrance.entrance) }}</td>
         </tr>
       </template>
     </tbody>
diff --git a/src/components/EntranceSpoiler.vue b/src/components/EntranceSpoiler.vue
index b9f34a5..9f8a679 100644
--- a/src/components/EntranceSpoiler.vue
+++ b/src/components/EntranceSpoiler.vue
@@ -28,7 +28,8 @@ export default defineComponent({
     specific() {
       return spoilerData.entrance_categories.dungeons
         .concat(spoilerData.entrance_categories.dropdowns)
-        .concat(spoilerData.entrance_categories.connectors);
+        .concat(spoilerData.entrance_categories.connectors)
+        .concat(spoilerData.entrance_categories.shops);
     },
     dungeons() {
       return this.filter("dungeons");
@@ -39,6 +40,9 @@ export default defineComponent({
     connectors() {
       return this.filter("connectors");
     },
+    shops() {
+      return this.filter("shops");
+    },
     other() {
       const ret = [];
 
@@ -91,6 +95,7 @@ export default defineComponent({
     <EntranceSection label="Dropdowns" :entrances="dropdowns" />
     <EntranceSection label="Connectors" :entrances="connectors" />
 
+    <EntranceSection label="Shops" :entrances="shops" entrance_arrow="bi-arrow-left-right" />
     <EntranceSection label="Other" :entrances="other" entrance_arrow="bi-arrow-left-right" />
   </table>
 </template>
diff --git a/src/data/spoiler-translation.yaml b/src/data/spoiler-translation.yaml
new file mode 100644
index 0000000..a4bac5c
--- /dev/null
+++ b/src/data/spoiler-translation.yaml
@@ -0,0 +1,94 @@
+entrance_interiors:
+  Hyrule Castle Exit (South): Hyrule Castle (Front)
+  Hyrule Castle Exit (East): Hyrule Castle (Right)
+  Hyrule Castle Exit (West): Hyrule Castle (Left)
+  Eastern Palace Exit: Eastern Palace
+  Desert Palace Exit (South): Desert Palace (Front)
+  Desert Palace Exit (East): Desert Palace (Right)
+  Desert Palace Exit (West): Desert Palace (Left)
+  Desert Palace Exit (North): Desert Palace (Back)
+  Tower of Hera Exit: Tower of Hera
+  Agahnims Tower Exit: Castle Tower
+  Palace of Darkness Exit: Palace of Darkness
+  Swamp Palace Exit: Swamp Palace
+  Skull Woods First Section Exit: Skull Woods (Front)
+  Skull Woods Second Section Exit (East): Skull Woods (Middle Right)
+  Skull Woods Second Section Exit (West): Skull Woods (Middle Left)
+  Skull Woods Final Section Exit: Skull Woods (Back)
+  Thieves Town Exit: Thieves Town
+  Ice Palace Exit: Ice Palace
+  Misery Mire Exit: Misery Mire
+  Turtle Rock Exit (Front): Turtle Rock (Front)
+  Turtle Rock Ledge Exit (West): Turtle Rock (Left)
+  Turtle Rock Ledge Exit (East): Turtle Rock (Right)
+  Turtle Rock Isolated Ledge Exit: Turtle Rock (Bottom)
+  Ganons Tower Exit: Ganon's Tower
+  Hyrule Castle Secret Entrance: Uncle Passage Drop
+  Hyrule Castle Secret Entrance Exit: Uncle Passage Exit
+  Lumberjack Tree (top): Lumberjack Tree Drop
+  Lumberjack Tree Exit: Lumberjack Tree Exit
+  Lost Woods Hideout (top): Lost Woods Hideout Drop
+  Kakariko Well (top): Kakariko Well Drop
+  Bat Cave (right): Bat Cave Drop
+  North Fairy Cave: Fairy Dropdown
+  North Fairy Cave Exit: Fairy Dropdown Exit
+  Skull Pinball: Skull Woods Pinball Room
+  Skull Left Drop: Skull Woods Left Drop Room
+  Skull Pot Circle: Skull Woods Pot Circle
+  Skull Back Drop: Skull Woods Back Drop
+  Pyramid: Ganon Drop
+  Pyramid Exit: Ganon Fall Exit
+  Elder House Exit (East): Elder House (Right)
+  Elder House Exit (West): Elder House (Left)
+  Two Brothers House Exit (East): Quarreling Brothers (Right)
+  Two Brothers House Exit (West): Quarreling Brothers (Left)
+  Old Man Cave Exit (West): Old Man Rescue Cave (Front)
+  Old Man Cave Exit (East): Old Man Rescue Cave (Back)
+  Old Man House Exit (Bottom): Old Man House (Front)
+  Old Man House Exit (Top): Old Man House (Back)
+  Spectacle Rock Cave Exit: Spectacle Rock (Left)
+  Spectacle Rock Cave Exit (Top): Spectacle Rock (Bottom)
+  Spectacle Rock Cave Exit (Peak): Spectacle Rock (Top)
+  Paradox Cave Exit (Bottom): Paradox Cave (Bottom Shop Area)
+  Paradox Cave Exit (Middle): Paradox Cave (Middle Drop Area)
+  Paradox Cave Exit (Top): Paradox Cave (Top)
+  Spiral Cave Exit (Top): Spiral Cave (Top)
+  Spiral Cave Exit: Sprial Cave (Bottom)
+  Fairy Ascension Cave Exit (Top): Fairy Ascension Cave (Top)
+  Fairy Ascension Cave Exit (Bottom): Fairy Ascension Cave (Bottom)
+  Death Mountain Return Cave Exit (East): Death Mountain Return Cave (Right)
+  Death Mountain Return Cave Exit (West): Death Mountain Return Cave (Left)
+  Bumper Cave Exit (Bottom): Bumper Cave (Bottom)
+  Bumper Cave Exit (Top): Bumper Cave (Top)
+  Superbunny Cave Exit (Bottom): Superbunny Cave (Bottom)
+  Superbunny Cave Exit (Top): Superbunny Cave (Top)
+  Hookshot Cave Front Exit: Hookshot Cave (Front)
+  Hookshot Cave Back Exit: Hookshot Cave (Back)
+  Sahasrahlas Hut: Sahasrahla's Hut
+  Links House Exit: Link's House
+  Sick Kids House: Sick Kid's House
+  Blinds Hideout: Blind's Hideout
+  Kings Grave: King's Tomb
+  Blacksmiths Hut: Blacksmith's House
+  Aginahs Cave: Aginah's Cave
+  Waterfall of Wishing: Waterfall Fairy
+entrance_exteriors:
+  Ganons Tower: Ganon's Tower
+  Agahnims Tower: Castle Tower
+  Links House: Link's House
+  Spectacle Rock Cave: Spectacle Rock (Right)
+  Spectacle Rock Cave Peak: Spectacle Rock (Top)
+  Spectacle Rock Cave (Bottom): Spectacle Rock (Left)
+  Sahasrahlas Hut: Sahasrahla's Hut
+  Paradox Cave (Bottom): Paradox Cave (Middle)
+  Paradox Cave (Middle): Paradox Cave (South)
+  Old Man Cave (West): Old Man Rescue (Base)
+  Old Man Cave (East): Old Man Rescue (Mountain)
+  Old Man House (Top): Old Man House (North/Back)
+  Old Man House (Bottom): Old Man House (South/Front)
+  Sick Kids House: Sick Kid's House
+  Blinds Hideout: Blind's Hideout
+  Kings Grave: King's Tomb
+  Blacksmiths Hut: Blacksmith's House
+  Aginahs Cave: Aginah's Cave
+  Waterfall of Wishing: Waterfall Fairy
diff --git a/src/data/spoiler.yaml b/src/data/spoiler.yaml
index 94b4f6a..90fe3c1 100644
--- a/src/data/spoiler.yaml
+++ b/src/data/spoiler.yaml
@@ -189,4 +189,16 @@ entrance_categories:
     - Superbunny Cave Exit (Top)
     - Hookshot Cave Front Exit
     - Hookshot Cave Back Exit
+  shops:
+    - Potion Shop
+    - Big Bomb Shop
+    - Capacity Upgrade
+    - Kakariko Shop
+    - Lake Hylia Shop
+    - Dark Lake Hylia Shop
+    - Dark Death Mountain Shop
+    - Dark Lumberjack Shop
+    - Village of Outcasts Shop
+    - Dark Potion Shop
+    - Red Shield Shop