diff --git a/src/components/Seed.vue b/src/components/Seed.vue
index b7b3320..362ecec 100644
--- a/src/components/Seed.vue
+++ b/src/components/Seed.vue
@@ -234,11 +234,11 @@ export default defineComponent({
         </li>
         <li class="list-group-item">
           <button type="submit" class="btn btn-primary submit-btn" :disabled="!baserom || !patch" @click="patchRom">
-            Download Seed!
+            Download
           </button>
           <template v-if="spoiler">
             <button type="button" class="btn btn-secondary ms-3" @click="downloadSpoiler">
-              Download Spoiler
+              Spoiler
             </button>
             <button type="button" class="btn btn-secondary" @click="show_spoiler = !show_spoiler" style="float: right;">
               <i v-if="show_spoiler" class="bi bi-chevron-up"></i>
diff --git a/src/components/SettingsPage.vue b/src/components/SettingsPage.vue
index 4c50390..4885fcd 100644
--- a/src/components/SettingsPage.vue
+++ b/src/components/SettingsPage.vue
@@ -164,7 +164,7 @@ export default defineComponent({
       </template>
       <SettingPicker color="danger" v-model="set.door_shuffle" name="door_shuffle" generator="base" :prefix="prefix" />
       <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
-          v-model="set.door_lobbies" name="door_lobbies" generator="base" :prefix="prefix" />
+          v-model="set.lobbies" name="door_lobbies" generator="base" :prefix="prefix" />
       <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
           v-model="set.door_type_mode" name="door_type_mode" generator="base" :prefix="prefix" />
       <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
diff --git a/src/data/generator-settings.yaml b/src/data/generator-settings.yaml
index 4a1cb09..21ebbbc 100644
--- a/src/data/generator-settings.yaml
+++ b/src/data/generator-settings.yaml
@@ -29,7 +29,7 @@ base:
   hints: all
 apr2025:
   mode: ['open', 'standard']
-  weapons: all
+  weapons: ['random', 'assured', 'vanilla']
   crystals_ganon: all
   entrance_shuffle: ['vanilla', 'crossed']
   dungeon_item_shuffle:
@@ -41,3 +41,4 @@ apr2025:
       wild:
         display: Wild
   boots: ['normal', 'pseudoboots']
+  hints: all
diff --git a/src/data/settings-display.yaml b/src/data/settings-display.yaml
index 8809e74..a8d2b64 100644
--- a/src/data/settings-display.yaml
+++ b/src/data/settings-display.yaml
@@ -23,6 +23,7 @@ weapons:
   assured: Assured Sword
   vanilla: Vanilla Swords
   swordless: Swordless
+  assured_master: Starting Master Sword
 mode:
   open: Open
   standard: Standard
diff --git a/src/data/settings.yaml b/src/data/settings.yaml
index da1b7c6..f97b878 100644
--- a/src/data/settings.yaml
+++ b/src/data/settings.yaml
@@ -27,6 +27,8 @@ weapons:
       display: Vanilla
     swordless:
       display: Swordless
+    assured_master:
+      display: Assured Master
 goal:
   display: Goal
   default: ganon
diff --git a/src/views/GenerateApr2025View.vue b/src/views/GenerateApr2025View.vue
index 7621692..93bb812 100644
--- a/src/views/GenerateApr2025View.vue
+++ b/src/views/GenerateApr2025View.vue
@@ -49,6 +49,7 @@ export default defineComponent({
       <li class="list-group-item">
         <SettingPicker color="primary" v-model="set.mode" name="mode" generator="apr2025" />
         <SettingPicker color="primary" v-model="set.weapons" name="weapons" generator="apr2025" />
+        <SettingPicker color="primary" v-model="set.hints" name="hints" generator="apr2025" />
       </li>
       <li class="list-group-item">
         <SettingPicker color="success" v-model="set.crystals_ganon" name="crystals_ganon" generator="apr2025" />