diff --git a/gui/bottom.py b/gui/bottom.py
index 49107c2d..66b430b0 100644
--- a/gui/bottom.py
+++ b/gui/bottom.py
@@ -105,7 +105,7 @@ def create_guiargs(parent):
     guiargs.progressive = parent.pages["randomizer"]["item"].itemWidgets["progressives"].storageVar.get()
     guiargs.accessibility = parent.pages["randomizer"]["item"].itemWidgets["accessibility"].storageVar.get()
     guiargs.algorithm = parent.pages["randomizer"]["item"].itemWidgets["sortingalgo"].storageVar.get()
-    guiargs.shuffle = parent.entrandoWindow.entrandoWidgets["entranceshuffle"].storageVar.get()
+    guiargs.shuffle = parent.pages["randomizer"].pages["entrance"].entrandoWidgets["entranceshuffle"].storageVar.get()
     guiargs.door_shuffle = parent.dungeonRandoWindow.dungeonWidgets["dungeondoorshuffle"].storageVar.get()
     guiargs.experimental = parent.dungeonRandoWindow.dungeonWidgets["experimental"].storageVar.get()
     guiargs.heartbeep = parent.gameOptionsWindow.gameOptionsWidgets["heartbeep"].storageVar.get()
@@ -114,7 +114,7 @@ def create_guiargs(parent):
     guiargs.create_spoiler = bool(parent.generationSetupWindow.generationWidgets["spoiler"].storageVar.get())
     guiargs.skip_playthrough = not bool(parent.generationSetupWindow.generationWidgets["spoiler"].storageVar.get())
     guiargs.suppress_rom = bool(parent.generationSetupWindow.generationWidgets["suppressrom"].storageVar.get())
-    guiargs.openpyramid = bool(parent.entrandoWindow.entrandoWidgets["openpyramid"].storageVar.get())
+    guiargs.openpyramid = bool(parent.pages["randomizer"].pages["entrance"].entrandoWidgets["openpyramid"].storageVar.get())
     guiargs.mapshuffle = bool(parent.dungeonRandoWindow.dungeonWidgets["mapshuffle"].storageVar.get())
     guiargs.compassshuffle = bool(parent.dungeonRandoWindow.dungeonWidgets["compassshuffle"].storageVar.get())
     guiargs.keyshuffle = bool(parent.dungeonRandoWindow.dungeonWidgets["smallkeyshuffle"].storageVar.get())
@@ -124,7 +124,7 @@ def create_guiargs(parent):
     guiargs.disablemusic = bool(parent.gameOptionsWindow.gameOptionsWidgets["nobgm"].storageVar.get())
     guiargs.ow_palettes = parent.gameOptionsWindow.gameOptionsWidgets["owpalettes"].storageVar.get()
     guiargs.uw_palettes = parent.gameOptionsWindow.gameOptionsWidgets["uwpalettes"].storageVar.get()
-    guiargs.shuffleganon = bool(parent.entrandoWindow.entrandoWidgets["shuffleganon"].storageVar.get())
+    guiargs.shuffleganon = bool(parent.pages["randomizer"].pages["entrance"].entrandoWidgets["shuffleganon"].storageVar.get())
     guiargs.hints = bool(parent.gameOptionsWindow.gameOptionsWidgets["hints"].storageVar.get())
     guiargs.enemizercli = parent.enemizerWindow.enemizerCLIpathVar.get()
     guiargs.shufflebosses = parent.enemizerWindow.enemizerWidgets["bossshuffle"].storageVar.get()
diff --git a/gui/loadcliargs.py b/gui/loadcliargs.py
index 1abe8361..44444379 100644
--- a/gui/loadcliargs.py
+++ b/gui/loadcliargs.py
@@ -16,7 +16,7 @@ def loadcliargs(gui, args):
         gui.dungeonRandoWindow.dungeonWidgets["smallkeyshuffle"].storageVar.set(args.keyshuffle)
         gui.dungeonRandoWindow.dungeonWidgets["bigkeyshuffle"].storageVar.set(args.bigkeyshuffle)
         gui.pages["randomizer"]["item"].itemWidgets["retro"].storageVar.set(args.retro)
-        gui.entrandoWindow.entrandoWidgets["openpyramid"].storageVar.set(args.openpyramid)
+        gui.pages["randomizer"].pages["entrance"].entrandoWidgets["openpyramid"].storageVar.set(args.openpyramid)
         gui.gameOptionsWindow.gameOptionsWidgets["quickswap"].storageVar.set(int(args.quickswap))
         gui.gameOptionsWindow.gameOptionsWidgets["nobgm"].storageVar.set(int(args.disablemusic))
         if args.multi:
@@ -36,7 +36,7 @@ def loadcliargs(gui, args):
         gui.pages["randomizer"]["item"].itemWidgets["crystals_gt"].storageVar.set(args.crystals_gt)
         gui.pages["randomizer"]["item"].itemWidgets["crystals_ganon"].storageVar.set(args.crystals_ganon)
         gui.pages["randomizer"]["item"].itemWidgets["sortingalgo"].storageVar.set(args.algorithm)
-        gui.entrandoWindow.entrandoWidgets["entranceshuffle"].storageVar.set(args.shuffle)
+        gui.pages["randomizer"].pages["entrance"].entrandoWidgets["entranceshuffle"].storageVar.set(args.shuffle)
         gui.dungeonRandoWindow.dungeonWidgets["dungeondoorshuffle"].storageVar.set(args.door_shuffle)
         gui.dungeonRandoWindow.dungeonWidgets["experimental"].storageVar.set(args.experimental)
         gui.gameOptionsWindow.gameOptionsWidgets["heartcolor"].storageVar.set(args.heartcolor)
@@ -44,7 +44,7 @@ def loadcliargs(gui, args):
         gui.gameOptionsWindow.gameOptionsWidgets["menuspeed"].storageVar.set(args.fastmenu)
         gui.pages["randomizer"]["item"].itemWidgets["logiclevel"].storageVar.set(args.logic)
         gui.generationSetupWindow.romVar.set(args.rom)
-        gui.entrandoWindow.entrandoWidgets["shuffleganon"].storageVar.set(args.shuffleganon)
+        gui.pages["randomizer"].pages["entrance"].entrandoWidgets["shuffleganon"].storageVar.set(args.shuffleganon)
         gui.gameOptionsWindow.gameOptionsWidgets["hints"].storageVar.set(args.hints)
         gui.enemizerWindow.enemizerCLIpathVar.set(args.enemizercli)
         gui.enemizerWindow.enemizerWidgets["potshuffle"].storageVar.set(args.shufflepots)