diff --git a/src/components/SettingsPage.vue b/src/components/SettingsPage.vue
index a3b5d5b..f91b36a 100644
--- a/src/components/SettingsPage.vue
+++ b/src/components/SettingsPage.vue
@@ -150,6 +150,8 @@ export default defineComponent({
       <SettingPicker color="primary" v-model="set.mode" name="mode" :generator="generator" :prefix="prefix" />
       <SettingPicker color="primary" v-model="set.weapons" name="weapons" :generator="generator" :prefix="prefix" />
       <SettingPicker color="primary" v-model="set.hints" name="hints" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.show_map" name="show_map" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.show_loot" name="show_loot" :generator="generator" :prefix="prefix" />
     </AccordionItem>
     <AccordionItem :expanded="true">
       <template #header>
@@ -228,7 +230,6 @@ export default defineComponent({
       <SettingPicker color="primary" v-model="set.dark_rooms" name="dark_rooms" :generator="generator" :prefix="prefix" />
       <SettingPicker color="primary" v-model="set.bombs" name="bombs" :generator="generator" :prefix="prefix" />
       <SettingPicker color="primary" v-model="set.book" name="book" :generator="generator" :prefix="prefix" />
-      <SettingPicker color="primary" v-model="set.show_loot" name="show_loot" :generator="generator" :prefix="prefix" />
     </AccordionItem>
     <AccordionItem :expanded="false">
       <template #header>
diff --git a/src/data/generator-settings.yaml b/src/data/generator-settings.yaml
index c1b4b84..6d0059e 100644
--- a/src/data/generator-settings.yaml
+++ b/src/data/generator-settings.yaml
@@ -71,6 +71,7 @@ dungeon_map:
   maps: all
   compasses: all
   show_loot: all
+  show_map: all
   shop_shuffle: all
   drop_shuffle: all
   pottery: all
diff --git a/src/data/settings.yaml b/src/data/settings.yaml
index 7e4fad7..cc588bc 100644
--- a/src/data/settings.yaml
+++ b/src/data/settings.yaml
@@ -506,17 +506,34 @@ damage_challenge:
       display: Gloom
       tip: Every enemy will deal one permanent heart container of damage. The only way to regain health is to find heart containers or collect four heart pieces.
 show_loot:
-  display: Show Value of Checks
+  display: Show Dungeon Checks
   default: compass
   values:
     never:
       display: Never
+      tip: No icons will show on the dungeon map.
+    presence:
+      display: Uncollected
+      tip: A dot icons will show on the dungeon map on each supertile with an uncollected item.
     compass:
-      display: With Compass
-      tip: With the compass for a dungeon, icons will show on the dungeon map with the best item value on each supertile. Without the compass, compasses will show on the dungeon map.
+      display: Value With Compass
+      tip: With the compass for a dungeon, icons will show on the dungeon map with the best item value on each supertile. Without the compass, compass icons will show the location of compasses, and dots will show for any other uncollected item.
+    always:
+      display: Value Always
+      tip: Icons will show on the dungeon map with the best uncollected item value on each supertile.
+show_map:
+  display: Show Dungeon Maps
+  default: map
+  values:
+    visited:
+      display: Visited Tiles Only
+      tip: Visited tiles in the dungeon map will show the outline of the room. Unvisited tiles will show an undetailed square.
+    map:
+      display: Visited + Map
+      tip: With the map for a dungeon, all tiles in the dungeon map will show the outline of the room. Without the map, visited tiles will show the outline of the room, and unvisited tiles will show an undetailed square.
     always:
       display: Always
-      tip: Icons will show on the dungeon map with the best item value on each supertile.
+      tip: All tiles in the dungeon map will show the outline of the room.
 hints:
   display: Hints
   default: off