diff --git a/soh/soh/Enhancements/randomizer/3drando/settings.cpp b/soh/soh/Enhancements/randomizer/3drando/settings.cpp
index 1d3572724..7edd7574d 100644
--- a/soh/soh/Enhancements/randomizer/3drando/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/settings.cpp
@@ -2496,6 +2496,17 @@ namespace Settings {
             break;
     }
 
+    AddExcludedOptions();
+    for (auto locationKey : everyPossibleLocation) {
+      auto location = Location(locationKey);
+      if (excludedLocations.count(location->GetRandomizerCheck())) {
+        location->GetExcludedOption()->SetSelectedIndex(1);
+      } else {
+        location->GetExcludedOption()->SetSelectedIndex(0);
+      }
+    }
+    auto blarg = excludeLocationsOptionsVector.size();
+
     OpenForest.SetSelectedIndex(cvarSettings[RSK_FOREST]);
     OpenKakariko.SetSelectedIndex(cvarSettings[RSK_KAK_GATE]);
     ZorasFountain.SetSelectedIndex(cvarSettings[RSK_ZORAS_FOUNTAIN]);
@@ -2581,31 +2592,6 @@ namespace Settings {
 
     // RANDOTODO implement chest shuffle with keysanity
     // ShuffleChestMinigame.SetSelectedIndex(cvarSettings[RSK_SHUFFLE_CHEST_MINIGAME]);
-    
-    AddExcludedOptions();
-    for (size_t i = 1; i < Settings::excludeLocationsOptionsVector.size(); i++) {
-      for (const auto& location : Settings::excludeLocationsOptionsVector[i]) {
-        // RANDOTODO implement the ability to exclude any location
-        if (location->GetName() == "Deku Theater Mask of\n Truth") {
-          location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_DEKU_THEATER_MASK_OF_TRUTH]);
-        }
-        if (location->GetName() == "Kak 10 Gold Skulltula\n Reward") {
-          location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_KAK_10_GOLD_SKULLTULA_REWARD]);
-        }
-        if (location->GetName() == "Kak 20 Gold Skulltula\n Reward") {
-          location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_KAK_20_GOLD_SKULLTULA_REWARD]);
-        }
-        if (location->GetName() == "Kak 30 Gold Skulltula\n Reward") {
-          location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_KAK_30_GOLD_SKULLTULA_REWARD]);
-        }
-        if (location->GetName() == "Kak 40 Gold Skulltula\n Reward") {
-          location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_KAK_40_GOLD_SKULLTULA_REWARD]);
-        }
-        if (location->GetName() == "Kak 50 Gold Skulltula\n Reward") {
-          location->SetSelectedIndex(cvarSettings[RSK_EXCLUDE_KAK_50_GOLD_SKULLTULA_REWARD]);
-        }
-      }
-    }
 
     RandomizeAllSettings(true); //now select any random options instead of just hiding them
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index e7e1467dd..2891bea1e 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -3748,21 +3748,21 @@ void DrawRandoEditor(bool& open) {
 
                 if (ImGui::BeginTable("tableRandoLocations", 2,
                                       ImGuiTableFlags_BordersH | ImGuiTableFlags_BordersV)) {
-                    ImGui::TableSetupColumn("Randomized", ImGuiTableColumnFlags_WidthStretch, 200.0f);
-                    ImGui::TableSetupColumn("Vanilla", ImGuiTableColumnFlags_WidthStretch, 200.0f);
+                    ImGui::TableSetupColumn("Included", ImGuiTableColumnFlags_WidthStretch, 200.0f);
+                    ImGui::TableSetupColumn("Excluded", ImGuiTableColumnFlags_WidthStretch, 200.0f);
                     ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
                     ImGui::TableHeadersRow();
                     ImGui::PopItemFlag();
                     ImGui::TableNextRow();
 
-                    // COLUMN 1 - RANDOMIZED LOCATIONS
+                    // COLUMN 1 - INCLUDED LOCATIONS
                     ImGui::TableNextColumn();
                     window->DC.CurrLineTextBaseOffset = 0.0f;
                     
                     static ImGuiTextFilter locationSearch;
                     locationSearch.Draw();
 
-                    ImGui::BeginChild("ChildRandomizedLocations", ImVec2(0, -8));
+                    ImGui::BeginChild("ChildIncludedLocations", ImVec2(0, -8));
                     for (auto areaIt : RandomizerCheckObjects::GetAllRCObjects()) {
                         bool hasItems = false;
                         for (auto locationIt : areaIt.second) {
@@ -3804,11 +3804,11 @@ void DrawRandoEditor(bool& open) {
                     }
                     ImGui::EndChild();
 
-                    // COLUMN 2 - VANILLA LOCATIONS
+                    // COLUMN 2 - EXCLUDED LOCATIONS
                     ImGui::TableNextColumn();
                     window->DC.CurrLineTextBaseOffset = 0.0f;
 
-                    ImGui::BeginChild("ChildVanillaLocations", ImVec2(0, -8));
+                    ImGui::BeginChild("ChildExcludedLocations", ImVec2(0, -8));
                     for (auto areaIt : RandomizerCheckObjects::GetAllRCObjects()) {
                         bool hasItems = false;
                         for (auto locationIt : areaIt.second) {