diff --git a/src/components/SettingPicker.vue b/src/components/SettingPicker.vue
index 3d8d81b..2b75b6a 100644
--- a/src/components/SettingPicker.vue
+++ b/src/components/SettingPicker.vue
@@ -48,7 +48,7 @@ export default defineComponent({
   },
   methods: {
     change() {
-      this.$emit("update:modelValue", this.selected);
+      this.$emit("update:modelValue", String(this.selected));
     },
   },
 });
diff --git a/src/data/generator-settings.yaml b/src/data/generator-settings.yaml
index 9468046..8ef7579 100644
--- a/src/data/generator-settings.yaml
+++ b/src/data/generator-settings.yaml
@@ -24,6 +24,8 @@ base:
   boots: all
   flute: all
   dark_rooms: all
+  bombs: all
+  book: all
 apr2025:
   mode: ['open', 'standard']
   weapons: all
diff --git a/src/data/settings.yaml b/src/data/settings.yaml
index 0edc85c..164235f 100644
--- a/src/data/settings.yaml
+++ b/src/data/settings.yaml
@@ -50,21 +50,21 @@ crystals_ganon:
   default: "7"
   order: [7, 6, 5, 4, 3, 2, 1, 0, "random"]
   values:
-    7:
+    "7":
       display: 7
-    6:
+    "6":
       display: 6
-    5:
+    "5":
       display: 5
-    4:
+    "4":
       display: 4
-    3:
+    "3":
       display: 3
-    2:
+    "2":
       display: 2
-    1:
+    "1":
       display: 1
-    0:
+    "0":
       display: 0
     random:
       display: Random
@@ -279,6 +279,22 @@ dark_rooms:
       display: Always in Logic
     starting_lamp:
       display: Starting Lamp
+bombs:
+  display: Bombs
+  default: normal
+  values:
+    normal:
+      display: No Bomb Bag Required
+    bomb_bag_required:
+      display: Bomb Bag Required
+book:
+  display: Book
+  default: normal
+  values:
+    normal:
+      display: No Special Functionality
+    crystal_switches:
+      display: Can Flip Crystal Switches
 door_shuffle:
   display: Door Shuffle
   default: vanilla
diff --git a/src/views/GenerateView.vue b/src/views/GenerateView.vue
index 27a6828..bfe25c6 100644
--- a/src/views/GenerateView.vue
+++ b/src/views/GenerateView.vue
@@ -113,6 +113,8 @@ export default defineComponent({
         <SettingPicker color="primary" v-model="set.boots" name="boots" generator="base" />
         <SettingPicker color="primary" v-model="set.flute" name="flute" generator="base" />
         <SettingPicker color="primary" v-model="set.dark_rooms" name="dark_rooms" generator="base" />
+        <SettingPicker color="primary" v-model="set.bombs" name="bombs" generator="base" />
+        <SettingPicker color="primary" v-model="set.book" name="book" generator="base" />
       </li>
     </ul>
     <div class="card-footer">