diff --git a/.eslintrc.json b/.eslintrc.json
index 545ec52910..8fe9aedcb8 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -189,7 +189,7 @@
     "max-len": [
       "warn",
       {
-        "code": 120
+        "code": 140
       }
     ],
     "max-params": "warn",
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index 65880c8e5c..010fd13732 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -50,6 +50,12 @@ html {
 
 /* css vars */
 
+/* stylelint-disable-next-line max-line-length */
+/* we use <b> tags all over the place in order to indicate boldness, but a change has made this not work. Rather than replace all cases, we can use this shortcut */
+b {
+  font-weight: bold;
+}
+
 #ui {
   display: flex;
   justify-content: center;
@@ -2751,6 +2757,23 @@ br {
   cursor: pointer;
 }
 
+.c-file-import-backup {
+  width: 14.5rem;
+  height: 2.55rem;
+  position: absolute;
+  bottom: 5.5rem;
+  left: 31.3rem;
+  opacity: 0;
+  margin: -1.9rem -2rem;
+}
+
+.c-file-import-backup::before {
+  content: " ";
+  font-size: 100rem;
+  padding: 10rem 20rem;
+  cursor: pointer;
+}
+
 /* #region l-options-grid */
 
 .l-options-grid {
@@ -6545,7 +6568,7 @@ kbd {
 .c-enslaved-run-button__icon__sigil {
   position: absolute;
   top: -3.7rem;
-  right: -0.2rem;
+  right: -0.45rem;
   font-size: 14.8rem;
   transform: rotate(45deg);
 }
@@ -7754,7 +7777,7 @@ kbd {
 }
 
 .o-laitela-run-button--large {
-  width: 44rem;
+  width: 46rem;
 }
 
 .o-laitela-matter-amount {
diff --git a/src/components/DescriptionDisplay.vue b/src/components/DescriptionDisplay.vue
index 3c8da71ffe..78d7adb630 100644
--- a/src/components/DescriptionDisplay.vue
+++ b/src/components/DescriptionDisplay.vue
@@ -26,6 +26,11 @@ export default {
       type: String,
       required: false,
       default: ""
+    },
+    numberPrefixed: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data() {
@@ -56,7 +61,7 @@ export default {
         const description = config?.description;
         // Descriptions in config entries are occasionally used both as standalone statements and mid-sentence,
         // so we explicitly capitalize them here because this only shows up in standalone places
-        const capitalize = str => str.charAt(0).toUpperCase() + str.slice(1);
+        const capitalize = str => (this.numberPrefixed ? str : str.charAt(0).toUpperCase() + str.slice(1));
         this.isVisible = description !== undefined;
         if (!this.isVisible) return;
 
diff --git a/src/components/EffectDisplay.vue b/src/components/EffectDisplay.vue
index 2b9ccae876..e6eadf1403 100644
--- a/src/components/EffectDisplay.vue
+++ b/src/components/EffectDisplay.vue
@@ -32,7 +32,8 @@ export default {
       // Number.MAX_VALUE doesn't really matter here, but we need it because
       // undefined values are not allowed for data properties
       cap: Number.MAX_VALUE,
-      hasCap: false
+      hasCap: false,
+      effect: ""
     };
   },
   computed: {
@@ -46,7 +47,10 @@ export default {
       return `${this.reachedCap && !this.ignoreCapped ? "Capped" : this.label}: `;
     },
     effectDisplay() {
-      return this.formatEffect(this.reachedCap ? this.cap : this.effectValue);
+      if (this.effectValue || this.reachedCap)
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.effect = this.formatEffect(this.reachedCap ? this.cap : this.effectValue);
+      return this.effect;
     }
   },
   watch: {
@@ -60,6 +64,7 @@ export default {
         this.isVisible = effect !== undefined && formatEffect !== undefined;
         if (!this.isVisible) return;
         this.formatEffect = formatEffect;
+        this.effectValue = undefined;
 
         if (isNumber(effect)) {
           this.effectValue = effect;
diff --git a/src/components/GameUiComponentFixed.vue b/src/components/GameUiComponentFixed.vue
index 1dd0a95293..bff4ba5634 100644
--- a/src/components/GameUiComponentFixed.vue
+++ b/src/components/GameUiComponentFixed.vue
@@ -89,7 +89,6 @@ export default {
         v-else-if="view.modal.current"
         :modal="view.modal.current"
       />
-      <ModalProgressBar v-if="view.modal.progressBar" />
       <FadeAway v-if="ending" />
       <CreditsContainer v-if="ending" />
       <NewGame v-if="ending" />
diff --git a/src/components/modals/AwayProgressEntry.vue b/src/components/modals/AwayProgressEntry.vue
index c232c80e44..333f5b2c48 100644
--- a/src/components/modals/AwayProgressEntry.vue
+++ b/src/components/modals/AwayProgressEntry.vue
@@ -161,7 +161,7 @@ export default {
 }
 
 .c-modal-away-progress__realities,
-.c-modal-away-progress__achievement-count,
+.c-modal-away-progress__achievement-amount,
 .c-modal-away-progress__reality-machines,
 .c-modal-away-progress__imaginary-machines {
   color: var(--color-reality);
diff --git a/src/components/modals/GlyphShowcasePanelEntry.vue b/src/components/modals/GlyphShowcasePanelEntry.vue
index 0a9489084a..6d857583ed 100644
--- a/src/components/modals/GlyphShowcasePanelEntry.vue
+++ b/src/components/modals/GlyphShowcasePanelEntry.vue
@@ -80,10 +80,10 @@ export default {
       };
     },
     rarityStyle() {
-      // Rarity is handled differently here than usual because this is in contrast with the theme BG, not the glyph BG
+      // Glyph colors were dealt to contrast the background, but that should never be an issue
       const color = CosmeticGlyphTypes[this.glyph.type].ignoreRarityColor
         ? GlyphAppearanceHandler.getBorderColor(this.type)
-        : getRarity(this.glyph.strength)[Theme.current().isDark() ? "darkColor" : "lightColor"];
+        : GlyphAppearanceHandler.getRarityColor(this.glyph.strength, this.type);
       return {
         color,
         "font-weight": "bold"
diff --git a/src/components/modals/challenges/EternityChallengeStartModal.vue b/src/components/modals/challenges/EternityChallengeStartModal.vue
index 7ccafe89bf..8f2986c9c3 100644
--- a/src/components/modals/challenges/EternityChallengeStartModal.vue
+++ b/src/components/modals/challenges/EternityChallengeStartModal.vue
@@ -42,6 +42,11 @@ export default {
       if (typeof conditionOfChallenge === "function") {
         conditionOfChallenge = conditionOfChallenge();
       }
+      if (this.challenge._config.scrambleText) {
+        conditionOfChallenge = conditionOfChallenge
+          .replace("*", this.challenge._config.scrambleText[1]);
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+      }
       return `Inside this Eternity Challenge, ${conditionOfChallenge}`;
     }
   },
diff --git a/src/components/modals/options/BackupWindowModal.vue b/src/components/modals/options/BackupWindowModal.vue
index b0dfa34d68..deab6fbb49 100644
--- a/src/components/modals/options/BackupWindowModal.vue
+++ b/src/components/modals/options/BackupWindowModal.vue
@@ -101,7 +101,7 @@ export default {
         </PrimaryButton>
         <PrimaryButton class="o-btn-file-ops">
           <input
-            class="c-file-import"
+            class="c-file-import-backup"
             type="file"
             accept=".txt"
             @change="importAsFile"
diff --git a/src/components/modals/prestige/BigCrunchModal.vue b/src/components/modals/prestige/BigCrunchModal.vue
index cf20ef3138..f2126f23f5 100644
--- a/src/components/modals/prestige/BigCrunchModal.vue
+++ b/src/components/modals/prestige/BigCrunchModal.vue
@@ -17,7 +17,7 @@ export default {
   },
   computed: {
     isFirstInfinity() {
-      return !PlayerProgress.infinityUnlocked();
+      return !PlayerProgress.infinityUnlocked() && player.records.fullGameCompletions === 0;
     },
     message() {
       const info = this.isFirstInfinity ? this.firstInfinityInfo : ``;
diff --git a/src/components/modals/prestige/ReplicantiGalaxyModal.vue b/src/components/modals/prestige/ReplicantiGalaxyModal.vue
index 5e34799080..97d49345be 100644
--- a/src/components/modals/prestige/ReplicantiGalaxyModal.vue
+++ b/src/components/modals/prestige/ReplicantiGalaxyModal.vue
@@ -31,7 +31,7 @@ export default {
   methods: {
     update() {
       this.replicanti.copyFrom(player.replicanti.amount);
-      this.divideReplicanti = Achievement(126).isUnlocked;
+      this.divideReplicanti = Achievement(126).canBeApplied;
       this.canBeBought = Replicanti.galaxies.gain;
       if (this.replicanti.lt(Number.MAX_VALUE)) this.emitClose();
     },
diff --git a/src/components/modals/time-study-modal-preview/PseudoTimeStudyButton.vue b/src/components/modals/time-study-modal-preview/PseudoTimeStudyButton.vue
index 44b2f1f9b5..14d94b611c 100644
--- a/src/components/modals/time-study-modal-preview/PseudoTimeStudyButton.vue
+++ b/src/components/modals/time-study-modal-preview/PseudoTimeStudyButton.vue
@@ -86,7 +86,8 @@ export default {
   methods: {
     update() {
       const study = this.study;
-      this.isUseless = Pelle.uselessTimeStudies.includes(this.study.id) && Pelle.isDoomed;
+      const isCurrentlyUseless = this.study.id === 192 && Pelle.isDoomed && PelleRifts.vacuum.milestones[1];
+      this.isUseless = Pelle.isDoomed && (isCurrentlyUseless || Pelle.uselessTimeStudies.includes(this.study.id));
       this.isBought = ForceBoughtState.getState(this.forceIsBought, study.isBought);
       this.doomedRealityStudy = study.type === TIME_STUDY_TYPE.DILATION && study.id === 6 && Pelle.isDoomed;
     },
@@ -133,7 +134,7 @@ export default {
   position: absolute;
   top: 0;
   left: 0;
-  background: rgba(255, 214, 11, 0.8);
+  background: rgb(255, 214, 11, 0.8);
   border-radius: var(--var-border-radius, inherit);
   animation: a-new-import 3s infinite;
 }
diff --git a/src/components/tabs/antimatter-dimensions/AntimatterDimensionProgressBar.vue b/src/components/tabs/antimatter-dimensions/AntimatterDimensionProgressBar.vue
index 5993219f88..50754cd32b 100644
--- a/src/components/tabs/antimatter-dimensions/AntimatterDimensionProgressBar.vue
+++ b/src/components/tabs/antimatter-dimensions/AntimatterDimensionProgressBar.vue
@@ -34,8 +34,8 @@ export default {
       // than normal and therefore default filling won't be meaningful. Since challenges get completed or abandoned from
       // the inside outwards, we show the goals in that priority as well. It only makes sense to check cel6 and not the
       // others because pre-cel3 completion it'll default to e4000 and cel4/5 don't have meaningful single goals
-      const inSpecialRun = Player.isInAntimatterChallenge || EternityChallenge.isRunning || player.dilation.active ||
-        Laitela.isRunning;
+      const inSpecialRun = Player.isInAntimatterChallenge || EternityChallenge.isRunning ||
+      (player.dilation.active && !Pelle.isDoomed) || Laitela.isRunning;
       if (inSpecialRun) {
         if (Player.isInAntimatterChallenge) {
           setProgress(Currency.antimatter.value, Player.antimatterChallenge.goal, "Percentage to Challenge goal");
diff --git a/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue b/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue
index e0d72c6bad..e12ce70e0f 100644
--- a/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue
+++ b/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue
@@ -39,8 +39,10 @@ export default {
     buttonText() {
       if (this.lockText !== null) return this.lockText;
       const reset = [];
-      if (!Achievement(111).isUnlocked) reset.push("Dimensions");
-      if (!Achievement(143).isUnlocked) reset.push("Dimension Boosts");
+      // eslint-disable-next-line max-len
+      if (!Achievement(111).isEffectActive && !PelleUpgrade.dimBoostResetsNothing.canBeApplied) reset.push("Dimensions");
+      // eslint-disable-next-line max-len
+      if (!Achievement(143).isEffectActive && !PelleUpgrade.galaxyNoResetDimboost.canBeApplied) reset.push("Dimension Boosts");
       return reset.length === 0
         ? `Increase the power of Tickspeed upgrades`
         : `Reset your ${makeEnumeration(reset)} to increase the power of Tickspeed upgrades`;
diff --git a/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue b/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue
index a39f8d89ee..4452d7dd61 100644
--- a/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue
+++ b/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue
@@ -86,11 +86,13 @@ export default {
 
       this.multiplierText = `Buy 10 Dimension purchase multiplier: ${formatX(this.buy10Mult, 2, 2)}`;
       if (!isSacrificeUnlocked) return;
-      this.isFullyAutomated = Autobuyer.sacrifice.isActive && Achievement(118).isUnlocked;
-      this.isSacrificeAffordable = Sacrifice.canSacrifice && !this.isFullyAutomated;
+      this.isFullyAutomated = Autobuyer.sacrifice.isActive && Achievement(118).isEffectActive &&
+      Sacrifice.meetsNonBoostConditions;
+      this.isSacrificeAffordable = this.isFullyAutomated || Sacrifice.canSacrifice;
       this.currentSacrifice.copyFrom(Sacrifice.totalBoost);
       this.sacrificeBoost.copyFrom(Sacrifice.nextBoost);
-      this.disabledCondition = Sacrifice.disabledCondition;
+      this.disabledCondition = this.isFullyAutomated ? Sacrifice.nonBoostDisabledCondition
+        : Sacrifice.disabledCondition;
       const sacText = this.isSacrificeUnlocked
         ? ` | Dimensional Sacrifice multiplier: ${formatX(this.currentSacrifice, 2, 2)}`
         : "";
@@ -116,10 +118,10 @@ export default {
         class="o-primary-btn--sacrifice"
         @click="sacrifice"
       >
-        <span v-if="isSacrificeAffordable">Dimensional Sacrifice ({{ formatX(sacrificeBoost, 2, 2) }})</span>
-        <span v-else-if="isFullyAutomated && disabledCondition !== ''">
+        <span v-if="isFullyAutomated">
           Dimensional Sacrifice is Automated (Achievement 118)
         </span>
+        <span v-else-if="isSacrificeAffordable">Dimensional Sacrifice ({{ formatX(sacrificeBoost, 2, 2) }})</span>
         <span v-else>Dimensional Sacrifice Disabled ({{ disabledCondition }})</span>
       </PrimaryButton>
       <button
diff --git a/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue b/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue
index 8c53294b03..0ed85eadb2 100644
--- a/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue
+++ b/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue
@@ -34,8 +34,10 @@ export default {
     buttonText() {
       if (this.lockText !== null) return this.lockText;
       const reset = [];
-      if (!Achievement(111).isUnlocked) reset.push("Dimensions");
-      if (!Achievement(143).isUnlocked) reset.push("Dimension Boosts");
+      // eslint-disable-next-line max-len
+      if (!Achievement(111).isEffectActive && !PelleUpgrade.dimBoostResetsNothing.canBeApplied) reset.push("Dimensions");
+      // eslint-disable-next-line max-len
+      if (!Achievement(143).isEffectActive && !PelleUpgrade.galaxyNoResetDimboost.canBeApplied) reset.push("Dimension Boosts");
       return reset.length === 0
         ? `Increase the power of Tickspeed upgrades`
         : `Reset your ${makeEnumeration(reset)} to increase the power of Tickspeed upgrades`;
diff --git a/src/components/tabs/celestial-pelle/PelleUpgrade.vue b/src/components/tabs/celestial-pelle/PelleUpgrade.vue
index 3491f7def7..7f462834cc 100644
--- a/src/components/tabs/celestial-pelle/PelleUpgrade.vue
+++ b/src/components/tabs/celestial-pelle/PelleUpgrade.vue
@@ -96,7 +96,7 @@ export default {
       this.galaxyCap = GalaxyGenerator.generationCap;
       const genDB = GameDatabase.celestials.pelle.galaxyGeneratorUpgrades;
       this.notAffordable = (this.config === genDB.additive || this.config === genDB.multiplicative) &&
-        (Decimal.gt(this.upgrade.cost, this.galaxyCap - GalaxyGenerator.generatedGalaxies + player.galaxies));
+        (Decimal.gt(this.upgrade.cost, this.galaxyCap - GalaxyGenerator.spentGalaxies + player.galaxies));
     },
     secondsUntilCost(rate) {
       const value = this.galaxyGenerator ? player.galaxies + GalaxyGenerator.galaxies : Currency.realityShards.value;
diff --git a/src/components/tabs/imaginary-upgrades/ImaginaryUpgradeButton.vue b/src/components/tabs/imaginary-upgrades/ImaginaryUpgradeButton.vue
index 6687dbf211..a53ec8b95d 100644
--- a/src/components/tabs/imaginary-upgrades/ImaginaryUpgradeButton.vue
+++ b/src/components/tabs/imaginary-upgrades/ImaginaryUpgradeButton.vue
@@ -38,6 +38,9 @@ export default {
     config() {
       return this.upgrade.config;
     },
+    prefixedWithNumber() {
+      return Boolean(this.config.prefixedNumber);
+    },
     classObject() {
       return {
         "c-reality-upgrade-btn--useless": this.upgrade.pelleDisabled,
@@ -113,6 +116,7 @@ export default {
           <br>
           <DescriptionDisplay
             :config="requirementConfig"
+            :number-prefixed="prefixedWithNumber"
             label="Requirement:"
             class="c-reality-upgrade-btn__requirement"
           />
diff --git a/src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue b/src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue
index 51bbefdb78..73217df061 100644
--- a/src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue
+++ b/src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue
@@ -169,7 +169,7 @@ export default {
       return `${format(run[2], 2)} ${this.points}`;
     },
     prestigeCountGain(run) {
-      return quantify(this.singular, run[3]);
+      return quantify(this.singular, run[3], 2, 1);
     },
     prestigeCurrencyRate(run) {
       if (this.hasIM && this.layer.name === "Reality") return "N/A";
@@ -294,12 +294,12 @@ export default {
   display: block;
   border: 0.05rem solid #999999;
   color: var(--color-text);
-  width: 100%;
+  width: 100.2%;
   padding: 0.2rem 0;
-  margin: -0.1rem;
+  margin: -0.05rem;
 }
 
 .l-no-records {
   height: 5.4rem;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/tabs/reality-upgrades/RealityUpgradeButton.vue b/src/components/tabs/reality-upgrades/RealityUpgradeButton.vue
index 03531d541c..52bca42929 100644
--- a/src/components/tabs/reality-upgrades/RealityUpgradeButton.vue
+++ b/src/components/tabs/reality-upgrades/RealityUpgradeButton.vue
@@ -38,6 +38,9 @@ export default {
     config() {
       return this.upgrade.config;
     },
+    prefixedWithNumber() {
+      return Boolean(this.config.prefixedNumber);
+    },
     classObject() {
       return {
         "c-reality-upgrade-btn--useless": this.isUseless,
@@ -106,6 +109,7 @@ export default {
           <br>
           <DescriptionDisplay
             :config="requirementConfig"
+            :number-prefixed="prefixedWithNumber"
             label="Requirement:"
             class="c-reality-upgrade-btn__requirement"
           />
diff --git a/src/components/tabs/replicanti/ReplicantiTab.vue b/src/components/tabs/replicanti/ReplicantiTab.vue
index ae66cb3f74..618865761a 100644
--- a/src/components/tabs/replicanti/ReplicantiTab.vue
+++ b/src/components/tabs/replicanti/ReplicantiTab.vue
@@ -150,7 +150,7 @@ export default {
       this.hasIPMult = AlchemyResource.exponential.amount > 0 && !this.isDoomed;
       this.multIP = Replicanti.amount.powEffectOf(AlchemyResource.exponential);
       this.isUncapped = PelleRifts.vacuum.milestones[1].canBeApplied;
-      this.hasRaisedCap = EffarigUnlock.infinity.isUnlocked && !this.isUncapped;
+      this.hasRaisedCap = EffarigUnlock.infinity.isUnlocked && !this.isDoomed;
       this.replicantiCap.copyFrom(replicantiCap());
       if (this.hasRaisedCap) {
         const mult = this.replicantiCap.div(Decimal.NUMBER_MAX_VALUE);
@@ -201,7 +201,7 @@ export default {
     </PrimaryButton>
     <template v-else>
       <div
-        v-if="isDoomed"
+        v-if="isUncapped"
         class="modified-cap"
       >
         Your Replicanti cap has been removed due to the second {{ scrambledText }} milestone.
diff --git a/src/components/ui-modes/modern/ModernSidebarCurrency.vue b/src/components/ui-modes/modern/ModernSidebarCurrency.vue
index adc44a1a9a..e93f9b590e 100644
--- a/src/components/ui-modes/modern/ModernSidebarCurrency.vue
+++ b/src/components/ui-modes/modern/ModernSidebarCurrency.vue
@@ -5,7 +5,9 @@ export default {
     return {
       sidebarID: 0,
       resourceName: "",
-      resourceValue: new Decimal(0)
+      resourceValue: new Decimal(0),
+      fullGameCompletions: 0,
+      hasInit: false
     };
   },
   computed: {
@@ -26,6 +28,14 @@ export default {
   },
   methods: {
     update() {
+      if (!this.hasInit) {
+        this.fullGameCompletions = player.records.fullGameCompletions;
+        this.hasInit = true;
+      }
+      if (this.fullGameCompletions !== player.records.fullGameCompletions) {
+        player.options.sidebarResourceID = 2;
+        this.fullGameCompletions = player.records.fullGameCompletions;
+      }
       this.sidebarID = player.options.sidebarResourceID;
       this.resourceName = this.resource.resourceName ?? this.resource.optionName;
       this.resourceValue.copyFrom(this.resource.value());
diff --git a/src/core/automator/automator-backend.js b/src/core/automator/automator-backend.js
index 2004c5201e..be0d3242f4 100644
--- a/src/core/automator/automator-backend.js
+++ b/src/core/automator/automator-backend.js
@@ -799,6 +799,7 @@ export const AutomatorBackend = {
     // program flow to do something else other than simply advancing to the next line
     switch (this.runCurrentCommand()) {
       case AUTOMATOR_COMMAND_STATUS.NEXT_TICK_SAME_INSTRUCTION:
+      case AUTOMATOR_COMMAND_STATUS.SAME_INSTRUCTION:
         break;
       case AUTOMATOR_COMMAND_STATUS.HALT:
         this.stop();
@@ -964,6 +965,7 @@ export const AutomatorBackend = {
     this.state.mode = AUTOMATOR_MODE.PAUSE;
   },
 
+  // eslint-disable-next-line no-shadow
   start(scriptID = this.state.topLevelScript, initialMode = AUTOMATOR_MODE.RUN, compile = true) {
     // Automator execution behaves oddly across new games, so we explicitly stop it from running if not unlocked
     if (!Player.automatorUnlocked) return;
@@ -1030,6 +1032,9 @@ export const AutomatorBackend = {
       this._data = [];
       player.reality.automator.state.stack.length = 0;
     },
+    forEach(fn) {
+      this._data.forEach(fn);
+    },
     initializeFromSave(commands) {
       this._data = [];
       const playerStack = player.reality.automator.state.stack;
diff --git a/src/core/automator/automator-commands.js b/src/core/automator/automator-commands.js
index 0dfade642a..2c25491d9c 100644
--- a/src/core/automator/automator-commands.js
+++ b/src/core/automator/automator-commands.js
@@ -9,10 +9,14 @@ const idSplitter = /id[ \t]+(\d)/ui;
 
 function prestigeNotify(flag) {
   if (!AutomatorBackend.isOn) return;
-  const state = AutomatorBackend.stack.top.commandState;
-  if (state && state.prestigeLevel !== undefined) {
-    state.prestigeLevel = Math.max(state.prestigeLevel, flag);
-  }
+
+  // Any frame in the stack may be waiting for a prestige event, so update all of them.
+  AutomatorBackend.stack.forEach(frame => {
+    const state = frame.commandState;
+    if (state && state.prestigeLevel !== undefined) {
+      state.prestigeLevel = Math.max(state.prestigeLevel, flag);
+    }
+  });
 }
 
 EventHub.logic.on(GAME_EVENT.BIG_CRUNCH_AFTER, () => prestigeNotify(T.Infinity.$prestigeLevel));
@@ -459,15 +463,15 @@ export const AutomatorCommands = [
       const prestigeToken = ctx.PrestigeEvent[0].tokenType;
       return () => {
         const available = prestigeToken.$prestigeAvailable();
+        const prestigeName = ctx.PrestigeEvent[0].image.toUpperCase();
         if (!available) {
           if (!nowait) return AUTOMATOR_COMMAND_STATUS.NEXT_TICK_SAME_INSTRUCTION;
-          AutomatorData.logCommandEvent(`${ctx.PrestigeEvent.image} attempted, but skipped due to NOWAIT`,
+          AutomatorData.logCommandEvent(`${prestigeName} attempted, but skipped due to NOWAIT`,
             ctx.startLine);
           return AUTOMATOR_COMMAND_STATUS.NEXT_INSTRUCTION;
         }
         if (respec) prestigeToken.$respec();
         prestigeToken.$prestige();
-        const prestigeName = ctx.PrestigeEvent[0].image.toUpperCase();
         AutomatorData.logCommandEvent(`${prestigeName} triggered (${findLastPrestigeRecord(prestigeName)})`,
           ctx.startLine);
         // In the prestigeToken.$prestige() line above, performing a reality reset has code internal to the call
diff --git a/src/core/celestials/celestials.js b/src/core/celestials/celestials.js
index 4378b994f2..abf6b60948 100644
--- a/src/core/celestials/celestials.js
+++ b/src/core/celestials/celestials.js
@@ -46,7 +46,8 @@ GameDatabase.celestials.descriptions = [
       Tachyon Particle production and Dilated Time production are severely reduced.
       Time Theorem generation from Dilation Glyphs is disabled.
       Certain challenge goals are increased.
-      Stored game time is discharged at a reduced effectiveness (exponent^${format(0.55, 2, 2)}).`;
+      Stored game time is discharged at a reduced effectiveness (exponent^${format(0.55, 2, 2)}).
+      Dimensional Sacrifice is disabled.`;
     }
   },
   {
diff --git a/src/core/celestials/pelle/pelle.js b/src/core/celestials/pelle/pelle.js
index 36e4d2216c..7ee250a2f4 100644
--- a/src/core/celestials/pelle/pelle.js
+++ b/src/core/celestials/pelle/pelle.js
@@ -191,7 +191,7 @@ export const Pelle = {
   },
 
   get uselessTimeStudies() {
-    return [32, 33, 41, 51, 61, 62, 121, 122, 123, 141, 142, 143, 192, 213];
+    return [32, 33, 41, 51, 61, 62, 121, 122, 123, 141, 142, 143, 213];
   },
 
   get disabledRUPGs() {
@@ -200,7 +200,7 @@ export const Pelle = {
 
   get uselessPerks() {
     return [10, 12, 13, 14, 15, 16, 17, 30, 40, 41, 42, 43, 44, 45, 46, 51, 52,
-      53, 60, 61, 62, 80, 81, 82, 83, 100, 103, 104, 105, 106, 201, 202, 203, 204];
+      53, 60, 61, 62, 80, 81, 82, 83, 100, 103, 104, 105, 106, 107, 201, 202, 203, 204];
   },
 
   get specialGlyphEffect() {
@@ -217,7 +217,7 @@ export const Pelle = {
         ? Currency.eternityPoints.value.plus(1).pow(0.3)
         : DC.D1,
       replication: isActive("replication")
-        ? 10 ** 53 ** (PelleRifts.vacuum.percentage)
+        ? Math.min(1e308, 10 ** 53 ** (PelleRifts.vacuum.percentage))
         : 1,
       dilation: isActive("dilation")
         ? Decimal.pow(player.dilation.totalTachyonGalaxies, 1.5).max(1)
@@ -241,7 +241,7 @@ export const Pelle = {
         return `Eternity Point gain ${formatX(Currency.eternityPoints.value.plus(1).pow(0.3), 2)}
           (based on current EP)`;
       case "replication":
-        return `Replication speed ${formatX(10 ** 53 ** (PelleRifts.vacuum.percentage), 2)} \
+        return `Replication speed ${formatX(Math.min(1e308, 10 ** 53 ** (PelleRifts.vacuum.percentage)), 2)} \
         (based on ${wordShift.wordCycle(PelleRifts.vacuum.name)})`;
       case "dilation":
         return `Dilated Time gain ${formatX(Decimal.pow(player.dilation.totalTachyonGalaxies, 1.5).max(1), 2)}
diff --git a/src/core/celestials/ra/ra.js b/src/core/celestials/ra/ra.js
index 5d84bc4edb..46050b3a20 100644
--- a/src/core/celestials/ra/ra.js
+++ b/src/core/celestials/ra/ra.js
@@ -418,6 +418,7 @@ export const GlyphAlteration = {
     return this.isUnlocked && this.getSacrificePower(type) >= this.boostingThreshold;
   },
   sacrificeBoost(type) {
+    if (!GlyphAlteration.isBoosted(type)) return 0;
     const capped = Math.clampMax(this.getSacrificePower(type), GlyphSacrificeHandler.maxSacrificeForEffects);
     return Math.log10(Math.clampMin(capped / this.boostingThreshold, 1)) / 2;
   },
diff --git a/src/core/devtools.js b/src/core/devtools.js
index 0ee652f5ab..b9729cb33b 100644
--- a/src/core/devtools.js
+++ b/src/core/devtools.js
@@ -1,5 +1,7 @@
 import { sha512_256 } from "js-sha512";
 
+import { deepmergeAll } from "../utility/deepmerge";
+
 import { DC } from "./constants";
 import FullScreenAnimationHandler from "./full-screen-animation-handler";
 
@@ -17,37 +19,6 @@ dev.giveAllAchievements = function() {
   for (const achievement of allAchievements) achievement.unlock();
 };
 
-// Know that both dev.doubleEverything and dev.tripleEverything are both broken
-// with this error https://i.imgur.com/ZMEBNTv.png
-
-dev.doubleEverything = function() {
-  Object.keys(player).forEach(key => {
-    if (typeof player[key] === "number") player[key] *= 2;
-    if (typeof player[key] === "object" && player[key].constructor !== Object) player[key] = player[key].times(2);
-    if (typeof player[key] === "object" && !isFinite(player[key])) {
-      Object.keys(player[key]).forEach(key2 => {
-        if (typeof player[key][key2] === "number") player[key][key2] *= 2;
-        if (typeof player[key][key2] === "object" && player[key][key2].constructor !== Object)
-          player[key][key2] = player[key][key2].times(2);
-      });
-    }
-  });
-};
-
-dev.tripleEverything = function() {
-  Object.keys(player).forEach(key => {
-    if (typeof player[key] === "number") player[key] *= 3;
-    if (typeof player[key] === "object" && player[key].constructor !== Object) player[key] = player[key].times(3);
-    if (typeof player[key] === "object" && !isFinite(player[key])) {
-      Object.keys(player[key]).forEach(key3 => {
-        if (typeof player[key][key3] === "number") player[key][key3] *= 3;
-        if (typeof player[key][key3] === "object" && player[key][key3].constructor !== Object)
-          player[key][key3] = player[key][key3].times(3);
-      });
-    }
-  });
-};
-
 dev.barrelRoll = function() {
   FullScreenAnimationHandler.display("a-barrel-roll", 5);
 };
@@ -67,18 +38,52 @@ dev.cancerize = function() {
   Notation.emoji.setAsCurrent();
 };
 
-dev.fixSave = function() {
-  const save = JSON.stringify(player, GameSaveSerializer.jsonConverter);
-  const fixed = save.replace(/NaN/gui, "10");
-  const saveData = JSON.parse(fixed);
-  if (!saveData || GameStorage.checkPlayerObject(saveData) !== "") {
-    Modal.message.show("Could not fix the save.");
-    return;
+// Iterates through every item in A and B
+// If A has a broken value in anyway, it will set it to the value in B
+// This could fail if saves are irrepairably damaged, but still worth trying.
+// eslint-disable-next-line complexity
+function fixSaveIterator(value, value2) {
+  for (const item in value) {
+    if (value[item] instanceof Decimal && value2[item] !== undefined) {
+      if (value2[item].neq(0)) {
+        // Under some cases, this could reset legitimate values, but this is a very rare (and safe) edge-case
+        if (value[item].lt(0) || value[item].exponent > 8e15)
+          value[item] = value2[item];
+      } else if (value[item].exponent > 8e15)
+        value[item] = value2[item];
+    }
+    if (value[item] instanceof Number && value2[item] !== undefined) {
+      if (value2[item] === 0) {
+        if (value[item] > 1e300) {
+          value[item] = value2[item];
+        }
+      } else if (value[item] > 1e300 || value[item] < 0)
+        value[item] = value2[item];
+    }
+    if ((value[item] instanceof Object || value[item] instanceof Array) &&
+      !(value[item] instanceof Decimal) && value2[item] !== undefined)
+      value[item] = fixSaveIterator(value[item], value2[item]);
+    if (value[item] === undefined && value2[item] !== undefined)
+      value[item] = value2[item];
+    // If neither the save nor the default player object can figure out what this prop is,
+    // we probably dont need to keep it
+    if (value[item] === undefined && value2[item] === undefined)
+      delete value[item];
   }
-  GameStorage.loadPlayerObject(saveData);
+  return value;
+}
+
+// This attempts to forcibly fix all player values, and override the existing save
+// This isn't the best persay, but frankly its worth having, because saves do inevitably break.
+dev.fixSave = function(save) {
+  player = deepmergeAll([Player.defaultStart, save ?? player]);
+  player = fixSaveIterator(player, Player.defaultStart);
   GameStorage.save();
 };
 
+// If true, it will attempt to run dev.fixSave on importing a broken save
+dev.attemptFixImports = false;
+
 dev.updateTDCosts = function() {
   for (let tier = 1; tier < 9; tier++) {
     const dim = TimeDimension(tier);
diff --git a/src/core/perks.js b/src/core/perks.js
index d1e5ac491a..b611fd2501 100644
--- a/src/core/perks.js
+++ b/src/core/perks.js
@@ -58,6 +58,14 @@ class PerkState extends SetPurchasableMechanicState {
     GameCache.buyablePerks.invalidate();
     EventHub.dispatch(GAME_EVENT.PERK_BOUGHT);
   }
+
+  purchase() {
+    if (this.label === "ACHNR" && RealityUpgrade(8).isLockingMechanics) {
+      RealityUpgrade(8).tryShowWarningModal();
+      return;
+    }
+    super.purchase();
+  }
 }
 
 export const Perk = mapGameDataToObject(
diff --git a/src/core/reality.js b/src/core/reality.js
index 19efc3ad5b..ca1e412fbe 100644
--- a/src/core/reality.js
+++ b/src/core/reality.js
@@ -163,6 +163,13 @@ export function startManualReality(sacrifice, glyphID) {
 export function processManualReality(sacrifice, glyphID) {
   if (!isRealityAvailable()) return;
 
+  // Get this now so we can access it
+  const realityProps = getRealityProps(false, true);
+  if (RealityUpgrade(24).isLockingMechanics && realityProps.gainedRM.lt(5000)) {
+    RealityUpgrade(24).tryShowWarningModal();
+    return;
+  }
+
   if (player.realities === 0) {
     // If this is our first Reality, lock in the initial seed and then give the companion and starting glyphs
     player.reality.seed = player.reality.initialSeed;
diff --git a/src/core/sacrifice.js b/src/core/sacrifice.js
index bbacd58298..0d07731a11 100644
--- a/src/core/sacrifice.js
+++ b/src/core/sacrifice.js
@@ -19,6 +19,23 @@ export class Sacrifice {
     if (DimBoost.purchasedBoosts < 5) return `Requires ${formatInt(5)} Dimension Boosts`;
     if (AntimatterDimension(8).totalAmount.eq(0)) return "No 8th Antimatter Dimensions";
     if (this.nextBoost.lte(1)) return `${formatX(1)} multiplier`;
+    if (Enslaved.isRunning) return "This Reality does not allow Sacrifices";
+    if (Player.isInAntimatterChallenge) return "Challenge goal reached";
+    return "Need to Crunch";
+  }
+
+  static get meetsNonBoostConditions() {
+    return DimBoost.purchasedBoosts > 4 && !EternityChallenge(3).isRunning &&
+      AntimatterDimension(8).totalAmount.gt(0) && Currency.antimatter.lt(Player.infinityLimit) &&
+      !Enslaved.isRunning;
+  }
+
+  static get nonBoostDisabledCondition() {
+    if (NormalChallenge(10).isRunning) return "8th Dimensions are disabled";
+    if (EternityChallenge(3).isRunning) return "Eternity Challenge 3";
+    if (DimBoost.purchasedBoosts < 5) return `Requires ${formatInt(5)} Dimension Boosts`;
+    if (AntimatterDimension(8).totalAmount.eq(0)) return "No 8th Antimatter Dimensions";
+    if (Enslaved.isRunning) return "This Reality does not allow Sacrifices";
     if (Player.isInAntimatterChallenge) return "Challenge goal reached";
     return "Need to Crunch";
   }
diff --git a/src/core/secret-formula/achievements/normal-achievements.js b/src/core/secret-formula/achievements/normal-achievements.js
index 6e7b033ad2..887c05b39b 100644
--- a/src/core/secret-formula/achievements/normal-achievements.js
+++ b/src/core/secret-formula/achievements/normal-achievements.js
@@ -808,7 +808,7 @@ export const normalAchievements = [
   {
     id: 116,
     name: "Do I really need to infinity",
-    get description() { return `Eternity with only ${formatInt(1)} Infinity.`; },
+    get description() { return `Eternity with no more than ${formatInt(1)} Infinity.`; },
     checkRequirement: () => Currency.infinities.lte(1),
     checkEvent: GAME_EVENT.ETERNITY_RESET_BEFORE,
     reward: "Multiplier to Infinity Points based on Infinities.",
@@ -1059,7 +1059,7 @@ export const normalAchievements = [
       return true;
     },
     checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
-    reward: "Galaxies no longer reset Dimension Boosts."
+    reward: "Antimatter Galaxies no longer reset Dimension Boosts."
   },
   {
     id: 144,
@@ -1339,7 +1339,7 @@ export const normalAchievements = [
     checkEvent: GAME_EVENT.INFINITY_CHALLENGE_COMPLETED,
     // Weirdly specific reward? Yes, its V's ST bonus because we forgot to disable it
     // when balancing Pelle and only realised too late.
-    get reward() { return `All Antimatter Dimensions are raised to ${formatPow(1.0812403840463596, 0, 3)}`; },
+    get reward() { return `All Antimatter Dimensions are raised to ${formatPow(1.0812403840463596, 0, 3)}.`; },
     effect: 1.0812403840463596
   },
   {
@@ -1365,7 +1365,7 @@ export const normalAchievements = [
   {
     id: 187,
     name: "The One with Dilated Time",
-    description: "Unlock Dilation while Doomed.",
+    description: "Dilate Time while Doomed.",
     checkRequirement: () => PelleStrikes.dilation.hasStrike,
     checkEvent: GAME_EVENT.PELLE_STRIKE_UNLOCKED,
     // We forgot to disable a singularity milestone while balancing Pelle; now it's disabled
diff --git a/src/core/secret-formula/catchup-resources.js b/src/core/secret-formula/catchup-resources.js
index 7a21becc84..e500a0fadf 100644
--- a/src/core/secret-formula/catchup-resources.js
+++ b/src/core/secret-formula/catchup-resources.js
@@ -235,7 +235,7 @@ export const catchupResources = [
   {
     name: "Tesseracts",
     id: 30,
-    requiredStage: PROGRESS_STAGE.ENSLAVED,
+    requiredStage: PROGRESS_STAGE.V,
     description: `Infinity Dimensions cannot be purchased indefinitely and all but the 8th have a hard limit for how
       many times they can be purchased. Each Tesseract permanently increases this limit by a large amount.`
   },
diff --git a/src/core/secret-formula/celestials/effarig.js b/src/core/secret-formula/celestials/effarig.js
index e837b4f187..aaf35b01f0 100644
--- a/src/core/secret-formula/celestials/effarig.js
+++ b/src/core/secret-formula/celestials/effarig.js
@@ -51,7 +51,7 @@ export const effarigUnlocks = {
     id: 5,
     label: "Eternity",
     get description() {
-      return ` Eternities generates Infinities
+      return ` Eternities generate Infinities
         Infinity Points are no longer limited in any way in Effarig's Reality
         You have unlocked The Nameless Ones`;
     },
diff --git a/src/core/secret-formula/celestials/navigation.js b/src/core/secret-formula/celestials/navigation.js
index 56f9377fd4..fc76982435 100644
--- a/src/core/secret-formula/celestials/navigation.js
+++ b/src/core/secret-formula/celestials/navigation.js
@@ -1528,7 +1528,7 @@ export const celestialNavigation = {
 
           if (player.celestials.laitela.fastestCompletion > 30 && Laitela.difficultyTier < 0) return [
             dmdText,
-            `Beat Lai'tela's Reality in less that ${format(30)} seconds`
+            `Beat Lai'tela's Reality in less than ${format(30)} seconds`
           ];
           return [
             dmdText,
@@ -1826,7 +1826,8 @@ export const celestialNavigation = {
           if (complete === 1) {
             return [
               "Unlock Pelle",
-              "The Celestial of Antimatter"
+              "The Celestial of Antimatter",
+              "Lai'tela's Reality has been destroyed"
             ];
           }
           let laitelaString = `${format(Currency.eternityPoints.value)} / ${format("1e4000")} EP`;
diff --git a/src/core/secret-formula/celestials/pelle-upgrades.js b/src/core/secret-formula/celestials/pelle-upgrades.js
index 80fd7dfcb3..5b3efb8095 100644
--- a/src/core/secret-formula/celestials/pelle-upgrades.js
+++ b/src/core/secret-formula/celestials/pelle-upgrades.js
@@ -102,7 +102,7 @@ export const pelleUpgrades = {
   },
   dimBoostResetsNothing: {
     id: 7,
-    description: "Dimension Boosts no longer reset anything",
+    description: "Dimension Boosts no longer reset anything. Galaxies only reset Dimension Boosts.",
     cost: 1e11,
     formatCost,
   },
@@ -192,7 +192,7 @@ export const pelleUpgrades = {
   },
   replicantiGalaxyEM40: {
     id: 22,
-    description: "Replicanti Galaxies no longer reset anything they normally reset",
+    description: "Replicanti Galaxies no longer reset anything they normally reset, but still reduce Replicanti.",
     cost: 1e30,
     formatCost,
   }
diff --git a/src/core/secret-formula/celestials/quotes/ra.js b/src/core/secret-formula/celestials/quotes/ra.js
index 69be62b769..9a0e3e93c8 100644
--- a/src/core/secret-formula/celestials/quotes/ra.js
+++ b/src/core/secret-formula/celestials/quotes/ra.js
@@ -37,7 +37,7 @@ export const raQuotes = {
     id: 4,
     requirement: () => Ra.pets.effarig.level >= 2,
     lines: [
-      "Eff... a... rig",
+      "Eff... a... rig...",
       "I remember Effarig being friendly.",
     ]
   },
diff --git a/src/core/secret-formula/celestials/ra.js b/src/core/secret-formula/celestials/ra.js
index 7fec67580f..c68b049455 100644
--- a/src/core/secret-formula/celestials/ra.js
+++ b/src/core/secret-formula/celestials/ra.js
@@ -111,7 +111,7 @@ export const ra = {
     unlockGlyphAlchemy: {
       id: 8,
       reward: `Unlock Glyph Alchemy, which adds alchemical resources you can increase by Refining Glyphs. You unlock
-        more resources through Effarig levels. Access through a new Reality tab.`,
+        more resources through Effarig levels. Access through a new Reality tab`,
       pet: "effarig",
       level: 2,
       displayIcon: `<span class="fas fa-vial"></span>`
@@ -186,7 +186,7 @@ export const ra = {
     autoPulseTime: {
       id: 17,
       reward: () => `Black Hole charging now only uses ${formatPercents(0.99)} of your game speed and you can
-        automatically discharge ${formatPercents(0.01)} of your stored game time every ${formatInt(5)} ticks.`,
+        automatically discharge ${formatPercents(0.01)} of your stored game time every ${formatInt(5)} ticks`,
       pet: "enslaved",
       level: 10,
       displayIcon: `<span class="fas fa-expand-arrows-alt"></span>`,
@@ -240,7 +240,7 @@ export const ra = {
     },
     vXP: {
       id: 23,
-      reward: "All Memory Chunks produce more Memories based on total Celestial levels.",
+      reward: "All Memory Chunks produce more Memories based on total Celestial levels",
       effect: () => 1 + Ra.totalPetLevel / 50,
       pet: "v",
       level: 5,
diff --git a/src/core/secret-formula/celestials/rifts.js b/src/core/secret-formula/celestials/rifts.js
index 7d882869e4..54174c62b0 100644
--- a/src/core/secret-formula/celestials/rifts.js
+++ b/src/core/secret-formula/celestials/rifts.js
@@ -158,7 +158,7 @@ export const pelleRifts = {
       {
         resource: "recursion",
         requirement: 0.10,
-        description: "Dimensional Boosts are more powerful based on EC completions",
+        description: "Dimension Boosts are more powerful based on EC completions",
         effect: () => Math.max(100 * EternityChallenges.completions ** 2, 1) *
           Math.max(1e4 ** (EternityChallenges.completions - 40), 1),
         formatEffect: x => `Dimension Boost power ${formatX(x, 2, 2)}`
diff --git a/src/core/secret-formula/celestials/singularity-milestones.js b/src/core/secret-formula/celestials/singularity-milestones.js
index 644169fd43..5c8e1c9db2 100644
--- a/src/core/secret-formula/celestials/singularity-milestones.js
+++ b/src/core/secret-formula/celestials/singularity-milestones.js
@@ -265,7 +265,7 @@ export const singularityMilestones = {
     start: 8e33,
     repeat: 0,
     limit: 1,
-    description: "Dilated Time boosts Dark Matter production",
+    description: "Dilated Time boosts Dark Matter and Dark Energy production",
     effect: () => Math.pow(1.6, Decimal.log10(Currency.dilatedTime.value.plus(1)) / 1000),
     effectFormat: x => formatX(x, 2, 2),
     upgradeDirection: LAITELA_UPGRADE_DIRECTION.BOOSTS_LAITELA,
diff --git a/src/core/secret-formula/challenges/normal-challenges.js b/src/core/secret-formula/challenges/normal-challenges.js
index cd9974ec4d..5c15611715 100644
--- a/src/core/secret-formula/challenges/normal-challenges.js
+++ b/src/core/secret-formula/challenges/normal-challenges.js
@@ -37,7 +37,7 @@ export const normalChallenges = [
     description:
       `the 1st Antimatter Dimension is heavily weakened, but gets an uncapped exponentially increasing multiplier.
         This multiplier resets after Dimension Boosts and Antimatter Galaxies.`,
-    name: "3rd Antimatter Dimension",
+    name: "3rd Antimatter Dimension Autobuyer",
     reward: "Upgradeable 3rd Antimatter Dimension Autobuyer",
     lockedAt: DC.D0,
   },
diff --git a/src/core/secret-formula/changelog.js b/src/core/secret-formula/changelog.js
index 04878ccc42..aa5526ed52 100644
--- a/src/core/secret-formula/changelog.js
+++ b/src/core/secret-formula/changelog.js
@@ -8,6 +8,85 @@ export const changelog = [
    *  @property {function: @return String} info  Text body of information for the entry.
    * }
    */
+  {
+    date: [2026, 6, 4],
+    name: "The Great Bugfix",
+    info: `
+If you see this, please let whoever pushed this PR know that the date needs changing & this text removed. Thanks in advance - Hexa.<br>
+<b>List of changes/fixes:</b><br>
+<ul>
+<li>Fixed Sacrifice stating it was automated if Achievement 118/Sacrifice was disabled, under some conditions.</li>
+<li>Fixed Achievement 143 not specifying that it only effects Antimatter Galaxies.</li>
+<li>Fixed manual purchases of the 2xIP rebuyable upgrade resulting in being capped 1 upgrade too early,
+resulting in the player missing out on a small boost to make the multiplier a nice 1e1,000,000.</li>
+<li>Fixed the Prestiges column in the Prestige Runs tab rounding prestiges overzealously,
+resulting in being able to have "1 Realities".</li>
+<li>Changed some cases where "High Contrast" glyph colors were not used intentionally, resulting in inconsistent glyph coloring.</li>
+<li>Fixed being able to Reality for less than 5000 Reality Machiones while having the Synthetic Symbolism upgrade lock active.</li>
+<li>Properly disabled the Eternity Milestones for 200 and 1000 Eternities while Doomed.</li>
+<li>Fixed the second boost from the Vacuum Rift always applying while Doomed, even when the Rift is drained. In turn, enabled ts192
+when this boost is disabled, in order to mitigate any significant changes to balancing.</li>
+<li>Fixed being able to bypass the Paradoxically Atain upgrade lock by obtaining ACHNR. Doing so now will give a warning,
+like all other activities that result in breaking the conditions of a lock.</li>
+<li>Added a note that Galaxies are also afected by the Pelle Upgrade that causes Dimension Boosts to no longer reset resources</li>
+<li>Fixed Automator statements occasionally being skipped for no reason.</li>
+<li>Fixed the Galaxy Generator stating that some Galaxy upgrades were never affordable, as it did not take into account galaxies
+that the player already has, but has not spent.</li>
+<li>Moved Tesseracts to require a V unlock before being shown in the content catchup, rather than unlocking The Nameless Ones', in order to
+prevent the player from pre-emptively accessing certain h2p pages.</li>
+<li>Added flavor text to the Sacrifice button while in The Nameless Ones' Reality.</li>
+<li>Added a note to The Nameless Ones' Reality about Sacrifice being disabled.</li>
+<li>Removed internal "doubleEverything" and "tripleEverything" dev functions, as they were dysfunctional.</li>
+<li>Replaced internal "fixSave" dev function to a more successful/powerful version.</li>
+<li>Fixed the Singularity Upgrade which boosts Dark Energy and Dark Matter based on Dilated Time not stating the boost to Dark Energy.</li>
+<li>Removed useless internal argument which were never used.</li>
+<li>Increased the precision of the Imaginary Upgrade "Transcience of Information" to allow a visible change when purchasing
+Rebuyable Imaginary Upgrades.</li>
+<li>Renamed the 3rd Autobuyer challenge to "3rd Antimatter Dimension Autobuyer Challenge" from "3rd Antimatter Dimension Challenge" in order
+to maintain consistancy with all other Normal Challenges.</li>
+<li>Fixed the Discord Rich Presence formatting Reality/Imaginary Machines weirdly and inconsistently.</li>
+<li>Fixed cases where some Reality Upgrade requirements were prefixed with a number rather than a letter, causing certain notations which
+start with a character, rather than a number, to be incorrectly capitalised.</li>
+<li>Fixed the automator stating "undefined attempted" whenever a nowait would result in a prestige command being skipped.</li>
+<li>Fixed automator until not working with prestige events as intended.</li>
+<li>Fixed cases where Blind theme was not edge-cased like Normal theme, resulting in the Blind theme having inconsistent coloring to
+the Normal theme in some cases.</li>
+<li>Fixed being able to use the shift-click fast buy on Eternity Challenges, that you could not afford or unlock, still resulting in the
+Eternity Challenge being "unlocked" internally, and therefore showing in the Eternity Challenges tab pre-emptively.</li>
+<li>Fixed the sigil for The Nameless Ones' Reality being slightly off center.</li>
+<li>Disabled the DAB perk while doomed, to remain consistent with DAS and DAU.</li>
+<li>Stopped showing the modal that pops up on your first Infinity, stating that you can disable animations, showing up if the player
+already has atleast 1 game completion.</li>
+<li>Achievement 116 now states that you need to Eternity with no more than 1 Infinity, to include the possibility of 0 Infinities.</li>
+<li>Fixed the modal that shows up on Replicanti Galaxy purchase (when confirmation is enabled) from stating that your Replicanti will be 
+divided by 1.79e308 rather than reset to 0 while Doomed.</li>
+<li>Fixed the Achievement Count line, when showing you the progress made while offline, not being flavored correctly.</li>
+<li>Fixed some text not being bolded properly due to using depreciated tags.</li>
+<li>Fixed flavor text, stating that "Lai'tela's Reality has been destroyed", disappearing once you are able to unlock Omniprescent 
+Obliteration, as it was inconsistent with all other Reality flavor text.</li>
+<li>Fixed the section of the Lai'tela tab below the Singularities part being slightly thinner if you had yet to have a Signularity and 
+therefore unlock Singularity Milestones.</li>
+<li>Fixed the confirmation modal showing an asterisk when entering Eternity Challenge 6 while in The Nameless Ones' Reality, instead of 
+scrambled text.</li>
+<li>Capped the Replicanti Glyph Doomed effect being able to become Infinite and breaking Replianti, by capping it at 1e308.</li>
+<li>Capped ts41 in Effarig's Reality during the Eternity layer to 1e50.</li>
+<li>Doomed Achievement 187 (r187) now properly states that its unlock condition is Dilating Time while Dooming, not Unlocking Dilation.</li>
+<li>Fixed the import button in the Automatic Backups Menu having its click detection at the bottom of the page,
+and being broken anyways.</li>
+<li>Fixed accidentally spawning 2 offline progress modals rather than 1</li>
+<li>Fixed the Antimatter Galaxy button sometimes incorrectly stating that certain things would not be reset, when they would be.</li>
+<li>Fixed cases where changing an upgrade but not having a change to its effect would result in the old effect formatting being shown
+untill the player reloaded the subtab (i.e. by changing away and back).</li>
+<li>Added a note to the h2p tab for Replicanti if ts192 is unlocked.</li>
+<li>Fixed the progress bar at the bottom of the Antimatter Dimensions tab not working properly when in Dilation while Doomed, and showing 
+the progress to gaining more TP, rather than the progress to the Galaxy Generator.</li>
+<li>Fixed rows of tables in the Past Prestige Runs subtab being very slightly thinner then normal if it had stated that you had not done X 
+amount of a prestige yet.</li>
+<li>Fixed some spelling/punctuation, and standardized it elsewhere.</li>
+</ul>
+<br>
+`
+  },
   {
     date: [2024, 8, 12],
     name: "Hi Ra",
@@ -31,9 +110,9 @@ export const changelog = [
 <br>
 <b>Bugfixes:</b><br>
 <ul>
-<li>Fixed a BH pulse does not apply during offline progess</li>
-<li>Fixed a BH inversion is active while it is being disabled</li>
-<li>Fixed a BH inversion slider is visible while it is being disabled</li>
+<li>Fixed BH pulse not applying during offline progess</li>
+<li>Fixed a case where BH inversion is active while it is disabled</li>
+<li>Fixed a case where BH inversion slider is visible while it is disabled</li>
 </ul>
 <br>
 `
diff --git a/src/core/secret-formula/discord-rich-presence.js b/src/core/secret-formula/discord-rich-presence.js
index ac0fa7bce9..b20735a1d0 100644
--- a/src/core/secret-formula/discord-rich-presence.js
+++ b/src/core/secret-formula/discord-rich-presence.js
@@ -11,10 +11,11 @@ function formatInt(value) {
 
 function formatMachines(realPart, imagPart) {
   const parts = [];
-  if (Decimal.neq(realPart, 0)) parts.push(format(realPart, 2));
+  if (Decimal.neq(realPart, 0)) parts.push(`${format(realPart, 2)}`);
   if (Decimal.neq(imagPart, 0)) parts.push(`${format(imagPart, 2, 2)}i`);
-  if (Decimal.eq(realPart, 0) && Decimal.eq(imagPart, 0)) return format(0);
-  return parts.join(" + ");
+  if (Decimal.eq(realPart, 0) && Decimal.eq(imagPart, 0)) return `${format(0)} Machines`;
+  // This is the way it is displayed in sidebar aswell.
+  return `${parts.join(" + ")} Machines`;
 }
 
 // This is used for Discord Rich Presence, the information which shows up on a person's profile badge in Discord if
@@ -232,7 +233,7 @@ export const discordRichPresence = {
       name: () => Ra.displayName,
       hasReached: () => MachineHandler.isIMUnlocked,
       mainResource: () =>
-        `${format(player.reality.realityMachines)} RM + ${format(player.reality.imaginaryMachines, 2)} iM`,
+        formatMachines(player.reality.realityMachines, player.reality.imaginaryMachines),
       resourceList: [
         () => `Best GL: ${formatInt(player.records.bestReality.glyphLevel)}`,
         () => `Ra Levels: ${Ra.pets.all.map(p => formatInt(p.level)).join("/")}`
@@ -242,7 +243,7 @@ export const discordRichPresence = {
       name: () => Laitela.displayName,
       hasReached: () => Laitela.isUnlocked,
       mainResource: () =>
-        `${format(player.reality.realityMachines)} RM + ${format(player.reality.imaginaryMachines, 2)} iM`,
+        formatMachines(player.reality.realityMachines, player.reality.imaginaryMachines),
       resourceList: [
         () => `Best GL: ${formatInt(player.records.bestReality.glyphLevel)}`,
         () => quantify("Singularity", player.celestials.laitela.singularities, 2, 0, format)],
diff --git a/src/core/secret-formula/eternity/time-studies/normal-time-studies.js b/src/core/secret-formula/eternity/time-studies/normal-time-studies.js
index 0b0877e143..dd77b543f6 100644
--- a/src/core/secret-formula/eternity/time-studies/normal-time-studies.js
+++ b/src/core/secret-formula/eternity/time-studies/normal-time-studies.js
@@ -103,7 +103,10 @@ export const normalTimeStudies = [
     requirement: [31],
     reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
     description: () => `All Galaxies give a ${formatX(DC.D1_2, 1, 1)} multiplier to Infinity Points gained`,
-    effect: () => DC.D1_2.pow(Replicanti.galaxies.total + player.galaxies + player.dilation.totalTachyonGalaxies),
+    effect: () => {
+      const gain = DC.D1_2.pow(Replicanti.galaxies.total + player.galaxies + player.dilation.totalTachyonGalaxies);
+      return gain.gt(1e50) && Effarig.isRunning && Effarig.currentStage === EFFARIG_STAGES.ETERNITY ? DC.E50 : gain;
+    },
     formatEffect: value => formatX(value, 2, 1)
   },
   {
diff --git a/src/core/secret-formula/h2p.js b/src/core/secret-formula/h2p.js
index f71eeb56a4..76c233cc21 100644
--- a/src/core/secret-formula/h2p.js
+++ b/src/core/secret-formula/h2p.js
@@ -635,7 +635,8 @@ amount of antimatter before you can attempt them.
       info: () => `
 Replicanti are another resource you unlock at ${format(DC.E140)} IP. Rather
 than producing something else, Replicanti actually produces <i>itself</i> up to a maximum of
-${formatPostBreak(Number.MAX_VALUE, 2)}. Replicanti are produced at their own pace, unaffected by Tickspeed Upgrades.
+${formatPostBreak(Number.MAX_VALUE, 2)}${TimeStudy(192).isBought ? ", which is removed due to Time Study 192" : ""}.
+Replicanti are produced at their own pace, unaffected by Tickspeed Upgrades.
 Each individual Replicanti has a certain chance (initially ${formatPercents(0.01)}) of producing another Replicanti
 every Replicanti tick (initially every second), and both of these can be upgraded by spending IP.
 <br>
diff --git a/src/core/secret-formula/infinity/infinity-upgrades.js b/src/core/secret-formula/infinity/infinity-upgrades.js
index 74341c10fb..0fac2da79d 100644
--- a/src/core/secret-formula/infinity/infinity-upgrades.js
+++ b/src/core/secret-formula/infinity/infinity-upgrades.js
@@ -225,7 +225,7 @@ export const infinityUpgrades = {
     description: () => `Multiply Infinity Points from all sources by ${formatX(2)}`,
     // Normally the multiplier caps at e993k or so with 3300000 purchases, but if the cost is capped then we just give
     // an extra e7k to make the multiplier look nice
-    effect: () => (player.IPMultPurchases >= 3300000 ? DC.E1E6 : DC.D2.pow(player.IPMultPurchases)),
+    effect: () => (player.IPMultPurchases >= 3299999 ? DC.E1E6 : DC.D2.pow(player.IPMultPurchases)),
     cap: () => Effarig.eternityCap ?? DC.E1E6,
     formatEffect: value => formatX(value, 2, 2),
   }
diff --git a/src/core/secret-formula/reality/imaginary-upgrades.js b/src/core/secret-formula/reality/imaginary-upgrades.js
index 9b063c4cdb..09c097846d 100644
--- a/src/core/secret-formula/reality/imaginary-upgrades.js
+++ b/src/core/secret-formula/reality/imaginary-upgrades.js
@@ -102,6 +102,7 @@ export const imaginaryUpgrades = [
     name: "Suspicion of Interference",
     id: 11,
     cost: 5e7,
+    prefixedNumber: true,
     requirement: () => `${format(1e90)} total Relic Shards
       (You have ${format(player.celestials.effarig.relicShards, 2)})`,
     hasFailed: () => false,
@@ -140,7 +141,7 @@ export const imaginaryUpgrades = [
     checkEvent: GAME_EVENT.GAME_TICK_AFTER,
     description: "Increase Imaginary Machine Cap based on Imaginary Upgrades purchased",
     effect: () => 1 + ImaginaryUpgrades.totalRebuyables / 20 + ImaginaryUpgrades.totalSinglePurchase / 2,
-    formatEffect: value => `${formatX(value, 2, 1)}`,
+    formatEffect: value => `${formatX(value, 2, 2)}`,
     isDisabledInDoomed: true
   },
   {
diff --git a/src/core/secret-formula/reality/reality-upgrades.js b/src/core/secret-formula/reality/reality-upgrades.js
index 8ddecdbcc4..37c1c0037e 100644
--- a/src/core/secret-formula/reality/reality-upgrades.js
+++ b/src/core/secret-formula/reality/reality-upgrades.js
@@ -105,7 +105,8 @@ export const realityUpgrades = [
     checkRequirement: () => !player.reality.gainedAutoAchievements,
     checkEvent: GAME_EVENT.ETERNITY_RESET_BEFORE,
     canLock: true,
-    // We don't have lockEvent because the modal can never show up for this upgrade
+    // This lock event can only be seen if you are attempting to get ACHNR with the lock on, so we can state ACHNR here
+    lockEvent: "gain an automatic achievement (through ACHNR)",
     description: "Tachyon Particle gain is boosted based on Achievement multiplier",
     effect: () => Math.sqrt(Achievements.power),
     formatEffect: value => formatX(value, 2, 2)
@@ -151,6 +152,7 @@ export const realityUpgrades = [
     name: "The Boundless Flow",
     id: 11,
     cost: 50,
+    prefixedNumber: true,
     requirement: () => `${format(Currency.infinitiesBanked.value, 2)}/${format(DC.E12)} Banked Infinities`,
     checkRequirement: () => Currency.infinitiesBanked.exponent >= 12,
     checkEvent: [GAME_EVENT.ETERNITY_RESET_AFTER, GAME_EVENT.REALITY_FIRST_UNLOCKED],
@@ -195,6 +197,7 @@ export const realityUpgrades = [
     name: "The Eternal Flow",
     id: 14,
     cost: 50,
+    prefixedNumber: true,
     requirement: () => `${format(Currency.eternities.value, 2)}/${format(1e7)} Eternities`,
     checkRequirement: () => Currency.eternities.gte(1e7),
     checkEvent: [GAME_EVENT.ETERNITY_RESET_AFTER, GAME_EVENT.REALITY_FIRST_UNLOCKED],
@@ -290,6 +293,7 @@ export const realityUpgrades = [
     name: "Parity of Singularity",
     id: 20,
     cost: 1500,
+    prefixedNumber: true,
     requirement: () => `${formatInt(100)} days total play time after unlocking the Black Hole
       (Currently: ${Time.timeSinceBlackHole.toStringShort(false)})`,
     hasFailed: () => !BlackHole(1).isUnlocked && Currency.realityMachines.lt(100),
@@ -304,6 +308,7 @@ export const realityUpgrades = [
     name: "Cosmic Conglomerate",
     id: 21,
     cost: 100000,
+    prefixedNumber: true,
     requirement: () => `${formatInt(Replicanti.galaxies.total + player.galaxies +
       player.dilation.totalTachyonGalaxies)}/${formatInt(2800)} total Galaxies from all types`,
     checkRequirement: () =>
@@ -316,6 +321,7 @@ export const realityUpgrades = [
     name: "Temporal Transcendence",
     id: 22,
     cost: 100000,
+    prefixedNumber: true,
     requirement: () => `${format(Currency.timeShards.value, 1)}/${format(DC.E28000)} Time Shards`,
     checkRequirement: () => Currency.timeShards.exponent >= 28000,
     checkEvent: GAME_EVENT.GAME_TICK_AFTER,
@@ -346,7 +352,7 @@ export const realityUpgrades = [
     checkRequirement: () => MachineHandler.gainedRealityMachines.gte(5000) &&
       Glyphs.activeWithoutCompanion.length === 0,
     canLock: true,
-    lockEvent: "equip a non-Companion Glyph",
+    lockEvent: () => `equip a non-Companion Glyph or Reality below ${formatInt(5000)} RM`,
     checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
     description: "Gain another Glyph slot",
     effect: () => 1
diff --git a/src/core/secret-formula/tabs.js b/src/core/secret-formula/tabs.js
index 376688d56c..53f06b5fb5 100644
--- a/src/core/secret-formula/tabs.js
+++ b/src/core/secret-formula/tabs.js
@@ -89,7 +89,7 @@ export const tabs = [
       },
       {
         key: "challenges",
-        name: "Challenge records",
+        name: "Challenge Records",
         symbol: "<i class='fas fa-stopwatch'></i>",
         component: "ChallengeRecordsTab",
         condition: () =>
diff --git a/src/core/storage/migrations.js b/src/core/storage/migrations.js
index 9d28da06be..e70c787249 100644
--- a/src/core/storage/migrations.js
+++ b/src/core/storage/migrations.js
@@ -419,6 +419,9 @@ export const migrations = {
 
       // This update has a rebalance that assumes the 3rd dilation repeatable is unpurchasable in cel7
       if (player.celestials.pelle.doomed) player.dilation.rebuyables[3] = 0;
+    },
+    25.1: player => {
+      delete player.infinity;
     }
   },
 
diff --git a/src/core/storage/storage.js b/src/core/storage/storage.js
index c2a32a946c..97d3d64c09 100644
--- a/src/core/storage/storage.js
+++ b/src/core/storage/storage.js
@@ -156,9 +156,17 @@ export const GameStorage = {
       return;
     }
     const newPlayer = GameSaveSerializer.deserialize(saveData);
+    // If we're attempting to fix imports anyways
     if (this.checkPlayerObject(newPlayer) !== "") {
-      Modal.message.show("Could not load the save (format unrecognized or invalid).");
-      return;
+      // If we are repairing imports, and the player object fail starts with B, we know it is because
+      // there are some broken player objects that might be repairable. If we are fixing, we can therefore
+      // attempt to forcibly fix the broken save anyways.
+      if (dev.attemptFixImports && this.checkPlayerObject(newPlayer)[0] === "B") {
+        Modal.message.show("Save format is damaged, attempting save repairal");
+      } else {
+        Modal.message.show("Could not load the save (format unrecognized or invalid).");
+        return;
+      }
     }
     this.oldBackupTimer = player.backupTimer;
     Modal.hideAll();
@@ -220,12 +228,12 @@ export const GameStorage = {
             hasNaN = hasNaN || thisNaN;
             break;
           case "number":
-            thisNaN = Number.isNaN(prop);
+            thisNaN = Number.isNaN(prop) || !Number.isFinite(prop);
             hasNaN = hasNaN || thisNaN;
             if (thisNaN) invalidProps.push(`${path}.${key}`);
             break;
           case "string":
-            // If we're attempting to import, all NaN entries will still be strings
+            // If we're attempting to import, all NaN or infinity entries will still be strings
             thisNaN = prop === "NaN";
             hasNaN = hasNaN || thisNaN;
             if (thisNaN) invalidProps.push(`${path}.${key}`);
@@ -237,7 +245,7 @@ export const GameStorage = {
     checkNaN(save, "player");
 
     if (invalidProps.length === 0) return "";
-    return `${quantify("NaN player property", invalidProps.length)} found:
+    return `${quantify("Broken player property", invalidProps.length)} found:
       ${invalidProps.join(", ")}`;
   },
 
@@ -392,7 +400,7 @@ export const GameStorage = {
       const id = Number(backupKey);
       const storageKey = this.backupDataKey(this.currentSlot, id);
       localStorage.setItem(storageKey, GameSaveSerializer.serialize(backupData[backupKey]));
-      this.backupTimeData[id] = {
+      this.lastBackupTimes[id] = {
         backupTimer: backupData.time[id].backupTimer,
         date: backupData.time[id].date,
       };
@@ -420,18 +428,24 @@ export const GameStorage = {
     Cloud.resetTempState();
   },
 
+  // eslint-disable-next-line complexity
   loadPlayerObject(playerObject) {
     this.saved = 0;
 
     const checkString = this.checkPlayerObject(playerObject);
     if (playerObject === Player.defaultStart || checkString !== "") {
-      if (DEV && checkString !== "") {
+      if (DEV && checkString !== "" && !dev.attemptFixImports) {
         // eslint-disable-next-line no-console
         console.log(`Savefile was invalid and has been reset - ${checkString}`);
       }
-      player = deepmergeAll([{}, Player.defaultStart]);
-      player.records.gameCreatedTime = Date.now();
-      player.lastUpdate = Date.now();
+
+      if (dev.attemptFixImports) {
+        dev.fixSave(playerObject);
+      } else {
+        player = deepmergeAll([{}, Player.defaultStart]);
+        player.records.gameCreatedTime = Date.now();
+        player.lastUpdate = Date.now();
+      }
       if (DEV) {
         devMigrations.setLatestTestVersion(player);
       }
diff --git a/src/core/themes.js b/src/core/themes.js
index ef86e43161..b1f259d890 100644
--- a/src/core/themes.js
+++ b/src/core/themes.js
@@ -16,7 +16,7 @@ export const Theme = function Theme(name, config) {
   this.isSecret = config.isSecret;
 
   this.isDefault = function() {
-    return name === "Normal";
+    return name === "Normal" || name === "S9";
   };
 
   this.isAvailable = function() {
@@ -133,6 +133,8 @@ Theme.create = function(name, settings) {
   return new Theme(name, config);
 };
 
+/* eslint-disable no-inline-comments */
+/* eslint-disable line-comment-position */
 export const Themes = {
   all: [
     /* eslint-disable no-multi-spaces */
@@ -145,18 +147,18 @@ export const Themes = {
     Theme.create("Inverted Metro",  {              metro: true,                               }),
     Theme.create("AMOLED",          { dark: true,                                             }),
     Theme.create("AMOLED Metro",    { dark: true,  metro: true,                               }),
-    Theme.create("S1",              {                           animated: true, secret: true, }),
-    Theme.create("S2",              {                                           secret: true, }),
-    Theme.create("S3",              {                                           secret: true, }),
-    Theme.create("S4",              {                                           secret: true, }),
-    Theme.create("S5",              {                                           secret: true, }),
-    Theme.create("S6",              { dark: true,               animated: true, secret: true, }),
-    Theme.create("S7",              {              metro: true,                 secret: true, }),
-    Theme.create("S8",              {              metro: true,                 secret: true, }),
-    Theme.create("S9",              {                                           secret: true, }),
-    Theme.create("S10",             { dark: true,  metro: true, animated: true, secret: true, }),
-    Theme.create("S11",             { dark: true,               animated: true, secret: true, }),
-    Theme.create("S12",             {                                           secret: true, }),
+    Theme.create("S1",              {                           animated: true, secret: true, }), // Christmas
+    Theme.create("S2",              {                                           secret: true, }), // Finnish
+    Theme.create("S3",              {                                           secret: true, }), // Confused
+    Theme.create("S4",              {                                           secret: true, }), // Design
+    Theme.create("S5",              {                                           secret: true, }), // Nicolas
+    Theme.create("S6",              { dark: true,               animated: true, secret: true, }), // Galactic
+    Theme.create("S7",              {              metro: true,                 secret: true, }), // Work
+    Theme.create("S8",              {              metro: true,                 secret: true, }), // Bliss
+    Theme.create("S9",              {                                           secret: true, }), // Blind
+    Theme.create("S10",             { dark: true,  metro: true, animated: true, secret: true, }), // Stellar
+    Theme.create("S11",             { dark: true,               animated: true, secret: true, }), // Blob
+    Theme.create("S12",             {                                           secret: true, }), // Aero
     /* eslint-enable no-multi-spaces */
   ],
 
diff --git a/src/core/time-studies/ec-time-study.js b/src/core/time-studies/ec-time-study.js
index 1ab118e4a4..91edb9a043 100644
--- a/src/core/time-studies/ec-time-study.js
+++ b/src/core/time-studies/ec-time-study.js
@@ -13,7 +13,6 @@ export class ECTimeStudyState extends TimeStudyState {
 
   purchase(auto) {
     if (GameEnd.creditsEverClosed) return false;
-    EternityChallenge(this.id).hasUnlocked = true;
     const clickTime = Date.now();
 
     if (this.isBought && player.challenge.eternity.current === 0 && !auto) {
@@ -30,6 +29,7 @@ export class ECTimeStudyState extends TimeStudyState {
       // If you haven't bought it and can buy it, reset the time of click, and
       // send you into the EC, deduct your resources, and move you to the EC tab if that isn't disabled
       ui.lastClickTime = 0;
+      EternityChallenge(this.id).hasUnlocked = true;
 
       player.challenge.eternity.unlocked = this.id;
       if (!auto) {
diff --git a/src/game.js b/src/game.js
index 41a77d0f5e..37a6bdaf77 100644
--- a/src/game.js
+++ b/src/game.js
@@ -924,9 +924,9 @@ export function simulateTime(seconds, real, fast) {
   const infinitiedMilestone = getInfinitiedMilestoneReward(totalGameTime * 1000);
   const eternitiedMilestone = getEternitiedMilestoneReward(totalGameTime * 1000);
 
-  if (eternitiedMilestone.gt(0)) {
+  if (eternitiedMilestone.gt(0) && !Pelle.isDoomed) {
     Currency.eternities.add(eternitiedMilestone);
-  } else if (infinitiedMilestone.gt(0)) {
+  } else if (infinitiedMilestone.gt(0) && !Pelle.isDoomed) {
     Currency.infinities.add(infinitiedMilestone);
   } else {
     Currency.eternityPoints.add(getOfflineEPGain(seconds * 1000));