diff --git a/ALttPRandomizer/Model/SeedSettings.cs b/ALttPRandomizer/Model/SeedSettings.cs
index 026e098..c101a62 100644
--- a/ALttPRandomizer/Model/SeedSettings.cs
+++ b/ALttPRandomizer/Model/SeedSettings.cs
@@ -105,7 +105,7 @@
         public ShowLootMap ShowLootMap { get; set; } = ShowLootMap.Never;
 
         [SettingName("loothud")]
-        [IgnoreSetting(Apr2025, Base)]
+        [IgnoreSetting(Apr2025)]
         public ShowLootHud ShowLootHud { get; set; } = ShowLootHud.Never;
 
         [SettingName("showmap")]
@@ -168,7 +168,7 @@
         public TrapDoorMode TrapDoorMode { get; set; } = TrapDoorMode.Some;
 
         [SettingName("extra_keys")]
-        [IgnoreSetting(Apr2025, Base)]
+        [IgnoreSetting(Apr2025)]
         public ExtraKeysMode ExtraKeys { get; set; } = ExtraKeysMode.None;
 
         [NoSettingName]
@@ -218,9 +218,9 @@
     }
 
     public enum RandomizerInstance {
-        [GeneratorSettings("base", "GK_", "--bps", "--spoiler=json")] Base,
+        [GeneratorSettings("base", "GK_", "--bps", "--spoiler=json", "--patches=colordorm")] Base,
         [GeneratorSettings("beta", "GK_", "--bps", "--spoiler=json", "--patches=colordorm")] Beta,
-        [GeneratorSettings("pikit", "GK_", "--bps", "--spoiler=json")] Pikit,
+        [GeneratorSettings("pikit", "GK_", "--bps", "--spoiler=json", "--patches=colordorm")] Pikit,
         [GeneratorSettings("apr2025", "ER_", requireFlips: true, "--json_spoiler")] Apr2025,
     }
 
diff --git a/BaseRandomizer b/BaseRandomizer
index 7bab5b0..36e57bc 160000
--- a/BaseRandomizer
+++ b/BaseRandomizer
@@ -1 +1 @@
-Subproject commit 7bab5b0434f7d6dcc23b2170d49860f699993c98
+Subproject commit 36e57bcdf4863cd408ebe7a880fefba9c6569ef1
diff --git a/BetaRandomizer b/BetaRandomizer
index dcc4121..b72a045 160000
--- a/BetaRandomizer
+++ b/BetaRandomizer
@@ -1 +1 @@
-Subproject commit dcc4121c43e92ca76717e872ea1ec8f18e18bb37
+Subproject commit b72a04511b21a19e0d87139537c3e00ce16caebd
diff --git a/PikitRandomizer b/PikitRandomizer
index be35ed4..1e10673 160000
--- a/PikitRandomizer
+++ b/PikitRandomizer
@@ -1 +1 @@
-Subproject commit be35ed44515df441c70bddca80bb87ac1a06fd67
+Subproject commit 1e10673e318753cb0c5d68c989724a7e0170c64c