diff --git a/Mystery.py b/Mystery.py
index 702a67d5..f18a4205 100644
--- a/Mystery.py
+++ b/Mystery.py
@@ -137,7 +137,7 @@ def roll_settings(weights):
     ret.ow_shuffle = overworld_shuffle if overworld_shuffle != 'none' else 'vanilla'
     ret.ow_crossed = get_choice('overworld_crossed')
     ret.ow_keepsimilar = get_choice('overworld_keepsimilar') == 'on'
-    ret.ow_mixed = get_choice('overworld_mixed') == 'on'
+    ret.ow_mixed = get_choice('overworld_swap') == 'on'
     overworld_flute = get_choice('flute_shuffle')
     ret.ow_fluteshuffle = overworld_flute if overworld_flute != 'none' else 'vanilla'
     entrance_shuffle = get_choice('entrance_shuffle')
diff --git a/mystery_example.yml b/mystery_example.yml
index 6bef94e6..9260b459 100644
--- a/mystery_example.yml
+++ b/mystery_example.yml
@@ -4,14 +4,18 @@
     parallel: 2
     full: 2
   overworld_crossed:
-    on: 1
-    off: 1
+    none: 1
+    polar: 1
+    grouped: 1
+    limited: 1
+    chaos: 1
   overworld_keepsimilar:
     on: 1
     off: 1
-  overworld_mixed:
-    on: 1
-    off: 1
+  overworld_swap:
+    vanilla: 1
+    mixed: 2
+    crossed: 2
   flute_shuffle:
     vanilla: 0
     balanced: 1