diff --git a/src/components/SeedSettings.vue b/src/components/SeedSettings.vue
index 672027d..fae35e8 100644
--- a/src/components/SeedSettings.vue
+++ b/src/components/SeedSettings.vue
@@ -58,6 +58,15 @@ export default defineComponent({
     {{ settingsDisplay.randomizer[settings.randomizer] }}
     <hr class="mt-2 mb-2" />
   </div>
+  <div v-if="settings.mode">
+    Mode: {{ settingsDisplay.mode[settings.mode] }}
+  </div>
+  <div v-if="settings.tile_swap && settings.tile_swap != 'vanilla'">
+    {{ settingsDisplay.tile_swap[settings.tile_swap] }}
+  </div>
+  <div v-if="settings.overworld_layout && settings.overworld_layout != 'vanilla'">
+    {{ settingsDisplay.overworld_layout[settings.overworld_layout] }}
+  </div>
   <div v-if="settings.goal">
     Goal: {{ settingsDisplay.goal[settings.goal] }}
   </div>
diff --git a/src/components/SettingsPage.vue b/src/components/SettingsPage.vue
index e1eda1d..8fccaef 100644
--- a/src/components/SettingsPage.vue
+++ b/src/components/SettingsPage.vue
@@ -175,7 +175,10 @@ export default defineComponent({
       <template #header>
         <b>Entrance Shuffle:</b>
       </template>
-      <SettingPicker color="warning" v-model="set.entrance_shuffle" name="entrance_shuffle" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="warning" v-model="set.entrance_shuffle"
+          name="entrance_shuffle" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="warning" v-if="this.set.entrance_shuffle != 'vanilla'"
+          v-model="set.overworld_map_dungeons" name="overworld_map_dungeons" :generator="generator" :prefix="prefix" />
       <SettingPicker color="warning" v-if="this.set.entrance_shuffle != 'vanilla'"
           v-model="set.links_house" name="links_house" :generator="generator" :prefix="prefix" />
       <SettingPicker color="warning" v-if="this.set.entrance_shuffle != 'vanilla'"
@@ -188,19 +191,35 @@ export default defineComponent({
         <b>Dungeon Shuffle:</b>
       </template>
       <SettingPicker color="danger" v-model="set.door_shuffle" name="door_shuffle" :generator="generator" :prefix="prefix" />
-      <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
+      <SettingPicker color="danger" v-if="set.door_shuffle != 'vanilla'"
           v-model="set.lobbies" name="lobbies" :generator="generator" :prefix="prefix" />
-      <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
+      <SettingPicker color="danger" v-if="set.door_shuffle != 'vanilla'"
           v-model="set.door_type_mode" name="door_type_mode" :generator="generator" :prefix="prefix" />
-      <SettingPicker color="danger" v-if="this.set.door_shuffle != 'vanilla'"
+      <SettingPicker color="danger" v-if="set.door_shuffle != 'vanilla'"
           v-model="set.trap_door_mode" name="trap_door_mode" :generator="generator" :prefix="prefix" />
     </AccordionItem>
     <AccordionItem :expanded="false">
       <template #header>
         <b>Overworld Settings:</b>
       </template>
-      <SettingPicker color="primary" v-model="set.tile_swap" name="tile_swap" :generator="generator" :prefix="prefix" />
-      <SettingPicker color="primary" v-model="set.flute_shuffle" name="flute_shuffle" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.overworld_layout"
+          name="overworld_layout" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-if="set.overworld_layout != 'vanilla'"
+          v-model="set.overworld_world_layouts" name="overworld_world_layouts"
+          :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-if="set.overworld_layout != 'vanilla'"
+          v-model="set.overworld_layout_terrain" name="overworld_layout_terrain"
+          :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-if="set.overworld_layout != 'vanilla'"
+          v-model="set.overworld_layout_edges" name="overworld_layout_edges"
+          :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.tile_swap" name="tile_swap"
+          :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-if="set.overworld_layout == 'shuffled_grid' || set.tile_swap != 'vanilla'"
+          v-model="set.overworld_map_fog" name="overworld_map_fog"
+          :generator="generator" :prefix="prefix" />
+      <SettingPicker color="primary" v-model="set.flute_shuffle"
+          name="flute_shuffle" :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 b35555c..fd73baf 100644
--- a/src/data/generator-settings.yaml
+++ b/src/data/generator-settings.yaml
@@ -8,6 +8,7 @@ base:
   crystals_gt: all
   ganon_item: all
   entrance_shuffle: all
+  overworld_map_dungeons: all
   links_house: all
   skull_woods: all
   linked_drops: all
@@ -64,6 +65,7 @@ beta:
   crystals_gt: all
   ganon_item: all
   entrance_shuffle: all
+  overworld_map_dungeons: all
   links_house: all
   skull_woods: all
   linked_drops: all
@@ -93,5 +95,53 @@ beta:
   follower_shuffle: all
   flute_shuffle: all
   tile_swap: all
+  overworld_layout: all
+  overworld_world_layouts: all
+  overworld_layout_terrain: all
+  overworld_layout_edges: all
+  overworld_map_fog: all
+  damage_challenge: all
+  hints: all
+pikit:
+  weapons: all
+  goal: all
+  crystals_ganon: all
+  bosses_ganon: all
+  triforce_pieces: all
+  crystals_gt: all
+  ganon_item: all
+  entrance_shuffle: all
+  overworld_map_dungeons: all
+  links_house: all
+  skull_woods: all
+  linked_drops: all
+  door_shuffle: all
+  lobbies: all
+  door_type_mode: all
+  trap_door_mode: all
+  boss_shuffle: all
+  damage_table_shuffle: all
+  small_keys: all
+  big_keys: all
+  maps: all
+  compasses: all
+  show_loot: all
+  show_map: all
+  shop_shuffle: all
+  drop_shuffle: all
+  pot_shuffle: all
+  boots: all
+  flute: all
+  mirror: all
+  dark_rooms: all
+  bombs: all
+  book: all
+  follower_shuffle: all
+  flute_shuffle: all
+  overworld_layout: all
+  overworld_world_layouts: all
+  overworld_layout_terrain: all
+  overworld_layout_edges: all
+  overworld_map_fog: all
   damage_challenge: all
   hints: all
diff --git a/src/data/presets.yaml b/src/data/presets.yaml
index a06903e..38c62f8 100644
--- a/src/data/presets.yaml
+++ b/src/data/presets.yaml
@@ -84,3 +84,7 @@ base:
 beta:
   default:
     display: Default
+pikit:
+  default:
+    display: Default
+    show_loot: always
diff --git a/src/data/settings-display.yaml b/src/data/settings-display.yaml
index 636abae..60eb3a4 100644
--- a/src/data/settings-display.yaml
+++ b/src/data/settings-display.yaml
@@ -1,5 +1,6 @@
 randomizer:
   apr2025: April 2025 Special Randomizer
+  pikit: Special Pikit Randomizer
 goal:
   ganon: "{{ crystals_ganon }} Crystal Ganon"
   fast_ganon: "{{ crystals_ganon }} Crystal Fast Ganon"
@@ -85,3 +86,10 @@ prize_shuffle:
   dungeon: Prizes Shuffled in Dungeon
   nearby: Prizes Shuffled Nearby
   wild: Wild Prizes
+overworld_layout:
+  vanilla: Vanilla Overworld
+  shuffled_grid: Shuffled Grid Overworld
+  shuffled: Shuffled Overworld
+tile_swap:
+  vanilla: No Tile Swap
+  tile_swap: Overworld Tile Swap
diff --git a/src/data/settings.yaml b/src/data/settings.yaml
index 3f91fdf..031e16e 100644
--- a/src/data/settings.yaml
+++ b/src/data/settings.yaml
@@ -199,6 +199,18 @@ entrance_shuffle:
       display: Swapped
     decoupled:
       display: Decoupled
+overworld_map_dungeons:
+  display: Dungeon Locations on Overworld Map
+  default: vanilla
+  values:
+    vanilla:
+      display: Vanilla Location
+    map:
+      display: Show with Map
+      tip: Locations of dungeons for which the player has the dungeon map will be shown on the overworld map.
+    compass:
+      display: Show with Compass
+      tip: Locations of dungeons for which the player has the dungeon compass will be shown on the overworld map.
 links_house:
   display: Link's House
   default: vanilla
@@ -546,6 +558,59 @@ tile_swap:
     tile_swap:
       display: Tile Swap
       tip: Each tile on the overworld has a chance to be swapped with its inverted version.
+overworld_layout:
+  display: Overworld Layout
+  default: vanilla
+  values:
+    vanilla:
+      display: Vanilla
+      tip: Overworld screens retain their vanilla transitions.
+    shuffled_grid:
+      display: Shuffled Grid
+      tip: Overworld screen transitions are shuffled such that they still maintain an 8x8 grid, and the overworld map reflects the layout.
+    shuffled:
+      display: Shuffled
+      tip: Overworld screen transitions are shuffled without regard for Euclidean space and cannot be displayed as a map.
+overworld_world_layouts:
+  display: Overworld World Layouts
+  default: parallel
+  values:
+    parallel:
+      display: Parallel
+      tip: Light World screens and their corresponding Dark World screens are connected to the same relative screens.
+    independent:
+      display: Independent
+      tip: Light World screens can have a different topology than Dark World screens; the same transition on corresponding screens between the two worlds can lead to different places.
+overworld_layout_edges:
+  display: Overworld Layout Edges
+  default: unrestricted
+  values:
+    unrestricted:
+      display: Unrestricted
+      tip: Overworld edges with multiple transitions can lead to different screens.
+    grouped:
+      display: Grouped
+      tip: Overworld edges with multiple transitions will all lead to the same screen.
+overworld_layout_terrain:
+  display: Overworld Layout Terrain
+  default: same_only
+  values:
+    same_only:
+      display: Same Only
+      tip: Overworld transitions will only connect land to land and water to water.
+    allow_mixed:
+      display: Allow Mixed
+      tip: Overworld transitions can connect land to water or vice versa.
+overworld_map_fog:
+  display: Overworld Map Fog
+  default: fog
+  values:
+    fog:
+      display: Fog
+      tip: Fog on the overworld map will cover screens that have not been visited.
+    no_fog:
+      display: No Fog
+      tip: The entire overworld map will always be visible.
 damage_challenge:
   display: Damage Mode
   default: normal
diff --git a/src/router/index.js b/src/router/index.js
index be194f9..4c7be47 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -32,6 +32,11 @@ const router = createRouter({
       alias: '/generate/beta_test',
       props: { generator: "beta", prefix: "dungeon-maps-" },
     },
+    {
+      path: '/generate/pikit',
+      component: GenerateView,
+      props: { generator: "pikit", prefix: "pikit-" },
+    },
     {
       path: '/multibeta',
       component: GenerateMulti,