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/.stylelintignore b/.stylelintignore
index 8a73544d02..d87d1117a3 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1,3 +1,4 @@
 public/stylesheets/fontawesome/**/*.css
 public/stylesheets/codemirror/*.css
 public/stylesheets/vis-network.css
+public/stylesheets/github-light.css
diff --git a/public/stylesheets/github-light.css b/public/stylesheets/github-light.css
index 872a6f4b27..12e411d970 100644
--- a/public/stylesheets/github-light.css
+++ b/public/stylesheets/github-light.css
@@ -31,7 +31,7 @@
 
 .pl-s .pl-s1 /* string source */,
 .pl-smi      /* storage.modifier.import, storage.modifier.package, storage.type.java, variable.other, variable.parameter.function */ {
-  color: #333;
+  color: #333333;
 }
 
 .pl-ent /* entity.name.tag */ {
@@ -61,13 +61,13 @@
 }
 
 .pl-ii /* invalid.illegal */ {
-  background-color: #b52a1d;
   color: #f8f8f8;
+  background-color: #b52a1d;
 }
 
 .pl-sr .pl-cce /* string.regexp constant.character.escape */ {
-  color: #63a35c;
   font-weight: bold;
+  color: #63a35c;
 }
 
 .pl-ml /* markup.list */ {
@@ -77,8 +77,8 @@
 .pl-mh        /* markup.heading */,
 .pl-mh .pl-en /* markup.heading entity.name */,
 .pl-ms        /* meta.separator */ {
-  color: #1d3e81;
   font-weight: bold;
+  color: #1d3e81;
 }
 
 .pl-mq /* markup.quote */ {
@@ -86,31 +86,30 @@
 }
 
 .pl-mi /* markup.italic */ {
-  color: #333;
   font-style: italic;
+  color: #333333;
 }
 
 .pl-mb /* markup.bold */ {
-  color: #333;
   font-weight: bold;
+  color: #333333;
 }
 
 .pl-md /* markup.deleted, meta.diff.header.from-file */ {
-  background-color: #ffecec;
   color: #bd2c00;
+  background-color: #ffecec;
 }
 
 .pl-mi1 /* markup.inserted, meta.diff.header.to-file */ {
-  background-color: #eaffea;
   color: #55a532;
+  background-color: #eaffea;
 }
 
 .pl-mdr /* meta.diff.range */ {
-  color: #795da3;
   font-weight: bold;
+  color: #795da3;
 }
 
 .pl-mo /* meta.output */ {
   color: #1d3e81;
 }
-
diff --git a/public/stylesheets/new-ui-styles.css b/public/stylesheets/new-ui-styles.css
index e873660352..d44dfd22ef 100644
--- a/public/stylesheets/new-ui-styles.css
+++ b/public/stylesheets/new-ui-styles.css
@@ -739,8 +739,9 @@ body.t-s12 {
 }
 
 .c-modern-dim-tooltip-container .c-modern-dim-purchase-count-tooltip {
-  position: absolute;
+  visibility: hidden;
   width: 20rem;
+  position: absolute;
   top: 50%;
   font-size: 1.3rem;
   line-height: 1.6rem;
@@ -748,10 +749,9 @@ body.t-s12 {
   background: black;
   border: 0.1rem solid var(--color-text);
   border-radius: var(--var-border-width, 0.5rem);
+  padding: 0.5rem;
   /* Button is 25rem wide, tooltip is 20rem */
   transform: translate(calc(-125% - 1rem), -50%);
-  padding: 0.5rem;
-  visibility: hidden;
 }
 
 .c-modern-dim-tooltip-container:hover .c-modern-dim-purchase-count-tooltip {
@@ -761,11 +761,11 @@ body.t-s12 {
 .c-modern-dim-tooltip-container .c-modern-dim-purchase-count-tooltip::after {
   content: "";
   position: absolute;
-  left: 100%;
   top: 50%;
+  left: 100%;
   border-top: 0.5rem solid transparent;
-  border-left: 0.5rem solid var(--color-text);
   border-bottom: 0.5rem solid transparent;
+  border-left: 0.5rem solid var(--color-text);
   transform: translateY(-50%);
 }
 
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index 65880c8e5c..f3a4f849b8 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;
@@ -1504,18 +1510,15 @@ br {
 }
 
 .infotooltip:hover .infotooltiptext {
+  visibility: visible;
   left: calc(100% + 0.7rem);
+  opacity: 1;
 }
 
 .s-base--dark .infotooltip .infotooltiptext {
   border-color: #dddddd;
 }
 
-.infotooltip:hover .infotooltiptext {
-  visibility: visible;
-  opacity: 1;
-}
-
 .infotooltip .infotooltiptext::after {
   content: "";
   position: absolute;
@@ -2391,13 +2394,14 @@ br {
 }
 
 .c-dim-tooltip-container {
-  position: relative;
   display: inline-block;
+  position: relative;
 }
 
 .c-dim-tooltip-container .c-dim-purchase-count-tooltip {
-  position: absolute;
+  visibility: hidden;
   width: 20rem;
+  position: absolute;
   top: 50%;
   font-size: 1.3rem;
   line-height: 1.6rem;
@@ -2405,9 +2409,8 @@ br {
   background: black;
   border: 0.1rem solid var(--color-text);
   border-radius: var(--var-border-width, 0.5rem);
-  transform: translate(calc(-100% - 1.5rem), -50%);
   padding: 0.5rem;
-  visibility: hidden;
+  transform: translate(calc(-100% - 1.5rem), -50%);
 }
 
 .c-dim-tooltip-container:hover .c-dim-purchase-count-tooltip {
@@ -2417,11 +2420,11 @@ br {
 .c-dim-tooltip-container .c-dim-purchase-count-tooltip::after {
   content: "";
   position: absolute;
-  left: 100%;
   top: 50%;
+  left: 100%;
   border-top: 0.5rem solid transparent;
-  border-left: 0.5rem solid var(--color-text);
   border-bottom: 0.5rem solid transparent;
+  border-left: 0.5rem solid var(--color-text);
   transform: translateY(-50%);
 }
 
@@ -2751,6 +2754,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 {
@@ -3196,7 +3216,6 @@ br {
   border-color: #388e3c;
 }
 
-
 /* #endregion t-dark-metro */
 
 /* #region t-metro t-inverted-metro t-s8 */
@@ -4566,11 +4585,11 @@ properly on certain themes. */
 .l-replicanti-tab {
   display: flex;
   flex-direction: column;
-  color: var(--color-text);
 
   /* To prevent button jitter */
   width: 100%;
   align-items: center;
+  color: var(--color-text);
 }
 
 /* #region c-replicanti-description */
@@ -5474,12 +5493,6 @@ properly on certain themes. */
   width: 45rem;
 }
 
-.c-modal-IAP__warning {
-  font-size: 1.6rem;
-  font-weight: bold;
-  color: var(--color-notification);
-}
-
 /* #endregion c-modal-import */
 
 /* #region c-modal-import-tree */
@@ -5705,9 +5718,9 @@ kbd {
 }
 
 .o-notification--automator {
+  color: var(--color-automator-docs-font);
   background-color: var(--color-automator-active-line-background);
   border-color: var(--color-automator-active-line-outline);
-  color: var(--color-automator-docs-font);
 }
 
 .o-notification--strike {
@@ -6545,7 +6558,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 +7767,7 @@ kbd {
 }
 
 .o-laitela-run-button--large {
-  width: 44rem;
+  width: 46rem;
 }
 
 .o-laitela-matter-amount {
@@ -8549,8 +8562,8 @@ kbd {
   background:
     repeating-linear-gradient(
       -45deg,
-      #A2A229,
-      #A2A229 3rem,
+      #a2a229,
+      #a2a229 3rem,
       #919122 3rem,
       #919122 6rem
     );
@@ -8582,11 +8595,11 @@ kbd {
 .o-requirement-lock {
   position: absolute;
   font-size: 5rem;
-  padding: 0.5rem 1.8rem;
-  color: black;
   opacity: 0.4;
-  user-select: none;
+  color: black;
+  padding: 0.5rem 1.8rem;
   pointer-events: none;
+  user-select: none;
 }
 
 .c-reality-upgrade-btn--black-hole-unlock {
diff --git a/public/stylesheets/theme-Dark Metro.css b/public/stylesheets/theme-Dark Metro.css
index 355f0b0af1..95fce611ef 100644
--- a/public/stylesheets/theme-Dark Metro.css	
+++ b/public/stylesheets/theme-Dark Metro.css	
@@ -23,4 +23,4 @@ body.t-dark-metro {
 
 .t-dark-metro .c-tt-buy-button--locked:hover {
   background: #e53935;
-}
\ No newline at end of file
+}
diff --git a/public/stylesheets/theme-Dark.css b/public/stylesheets/theme-Dark.css
index 0e5da459d0..86d6a32eda 100644
--- a/public/stylesheets/theme-Dark.css
+++ b/public/stylesheets/theme-Dark.css
@@ -37,4 +37,4 @@ input.t-dark {
 
 .t-dark .c-rm-amount__desc {
   color: #757575;
-}
\ No newline at end of file
+}
diff --git a/public/stylesheets/time-studies.css b/public/stylesheets/time-studies.css
index 2f42b50215..2b16749325 100644
--- a/public/stylesheets/time-studies.css
+++ b/public/stylesheets/time-studies.css
@@ -43,11 +43,11 @@
   font-family: Typewriter, serif;
   font-size: 1rem;
   font-weight: bold;
+  text-decoration: line-through;
   background-color: crimson;
   border: 0.1rem solid;
   border-radius: var(--var-border-radius, 0.4rem);
   transition-duration: 0.2s;
-  text-decoration: line-through;
 }
 
 .c-pelle-useless-available {
@@ -377,16 +377,16 @@
   color: white;
   background-color: black;
   border-color: white;
-  border-width: 0.3rem;
   border-style: double;
+  border-width: 0.3rem;
 }
 
 .o-time-study-light--bought {
   color: black;
   background-color: white;
   border-color: black;
-  border-width: 0.3rem;
   border-style: double;
+  border-width: 0.3rem;
 }
 
 .o-time-study-eternity-challenge--bought {
diff --git a/src/components/ChallengeBox.vue b/src/components/ChallengeBox.vue
index 9c47331775..53d84a8ced 100644
--- a/src/components/ChallengeBox.vue
+++ b/src/components/ChallengeBox.vue
@@ -100,12 +100,14 @@ export default {
 <style scoped>
 .o-challenge-btn--broken {
   background: var(--color-enslaved--base);
+
   clip-path: polygon(0% 0%, 25% 20%, 95% 0%, 100% 25%, 80% 70%, 95% 50%, 100% 100%, 45% 95%,
     65% 70%, 15% 95%, 0% 45%, 10% 50%);
 }
 
 .o-challenge-btn--broken-alt {
   background: var(--color-enslaved--base);
+
   clip-path: polygon(0% 0%, 15% 0%, 25% 40%, 30% 0%, 55% 0%, 85% 30%, 75% 0%, 100% 0%,
     90% 40%, 100% 65%, 90% 95%, 45% 45%, 70% 100%, 25% 100%, 5% 90%, 10% 60%);
 }
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..3fac5df3cd 100644
--- a/src/components/EffectDisplay.vue
+++ b/src/components/EffectDisplay.vue
@@ -28,11 +28,12 @@ export default {
   data() {
     return {
       isVisible: false,
-      effectValue: 0,
+      effectValue: -Number.MAX_VALUE,
       // 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/GenericDimensionRowText.vue b/src/components/GenericDimensionRowText.vue
index 953f15f478..9c7c6fa511 100644
--- a/src/components/GenericDimensionRowText.vue
+++ b/src/components/GenericDimensionRowText.vue
@@ -82,27 +82,27 @@ export default {
 <style scoped>
 .l-dimension-text-container {
   display: flex;
+  grid-column: 1 / 5;
   height: 3.5rem;
   align-content: center;
-  grid-column: 1 / 5;
 }
 
 .l-narrow-box {
   display: flex;
-  text-align: left;
-  width: 100%;
   flex-direction: column;
+  width: 100%;
   justify-content: center;
   align-items: flex-start;
+  text-align: left;
 }
 
 .l-wide-box {
   display: flex;
-  text-align: left;
-  width: 100%;
   flex-direction: row;
+  width: 100%;
   justify-content: flex-start;
   align-items: center;
+  text-align: left;
 }
 
 .c-dim-row__large {
diff --git a/src/components/HowToPlay.vue b/src/components/HowToPlay.vue
index b51d028d63..6dd7cbf0db 100644
--- a/src/components/HowToPlay.vue
+++ b/src/components/HowToPlay.vue
@@ -65,30 +65,30 @@ export default {
 
 <style scoped>
 .l-help-me {
-  position: absolute;
   width: 2rem;
   height: 2rem;
+  position: absolute;
   right: 2rem;
+  z-index: 1;
   font-size: 1.5rem;
   font-weight: 500;
   line-height: 1.9rem;
   border-radius: var(--var-border-radius, 50%);
+  transition-delay: 0s;
   pointer-events: auto;
   cursor: pointer;
-  transition-delay: 0s;
-  z-index: 1;
 }
 
 .h2p-tutorial--glow {
+  width: 2rem;
+  height: 2rem;
   position: absolute;
   top: 0;
   right: 2rem;
-  width: 2rem;
-  height: 2rem;
-  border-radius: var(--var-border-radius, 50%);
+  z-index: 2;
   background: gold;
+  border-radius: var(--var-border-radius, 50%);
   animation: a-opacity 3s infinite;
-  z-index: 2;
 }
 
 .h2p-tooltip {
@@ -100,8 +100,8 @@ export default {
   background: black;
   border: 0.1rem solid var(--color-text);
   border-radius: var(--var-border-width, 0.5rem);
-  transform: translate(-0.7rem, -0.4rem);
   padding: 0.2rem 0.4rem;
+  transform: translate(-0.7rem, -0.4rem);
 }
 
 .h2p-tooltip::after {
@@ -110,7 +110,7 @@ export default {
   top: 0.6rem;
   left: 100%;
   border-top: 0.5rem solid transparent;
-  border-left: 0.5rem solid var(--color-text);
   border-bottom: 0.5rem solid transparent;
+  border-left: 0.5rem solid var(--color-text);
 }
 </style>
\ No newline at end of file
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/LoadGameModal.vue b/src/components/modals/LoadGameModal.vue
index 97154e0e50..6a1f1d7cbf 100644
--- a/src/components/modals/LoadGameModal.vue
+++ b/src/components/modals/LoadGameModal.vue
@@ -27,8 +27,8 @@ export default {
 
 <style scoped>
 .c-entry-border {
-  border-bottom: 0.1rem solid var(--color-text);
   width: 28rem;
+  border-bottom: 0.1rem solid var(--color-text);
   padding-bottom: 1rem;
 }
 
diff --git a/src/components/modals/PelleEffectsModal.vue b/src/components/modals/PelleEffectsModal.vue
index 45c1fd13be..7c51a2b2b1 100644
--- a/src/components/modals/PelleEffectsModal.vue
+++ b/src/components/modals/PelleEffectsModal.vue
@@ -65,7 +65,7 @@ export default {
 <template>
   <ModalWrapper>
     <template #header>
-      List of disabled and nerfed effects in Doomed
+      List of disabled and nerfed effects when Doomed
     </template>
     <div class="pelle-effects-container">
       <p
diff --git a/src/components/modals/UiChoiceModal.vue b/src/components/modals/UiChoiceModal.vue
index abecd25f95..b246c57007 100644
--- a/src/components/modals/UiChoiceModal.vue
+++ b/src/components/modals/UiChoiceModal.vue
@@ -68,6 +68,7 @@ export default {
 .c-visual-change-list-entry {
   display: flex;
   margin-bottom: 0.5rem;
+
   gap: 1rem;
 }
 </style>
diff --git a/src/components/modals/celestial-quotes/CelestialQuoteBackground.vue b/src/components/modals/celestial-quotes/CelestialQuoteBackground.vue
index 6cf5181f70..815d04d890 100644
--- a/src/components/modals/celestial-quotes/CelestialQuoteBackground.vue
+++ b/src/components/modals/celestial-quotes/CelestialQuoteBackground.vue
@@ -82,21 +82,21 @@ export default {
   left: 50vw;
   justify-content: space-between;
   align-items: center;
+  background-color: black;
   border-radius: var(--var-border-radius, 1rem);
   transform: translate(-50%, -50%);
-  background-color: black;
 }
 
 .c-modal-celestial-quote {
-  position: absolute;
+  display: flex;
   width: 100%;
   height: 100%;
+  position: absolute;
   left: 0;
-  display: flex;
   justify-content: center;
   align-items: center;
-  user-select: none;
   border-radius: var(--var-border-radius, 1rem);
+  user-select: none;
 }
 
 .c-modal-celestial-quote__symbol {
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/glyph-management/DeleteCompanionGlyphModal.vue b/src/components/modals/glyph-management/DeleteCompanionGlyphModal.vue
index eb3828711d..89a53c389b 100644
--- a/src/components/modals/glyph-management/DeleteCompanionGlyphModal.vue
+++ b/src/components/modals/glyph-management/DeleteCompanionGlyphModal.vue
@@ -49,7 +49,7 @@ export default {
     deleteCompanion() {
       // Yes, this actually deletes a companion glyph at random, but the player can only ever legitimately have one.
       // Passing information into modals seems to require a bunch of refactoring that's not worth it for this one case.
-      const toDelete = player.reality.glyphs.inventory.filter(g => g.type === "companion")[0];
+      const toDelete = player.reality.glyphs.inventory.filter(g => g.idx === ui.chosenCompanionIDx)[0];
       Glyphs.removeFromInventory(toDelete);
     }
   },
diff --git a/src/components/modals/options/BackupEntry.vue b/src/components/modals/options/BackupEntry.vue
index 36913bbd8c..748e8d6e71 100644
--- a/src/components/modals/options/BackupEntry.vue
+++ b/src/components/modals/options/BackupEntry.vue
@@ -125,8 +125,8 @@ export default {
   font-size: 1.1rem;
   border: var(--var-border-width, 0.2rem) solid;
   border-radius: var(--var-border-radius, 0.4rem);
-  padding: 0.5rem 0.3rem;
   margin: 0.3rem;
+  padding: 0.5rem 0.3rem;
 }
 
 .c-fixed-height {
diff --git a/src/components/modals/options/BackupWindowModal.vue b/src/components/modals/options/BackupWindowModal.vue
index b0dfa34d68..47dfbccd3f 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"
@@ -116,8 +116,8 @@ export default {
 
 <style scoped>
 .c-info {
-  width: 60rem;
   overflow-x: hidden;
+  width: 60rem;
   padding-right: 1rem;
 }
 
diff --git a/src/components/modals/options/glyph-appearance/GlyphCustomization.vue b/src/components/modals/options/glyph-appearance/GlyphCustomization.vue
index fcf112d16f..d6db17e565 100644
--- a/src/components/modals/options/glyph-appearance/GlyphCustomization.vue
+++ b/src/components/modals/options/glyph-appearance/GlyphCustomization.vue
@@ -179,8 +179,8 @@ export default {
 <style scoped>
 .c-glyph-customization-group {
   width: 100%;
-  margin-top: 0.5rem;
   text-align: left;
+  margin-top: 0.5rem;
 }
 
 .c-type-selection {
diff --git a/src/components/modals/options/glyph-appearance/GlyphCustomizationSlidingWindow.vue b/src/components/modals/options/glyph-appearance/GlyphCustomizationSlidingWindow.vue
index 241d188c02..c59e86349b 100644
--- a/src/components/modals/options/glyph-appearance/GlyphCustomizationSlidingWindow.vue
+++ b/src/components/modals/options/glyph-appearance/GlyphCustomizationSlidingWindow.vue
@@ -223,28 +223,28 @@ export default {
   display: flex;
   flex-direction: row;
   width: 49rem;
-  margin: 0.5rem;
   border: 0.1rem solid var(--color-text);
   border-radius: var(--var-border-radius, 0.5rem);
+  margin: 0.5rem;
 }
 
 .c-no-options {
   width: 49rem;
-  margin: 0.5rem;
   border: 0.1rem solid var(--color-text);
   border-radius: var(--var-border-radius, 0.5rem);
+  margin: 0.5rem;
 }
 
 .c-extra-options {
-  position: relative;
   display: flex;
+  overflow: hidden;
   flex-direction: row;
   width: 100%;
   height: 100%;
-  overflow: hidden;
+  position: relative;
+  border-color: var(--color-text);
   border-width: 0.1rem;
   border-left-style: dashed;
-  border-color: var(--color-text);
 }
 
 .c-sliding-window {
@@ -257,17 +257,17 @@ export default {
 }
 
 .o-arrow {
-  position: absolute;
   display: flex;
-  align-items: center;
   height: 100%;
-  padding: 0.3rem;
+  position: absolute;
   z-index: 1;
-  background: var(--color-good);
+  align-items: center;
   color: var(--color-text);
+  background: var(--color-good);
+  padding: 0.3rem;
   transition-duration: 0.3s;
-  cursor: pointer;
   user-select: none;
+  cursor: pointer;
 }
 
 .o-arrow--left {
@@ -308,12 +308,12 @@ export default {
 
 .o-color {
   display: flex;
-  justify-content: center;
-  align-items: center;
   width: 1.5rem;
   height: 1.5rem;
-  margin: 0.5rem;
+  justify-content: center;
+  align-items: center;
   font-weight: bold;
+  margin: 0.5rem;
   user-select: none;
 }
 </style>
diff --git a/src/components/modals/options/glyph-appearance/GlyphDisplayOptionsModal.vue b/src/components/modals/options/glyph-appearance/GlyphDisplayOptionsModal.vue
index dc2402948c..122faad871 100644
--- a/src/components/modals/options/glyph-appearance/GlyphDisplayOptionsModal.vue
+++ b/src/components/modals/options/glyph-appearance/GlyphDisplayOptionsModal.vue
@@ -170,8 +170,8 @@ export default {
 }
 
 .c-glyph-visual-options {
-  width: 55rem;
   overflow-x: hidden;
+  width: 55rem;
   padding-right: 1rem;
 }
 
@@ -182,8 +182,8 @@ export default {
 }
 
 .c-dropdown-header {
-  padding: 0.9rem;
   height: 6.5rem;
+  padding: 0.9rem;
   user-select: none;
 }
 </style>
diff --git a/src/components/modals/options/hidden-tabs/HiddenSubtabsButton.vue b/src/components/modals/options/hidden-tabs/HiddenSubtabsButton.vue
index 6d6c543275..5be0919bea 100644
--- a/src/components/modals/options/hidden-tabs/HiddenSubtabsButton.vue
+++ b/src/components/modals/options/hidden-tabs/HiddenSubtabsButton.vue
@@ -79,8 +79,8 @@ export default {
 }
 
 .l-hide-modal-button__subtab-icon {
-  font-size: 1.5rem;
   width: 2rem;
+  font-size: 1.5rem;
   margin: 0.2rem;
 }
 
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/prestige/ResetRealityModal.vue b/src/components/modals/prestige/ResetRealityModal.vue
index 4117d22741..6524b03cce 100644
--- a/src/components/modals/prestige/ResetRealityModal.vue
+++ b/src/components/modals/prestige/ResetRealityModal.vue
@@ -60,8 +60,8 @@ export default {
 
 <style scoped>
 .c-has-rewards {
-  font-weight: bold;
   font-size: 1.5rem;
+  font-weight: bold;
   color: var(--color-bad);
 }
 </style>
diff --git a/src/components/modals/time-study-modal-preview/PseudoTimeStudyButton.vue b/src/components/modals/time-study-modal-preview/PseudoTimeStudyButton.vue
index 44b2f1f9b5..921fc5d0eb 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].canBeApplied;
+      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/alchemy/AlchemyTab.vue b/src/components/tabs/alchemy/AlchemyTab.vue
index 4398b3e449..37b8104ac7 100644
--- a/src/components/tabs/alchemy/AlchemyTab.vue
+++ b/src/components/tabs/alchemy/AlchemyTab.vue
@@ -288,14 +288,14 @@ export default {
   position: absolute;
   top: -1.5rem;
   left: 0;
+  z-index: 2;
   justify-content: center;
   align-items: center;
   font-size: 60rem;
+  opacity: 0.8;
   color: var(--color-pelle--base);
   text-shadow: 0 0 3rem;
   pointer-events: none;
   user-select: none;
-  opacity: 0.8;
-  z-index: 2;
 }
 </style>
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/ClassicAntimatterDimensionRow.vue b/src/components/tabs/antimatter-dimensions/ClassicAntimatterDimensionRow.vue
index c5c8f15362..33a3c3127c 100644
--- a/src/components/tabs/antimatter-dimensions/ClassicAntimatterDimensionRow.vue
+++ b/src/components/tabs/antimatter-dimensions/ClassicAntimatterDimensionRow.vue
@@ -200,14 +200,14 @@ export default {
 }
 
 .o-continuum {
-  border-color: var(--color-laitela--accent);
   color: var(--color-laitela--accent);
   background: var(--color-laitela--base);
+  border-color: var(--color-laitela--accent);
 }
 
 .o-continuum:hover {
-  border-color: var(--color-laitela--accent);
   color: var(--color-laitela--base);
   background: var(--color-laitela--accent);
+  border-color: var(--color-laitela--accent);
 }
 </style>
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/ModernAntimatterDimensionRow.vue b/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionRow.vue
index f42029c023..e500e6518c 100644
--- a/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionRow.vue
+++ b/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionRow.vue
@@ -192,14 +192,14 @@ export default {
 }
 
 .o-continuum {
-  border-color: var(--color-laitela--accent);
   color: var(--color-laitela--accent);
   background: var(--color-laitela--base);
+  border-color: var(--color-laitela--accent);
 }
 
 .o-continuum:hover {
-  border-color: var(--color-laitela--accent);
   color: var(--color-laitela--base);
   background: var(--color-laitela--accent);
+  border-color: var(--color-laitela--accent);
 }
 </style>
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/antimatter-dimensions/TickspeedRow.vue b/src/components/tabs/antimatter-dimensions/TickspeedRow.vue
index 684c4fea80..d53c8da600 100644
--- a/src/components/tabs/antimatter-dimensions/TickspeedRow.vue
+++ b/src/components/tabs/antimatter-dimensions/TickspeedRow.vue
@@ -123,9 +123,9 @@ export default {
 }
 
 .tickspeed-btn {
-  position: relative;
   width: 30rem;
   height: 2.5rem;
+  position: relative;
   padding: 0.25rem;
 }
 
@@ -147,9 +147,9 @@ export default {
 }
 
 .tickspeed-max-btn {
-  margin-left: 0.5rem;
   width: 10rem;
   height: 2.5rem;
+  margin-left: 0.5rem;
   padding: 0.25rem;
 }
 
@@ -158,14 +158,14 @@ export default {
 }
 
 .o-continuum {
-  border-color: var(--color-laitela--accent);
   color: var(--color-laitela--accent);
   background: var(--color-laitela--base);
+  border-color: var(--color-laitela--accent);
 }
 
 .o-continuum:hover {
-  border-color: var(--color-laitela--accent);
   color: var(--color-laitela--base);
   background: var(--color-laitela--accent);
+  border-color: var(--color-laitela--accent);
 }
 </style>
diff --git a/src/components/tabs/autobuyers/AutobuyerDropdownEntry.vue b/src/components/tabs/autobuyers/AutobuyerDropdownEntry.vue
index 3e30ab7c3b..5397a80593 100644
--- a/src/components/tabs/autobuyers/AutobuyerDropdownEntry.vue
+++ b/src/components/tabs/autobuyers/AutobuyerDropdownEntry.vue
@@ -50,8 +50,8 @@ export default {
 
 <style scoped>
 .l-autobuyer-choice {
-  border-radius: 0;
   border-top: 0;
+  border-radius: 0;
   box-shadow: none;
 }
 
diff --git a/src/components/tabs/automator/AutomatorBlockSingleInput.vue b/src/components/tabs/automator/AutomatorBlockSingleInput.vue
index 3caa835808..42a93036e5 100644
--- a/src/components/tabs/automator/AutomatorBlockSingleInput.vue
+++ b/src/components/tabs/automator/AutomatorBlockSingleInput.vue
@@ -367,16 +367,16 @@ export default {
 <style scoped>
 .c-automator-single-block {
   display: flex;
+  white-space: nowrap;
   flex-direction: row;
+  height: 2.8rem;
   justify-content: center;
   align-items: center;
-  height: 2.8rem;
-  white-space: nowrap;
 }
 
 .c-automator-constant-block {
-  background: var(--color-blockmator-block-command);
   color: var(--color-blockmator-editor-background);
+  background: var(--color-blockmator-block-command);
 }
 
 .c-automator-text-input-container {
@@ -389,21 +389,21 @@ export default {
 
 .c-automator-close-text-input {
   position: absolute;
-  color: var(--color-automator-error-outline);
-  font-size: 1.5rem;
-  z-index: 1;
-  right: 0.8rem;
   top: 0.6rem;
+  right: 0.8rem;
+  z-index: 1;
+  font-size: 1.5rem;
+  color: var(--color-automator-error-outline);
 }
 
 .l-error-textbox {
-  background: var(--color-automator-error-background);
   color: yellow;
+  background: var(--color-automator-error-background);
 }
 
 .l-blob {
   font-size: 1.8rem;
+  color: #ffcc22;
   background: black;
-  color: #fc2;
 }
 </style>
diff --git a/src/components/tabs/automator/AutomatorBlocks.vue b/src/components/tabs/automator/AutomatorBlocks.vue
index 1aa7ea7130..01cb842e7a 100644
--- a/src/components/tabs/automator/AutomatorBlocks.vue
+++ b/src/components/tabs/automator/AutomatorBlocks.vue
@@ -245,11 +245,11 @@ export const automatorBlocksMap = automatorBlocks.mapToObject(b => b.cmd, b => b
 .o-automator-block-list {
   display: flex;
   width: 8.7rem;
-  text-align: center;
   height: 5.5rem;
-  font-size: 1.2rem;
   justify-content: center;
   align-items: center;
+  text-align: center;
+  font-size: 1.2rem;
 }
 
 .o-drag-cancel-region {
diff --git a/src/components/tabs/automator/AutomatorButton.vue b/src/components/tabs/automator/AutomatorButton.vue
index d748739390..12be7459af 100644
--- a/src/components/tabs/automator/AutomatorButton.vue
+++ b/src/components/tabs/automator/AutomatorButton.vue
@@ -14,11 +14,11 @@ export default {
 <style scoped>
 .c-automator__button {
   width: 3.3rem;
+  color: var(--color-automator-docs-font);
+  background-color: var(--color-automator-controls-inactive);
   border: var(--var-border-width, 0.2rem) solid var(--color-automator-controls-border);
   border-radius: var(--var-border-radius, 0.3rem);
   margin: 0.4rem;
   cursor: pointer;
-  color: var(--color-automator-docs-font);
-  background-color: var(--color-automator-controls-inactive);
 }
 </style>
diff --git a/src/components/tabs/automator/AutomatorDataTransferPage.vue b/src/components/tabs/automator/AutomatorDataTransferPage.vue
index dedd81d971..adc7996405 100644
--- a/src/components/tabs/automator/AutomatorDataTransferPage.vue
+++ b/src/components/tabs/automator/AutomatorDataTransferPage.vue
@@ -67,9 +67,9 @@ export default {
 }
 
 .c-import-button {
-  margin: 1rem 1rem -1rem;
-  border-radius: var(--var-border-radius, 0.4rem);
   border-width: var(--var-border-width, 0.2rem);
+  border-radius: var(--var-border-radius, 0.4rem);
+  margin: 1rem 1rem -1rem;
   cursor: pointer;
 }
 </style>
diff --git a/src/components/tabs/automator/AutomatorDataTransferSingleEntry.vue b/src/components/tabs/automator/AutomatorDataTransferSingleEntry.vue
index 2a27305b2e..e12c1cc689 100644
--- a/src/components/tabs/automator/AutomatorDataTransferSingleEntry.vue
+++ b/src/components/tabs/automator/AutomatorDataTransferSingleEntry.vue
@@ -107,9 +107,9 @@ export default {
 
 <style scoped>
 .l-entry-padding {
+  overflow-wrap: break-word;
   border: solid 0.1rem var(--color-automator-docs-font);
   border-radius: var(--var-border-radius, 0.5rem);
-  overflow-wrap: break-word;
   padding: 1rem 1.5rem;
 }
 
diff --git a/src/components/tabs/automator/AutomatorDefinePage.vue b/src/components/tabs/automator/AutomatorDefinePage.vue
index 95819b574e..f112afa82d 100644
--- a/src/components/tabs/automator/AutomatorDefinePage.vue
+++ b/src/components/tabs/automator/AutomatorDefinePage.vue
@@ -111,7 +111,7 @@ export default {
   flex-direction: column;
   border: solid 0.1rem var(--color-automator-docs-font);
   border-radius: var(--var-border-radius, 0.5rem);
-  padding: 0.5rem;
   margin-top: 1rem;
+  padding: 0.5rem;
 }
 </style>
diff --git a/src/components/tabs/automator/AutomatorDefineSingleEntry.vue b/src/components/tabs/automator/AutomatorDefineSingleEntry.vue
index e663b7df08..6f070ddc66 100644
--- a/src/components/tabs/automator/AutomatorDefineSingleEntry.vue
+++ b/src/components/tabs/automator/AutomatorDefineSingleEntry.vue
@@ -141,12 +141,12 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
+  color: var(--color-automator-docs-font);
+  background-color: var(--color-automator-controls-inactive);
   border: var(--var-border-width, 0.2rem) solid var(--color-automator-controls-border);
   border-radius: var(--var-border-radius, 0.3rem);
   margin: 0.1rem -0.4rem 0.1rem 0.6rem;
   cursor: pointer;
-  color: var(--color-automator-docs-font);
-  background-color: var(--color-automator-controls-inactive);
 }
 
 .c-delete-button:hover {
@@ -170,11 +170,11 @@ export default {
   display: inline-block;
   font-family: Typewriter, serif;
   font-size: 1.1rem;
+  color: #00ac00;
   background: var(--color-blockmator-block-background);
   border: 0.1rem solid var(--color-blockmator-block-border);
   border-radius: var(--var-border-radius, 0.5rem);
   padding: 0.5rem;
-  color: #00ac00;
 }
 
 .l-error-textbox {
@@ -182,8 +182,8 @@ export default {
 }
 
 .l-limit-textbox {
-  border-style: dotted;
   border-color: var(--color-automator-error-outline);
+  border-style: dotted;
 }
 
 .c-alias {
diff --git a/src/components/tabs/automator/AutomatorDocs.vue b/src/components/tabs/automator/AutomatorDocs.vue
index 447bf95729..bb5202a61e 100644
--- a/src/components/tabs/automator/AutomatorDocs.vue
+++ b/src/components/tabs/automator/AutomatorDocs.vue
@@ -375,8 +375,8 @@ export default {
 }
 
 .l-automator__script-names {
-  flex-grow: 1;
   display: flex;
+  flex-grow: 1;
   flex-direction: row;
   justify-content: space-evenly;
   align-items: center;
diff --git a/src/components/tabs/automator/AutomatorDocsIntroPage.vue b/src/components/tabs/automator/AutomatorDocsIntroPage.vue
index bb3c4c84fe..35b62408f4 100644
--- a/src/components/tabs/automator/AutomatorDocsIntroPage.vue
+++ b/src/components/tabs/automator/AutomatorDocsIntroPage.vue
@@ -67,11 +67,11 @@ export default {
 
 <style scoped>
 .c-automator-button-icon {
-  padding: 0.3rem 0.8rem;
   width: 3.3rem;
-  border: var(--var-border-width, 0.2rem) solid var(--color-automator-controls-border);
-  border-radius: var(--var-border-radius, 0.3rem);
   color: var(--color-automator-docs-font);
   background-color: var(--color-automator-controls-inactive);
+  border: var(--var-border-width, 0.2rem) solid var(--color-automator-controls-border);
+  border-radius: var(--var-border-radius, 0.3rem);
+  padding: 0.3rem 0.8rem;
 }
 </style>
diff --git a/src/components/tabs/automator/AutomatorDocsTemplateList.vue b/src/components/tabs/automator/AutomatorDocsTemplateList.vue
index a4b421450b..fcb45ccf64 100644
--- a/src/components/tabs/automator/AutomatorDocsTemplateList.vue
+++ b/src/components/tabs/automator/AutomatorDocsTemplateList.vue
@@ -94,9 +94,9 @@ export default {
 
 <style scoped>
 .c-automator-docs-template--button {
-  margin: 0.4rem;
-  border-radius: var(--var-border-radius, 0.4rem);
   border-width: var(--var-border-width, 0.2rem);
+  border-radius: var(--var-border-radius, 0.4rem);
+  margin: 0.4rem;
   cursor: pointer;
 }
 
diff --git a/src/components/tabs/automator/AutomatorScriptDropdownEntryList.vue b/src/components/tabs/automator/AutomatorScriptDropdownEntryList.vue
index 22840e4bf0..f13199626e 100644
--- a/src/components/tabs/automator/AutomatorScriptDropdownEntryList.vue
+++ b/src/components/tabs/automator/AutomatorScriptDropdownEntryList.vue
@@ -120,13 +120,13 @@ export default {
 
 <style scoped>
 .l-script-option {
-  border-radius: 0;
   border-bottom: 0;
+  border-radius: 0;
 }
 
 .c-script-option-hover-effect:hover {
-  filter: brightness(70%);
   background-color: var(--color-automator-active-line-background);
+  filter: brightness(70%);
 }
 
 .l-script-option:first-child {
diff --git a/src/components/tabs/celestial-enslaved/EnslavedTab.vue b/src/components/tabs/celestial-enslaved/EnslavedTab.vue
index 56b4f861d1..2abfcaa593 100644
--- a/src/components/tabs/celestial-enslaved/EnslavedTab.vue
+++ b/src/components/tabs/celestial-enslaved/EnslavedTab.vue
@@ -352,8 +352,8 @@ export default {
 }
 
 .l-fixed-setting {
-  cursor: pointer;
-  pointer-events: none;
   filter: brightness(70%);
+  pointer-events: none;
+  cursor: pointer;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/tabs/celestial-pelle/PelleBarPanel.vue b/src/components/tabs/celestial-pelle/PelleBarPanel.vue
index 4191460e81..598718e1a4 100644
--- a/src/components/tabs/celestial-pelle/PelleBarPanel.vue
+++ b/src/components/tabs/celestial-pelle/PelleBarPanel.vue
@@ -68,10 +68,10 @@ export default {
 
 <style scoped>
 .c-collapse-icon-clickable {
+  width: 3rem;
   position: absolute;
   top: 50%;
   left: 1.5rem;
-  width: 3rem;
   align-content: center;
   transform: translateY(-50%);
   cursor: pointer;
@@ -84,7 +84,7 @@ export default {
 }
 
 .o-strike-warning {
-  color: var(--color-pelle--base);
   font-size: 1.4rem;
+  color: var(--color-pelle--base);
 }
 </style>
diff --git a/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue b/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue
index 8d947c8c34..afd4dab869 100644
--- a/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue
+++ b/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue
@@ -33,6 +33,7 @@ export default {
       return GalaxyGeneratorUpgrades.all;
     },
     galaxyText() {
+      if (Theme.current().name === "S9") return "";
       let text = format(Math.max(this.galaxies, 0), 2);
       if (this.galaxies < 0) text += ` [${format(this.galaxies, 2)}]`;
       return text;
@@ -52,7 +53,7 @@ export default {
       if (this.isCollapsed || !this.isUnlocked) return;
       this.galaxies = player.galaxies + GalaxyGenerator.galaxies;
       this.generatedGalaxies = GalaxyGenerator.generatedGalaxies;
-      this.galaxiesPerSecond = GalaxyGenerator.gainPerSecond;
+      this.galaxiesPerSecond = (Theme.current().name === "S9") ? "" : GalaxyGenerator.gainPerSecond;
       this.cap = GalaxyGenerator.generationCap;
       this.capRift = GalaxyGenerator.capRift;
       this.sacrificeActive = GalaxyGenerator.sacrificeActive;
@@ -156,10 +157,10 @@ export default {
 
 <style scoped>
 .c-collapse-icon-clickable {
+  width: 3rem;
   position: absolute;
   top: 50%;
   left: 1.5rem;
-  width: 3rem;
   align-content: center;
   transform: translateY(-50%);
   cursor: pointer;
diff --git a/src/components/tabs/celestial-pelle/PelleTab.vue b/src/components/tabs/celestial-pelle/PelleTab.vue
index 107b9d75ca..467525d8c2 100644
--- a/src/components/tabs/celestial-pelle/PelleTab.vue
+++ b/src/components/tabs/celestial-pelle/PelleTab.vue
@@ -147,12 +147,12 @@ export default {
 
 .pelle-unlock-requirements {
   width: 50rem;
-  padding: 0.5rem;
   font-size: 2.4rem;
   color: var(--color-pelle--base);
   background: black;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.5rem);
+  padding: 0.5rem;
 }
 
 .pelle-doom-button {
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/celestial-pelle/PelleUpgradePanel.vue b/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue
index 45188a737d..ab957cfbb7 100644
--- a/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue
+++ b/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue
@@ -137,10 +137,10 @@ export default {
 
 <style scoped>
 .c-collapse-icon-clickable {
+  width: 3rem;
   position: absolute;
   top: 50%;
   left: 1.5rem;
-  width: 3rem;
   align-content: center;
   transform: translateY(-50%);
   cursor: pointer;
diff --git a/src/components/tabs/glyphs/SingleGlyphCustomzationPanel.vue b/src/components/tabs/glyphs/SingleGlyphCustomzationPanel.vue
index a842efb534..bec4025991 100644
--- a/src/components/tabs/glyphs/SingleGlyphCustomzationPanel.vue
+++ b/src/components/tabs/glyphs/SingleGlyphCustomzationPanel.vue
@@ -128,15 +128,15 @@ export default {
 <style scoped>
 .c-single-glyph-cosmetic {
   display: flex;
-  justify-content: space-between;
-  align-items: center;
   width: calc(100% - 1rem);
   height: 8rem;
+  justify-content: space-between;
+  align-items: center;
   font-size: 1.2rem;
   border: 0.1rem solid #b8b8b8;
   border-radius: var(--var-border-radius, 0.5rem);
-  padding: 0.5rem;
   margin-top: 1rem;
+  padding: 0.5rem;
   user-select: none;
 }
 
diff --git a/src/components/tabs/glyphs/sidebar/GlyphFilterPanel.vue b/src/components/tabs/glyphs/sidebar/GlyphFilterPanel.vue
index 541a471450..105768e2b7 100644
--- a/src/components/tabs/glyphs/sidebar/GlyphFilterPanel.vue
+++ b/src/components/tabs/glyphs/sidebar/GlyphFilterPanel.vue
@@ -392,9 +392,9 @@ export default {
 }
 
 .c-filter-extra-btns {
-  position: absolute;
   display: flex;
   flex-direction: row;
+  position: absolute;
   top: 0;
   z-index: 2;
   font-size: 1.3rem;
@@ -410,25 +410,25 @@ export default {
 }
 
 .l-top-left-btn {
-  cursor: pointer;
+  width: 2.5rem;
   border: var(--var-border-width, 0.2rem) solid;
   border-radius: var(--var-border-radius, 0.2rem);
-  width: 2.5rem;
   margin: 0.5rem 0 0 0.5rem;
   padding: 0.5rem;
+  cursor: pointer;
 }
 
 .l-top-right-btn {
   display: flex;
+  width: 2rem;
+  height: 2rem;
   justify-content: center;
   align-items: center;
-  cursor: pointer;
   border: var(--var-border-width, 0.2rem) solid;
   border-radius: var(--var-border-radius, 0.2rem);
-  width: 2rem;
-  height: 2rem;
   margin: 0.5rem 0.5rem 0 0;
   padding: 0.2rem;
+  cursor: pointer;
 }
 
 .o-borderless {
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/imaginary-upgrades/ImaginaryUpgradesTab.vue b/src/components/tabs/imaginary-upgrades/ImaginaryUpgradesTab.vue
index 6c543d0ef0..5c71c8dd9f 100644
--- a/src/components/tabs/imaginary-upgrades/ImaginaryUpgradesTab.vue
+++ b/src/components/tabs/imaginary-upgrades/ImaginaryUpgradesTab.vue
@@ -75,8 +75,8 @@ export default {
 
 <style scoped>
 .c-cap-text {
-  color: var(--color-text);
   font-size: 1.5rem;
+  color: var(--color-text);
 }
 
 .c-info-text {
diff --git a/src/components/tabs/infinity-dimensions/ModernInfinityDimensionRow.vue b/src/components/tabs/infinity-dimensions/ModernInfinityDimensionRow.vue
index 322cf4bf56..95bff6c69c 100644
--- a/src/components/tabs/infinity-dimensions/ModernInfinityDimensionRow.vue
+++ b/src/components/tabs/infinity-dimensions/ModernInfinityDimensionRow.vue
@@ -158,8 +158,9 @@ export default {
 
 <style scoped>
 .c-modern-dim-tooltip-container .c-modern-dim-purchase-count-tooltip {
-  position: absolute;
+  visibility: hidden;
   width: 20rem;
+  position: absolute;
   top: 50%;
   font-size: 1.3rem;
   line-height: 1.6rem;
@@ -167,9 +168,8 @@ export default {
   background: black;
   border: 0.1rem solid var(--color-text);
   border-radius: var(--var-border-width, 0.5rem);
+  padding: 0.5rem;
   /* Buttons are 40rem wide, tooltip is 20rem */
   transform: translate(calc(-175% - 1rem), -50%);
-  padding: 0.5rem;
-  visibility: hidden;
 }
 </style>
diff --git a/src/components/tabs/normal-achievements/NormalAchievement.vue b/src/components/tabs/normal-achievements/NormalAchievement.vue
index 75d40ab0fc..e08dd79007 100644
--- a/src/components/tabs/normal-achievements/NormalAchievement.vue
+++ b/src/components/tabs/normal-achievements/NormalAchievement.vue
@@ -306,8 +306,8 @@ export default {
   width: 1.5rem;
   height: 1.5rem;
   position: absolute;
-  left: 0;
   bottom: 0;
+  left: 0;
   font-size: 1rem;
   color: black;
   background: #5ac467;
diff --git a/src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue b/src/components/tabs/past-prestige-runs/PastPrestigeRunsContainer.vue
index 51bbefdb78..5ccda25ed5 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";
@@ -292,14 +292,14 @@ export default {
 
 .c-empty-row {
   display: block;
-  border: 0.05rem solid #999999;
+  width: 100.2%;
   color: var(--color-text);
-  width: 100%;
+  border: 0.05rem solid #999999;
+  margin: -0.05rem;
   padding: 0.2rem 0;
-  margin: -0.1rem;
 }
 
 .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..70f944fa08 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.
@@ -266,7 +266,7 @@ export default {
 }
 
 .modified-cap {
-  margin: -0.8rem 0 0.8rem;
   font-weight: bold;
+  margin: -0.8rem 0 0.8rem;
 }
 </style>
diff --git a/src/components/tabs/shop/ShopTab.vue b/src/components/tabs/shop/ShopTab.vue
index fa11463418..3e68d0f482 100644
--- a/src/components/tabs/shop/ShopTab.vue
+++ b/src/components/tabs/shop/ShopTab.vue
@@ -252,9 +252,9 @@ export default {
 
 .l-shop-buttons-container {
   display: flex;
-  justify-content: center;
   flex-wrap: wrap;
   width: 93rem;
+  justify-content: center;
   margin: auto;
 }
 
diff --git a/src/components/tabs/speedrun-milestones/PreviousSpeedrunInfo.vue b/src/components/tabs/speedrun-milestones/PreviousSpeedrunInfo.vue
index 7d1c2333ad..c1a713098c 100644
--- a/src/components/tabs/speedrun-milestones/PreviousSpeedrunInfo.vue
+++ b/src/components/tabs/speedrun-milestones/PreviousSpeedrunInfo.vue
@@ -108,10 +108,10 @@ export default {
 }
 
 .c-no-record {
+  width: 100%;
   align-items: center;
   font-size: 1.3rem;
   padding: 0.65rem;
-  width: 100%;
 }
 
 .o-icon {
diff --git a/src/components/tabs/speedrun-milestones/PreviousSpeedrunTab.vue b/src/components/tabs/speedrun-milestones/PreviousSpeedrunTab.vue
index a4f29f7d9f..2c43c38aac 100644
--- a/src/components/tabs/speedrun-milestones/PreviousSpeedrunTab.vue
+++ b/src/components/tabs/speedrun-milestones/PreviousSpeedrunTab.vue
@@ -158,10 +158,10 @@ export default {
 .c-run-page-nav {
   display: flex;
   flex-direction: row;
+  width: 60rem;
   justify-content: space-between;
   align-items: center;
   font-size: 1.3rem;
-  width: 60rem;
 }
 
 .c-previous-runs {
@@ -174,9 +174,9 @@ export default {
 .c-single-run {
   display: flex;
   flex-direction: row;
-  padding: 0.5rem;
-  border: 0.1rem solid;
   width: 100rem;
+  border: 0.1rem solid;
+  padding: 0.5rem;
 }
 
 .o-selected-btn {
@@ -186,17 +186,17 @@ export default {
 .c-legend {
   display: flex;
   flex-direction: row;
+  width: 95rem;
   justify-content: space-around;
   align-items: center;
-  width: 95rem;
 }
 
 .c-legend-cell {
   display: flex;
   flex-direction: row;
+  width: 30rem;
   justify-content: flex-start;
   align-items: center;
-  width: 30rem;
   font-size: 1.5rem;
 }
 
@@ -204,9 +204,9 @@ export default {
   display: grid;
   width: 2rem;
   height: 2rem;
-  margin: 0.3rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-text);
   border-radius: var(--var-border-radius, 0.5rem);
+  margin: 0.3rem;
 }
 
 .l-milestone-none {
diff --git a/src/components/tabs/statistics/MultiplierBreakdownEntry.vue b/src/components/tabs/statistics/MultiplierBreakdownEntry.vue
index eac5167603..c05e163013 100644
--- a/src/components/tabs/statistics/MultiplierBreakdownEntry.vue
+++ b/src/components/tabs/statistics/MultiplierBreakdownEntry.vue
@@ -463,13 +463,13 @@ export default {
 .c-multiplier-entry-container {
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
   width: 100%;
   max-width: 100rem;
-  border: var(--var-border-width, 0.2rem) solid var(--color-text);
-  padding: 0.5rem;
+  justify-content: space-between;
   font-weight: normal;
   background-color: var(--color-base);
+  border: var(--var-border-width, 0.2rem) solid var(--color-text);
+  padding: 0.5rem;
 
   -webkit-tap-highlight-color: transparent;
 }
@@ -479,26 +479,26 @@ export default {
 }
 
 .c-stacked-bars {
-  position: relative;
   width: 5rem;
+  position: relative;
   background-color: var(--color-disabled);
   margin-right: 1.5rem;
 }
 
 .c-bar-overlay {
   display: flex;
+  overflow: hidden;
   width: 100%;
   height: 100%;
-  top: -5%;
   position: absolute;
+  top: -5%;
+  z-index: 1;
   justify-content: center;
   align-items: center;
   font-size: 1.5rem;
+  opacity: 0.8;
   pointer-events: none;
   user-select: none;
-  overflow: hidden;
-  opacity: 0.8;
-  z-index: 1;
 }
 
 .c-bar-highlight {
@@ -515,23 +515,23 @@ export default {
 }
 
 .c-info-list {
-  height: 100%;
   width: 90%;
+  height: 100%;
   padding: 0.2rem;
 }
 
 .c-display-settings {
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
   width: 8rem;
+  justify-content: space-between;
 }
 
 .c-change-display-btn {
   display: flex;
+  width: 3rem;
   justify-content: center;
   align-items: center;
-  width: 3rem;
   margin: 0 0.5rem;
 }
 
@@ -540,9 +540,9 @@ export default {
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
-  padding-left: 0.5rem;
-  margin-bottom: 1rem;
   color: var(--color-text);
+  margin-bottom: 1rem;
+  padding-left: 0.5rem;
 }
 
 .c-no-effect {
@@ -553,16 +553,16 @@ export default {
 .c-single-entry {
   text-align: left;
   color: var(--color-text);
-  padding: 0.2rem 0.5rem;
-  margin: 0.2rem;
   border: 0.1rem dashed;
-  cursor: pointer;
+  margin: 0.2rem;
+  padding: 0.2rem 0.5rem;
   user-select: none;
+  cursor: pointer;
 }
 
 .c-single-entry-highlight {
-  border: 0.1rem solid;
   font-weight: bold;
+  border: 0.1rem solid;
   animation: a-glow-text 2s infinite;
 }
 
@@ -571,8 +571,8 @@ export default {
 }
 
 .c-dilation-entry {
-  border: 0.2rem solid;
   font-weight: bold;
+  border: 0.2rem solid;
   animation: a-glow-dilation-nerf 3s infinite;
 }
 
diff --git a/src/components/tabs/statistics/MultiplierBreakdownTab.vue b/src/components/tabs/statistics/MultiplierBreakdownTab.vue
index 9199d02604..f7c9d4a40a 100644
--- a/src/components/tabs/statistics/MultiplierBreakdownTab.vue
+++ b/src/components/tabs/statistics/MultiplierBreakdownTab.vue
@@ -111,22 +111,21 @@ export default {
 
 <style scoped>
 .c-list-container {
-  position: relative;
   width: 100rem;
+  position: relative;
 }
 
 .l-multiplier-subtab-btn-container {
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
   width: 100rem;
   height: calc(4rem - var(--var-border-radius, 0.2rem));
+  justify-content: space-between;
 }
 
 .c-multiplier-subtab-btn {
   width: 100%;
   height: 4rem;
-  margin: 0 0.5rem -0.1rem;
   z-index: 1;
   text-align: center;
   font-family: Typewriter;
@@ -136,6 +135,7 @@ export default {
   background-color: var(--color-base);
   border: var(--var-border-width, 0.2rem) solid;
   border-radius: var(--var-border-radius, 0.5rem) var(--var-border-radius, 0.5rem) 0 0;
+  margin: 0 0.5rem -0.1rem;
   cursor: pointer;
 }
 
@@ -146,24 +146,24 @@ export default {
 }
 
 .c-multiplier-tab-text-line {
-  color: var(--color-text);
   font-size: 1.3rem;
+  color: var(--color-text);
 }
 
 .c-symbol-overlay {
   display: flex;
   width: 100%;
   height: 100%;
-  top: -5%;
   position: absolute;
+  top: -5%;
+  z-index: 1;
   justify-content: center;
   align-items: center;
   font-size: 40rem;
+  opacity: 0.2;
   color: var(--color-text);
   text-shadow: 0 0 3rem;
   pointer-events: none;
   user-select: none;
-  opacity: 0.2;
-  z-index: 1;
 }
 </style>
diff --git a/src/components/tabs/time-dilation/TimeDilationTab.vue b/src/components/tabs/time-dilation/TimeDilationTab.vue
index e343c7e467..7bcd1884ea 100644
--- a/src/components/tabs/time-dilation/TimeDilationTab.vue
+++ b/src/components/tabs/time-dilation/TimeDilationTab.vue
@@ -199,8 +199,8 @@ export default {
 
 <style scoped>
 .max-accent {
-  color: var(--color-dilation);
   font-size: 1.5rem;
+  color: var(--color-dilation);
   text-shadow: 0 0 0.2rem var(--color-reality-dark);
   cursor: default;
 }
diff --git a/src/components/tabs/time-dimensions/ClassicTimeDimensionsTab.vue b/src/components/tabs/time-dimensions/ClassicTimeDimensionsTab.vue
index 03633919c2..5bd99a5c01 100644
--- a/src/components/tabs/time-dimensions/ClassicTimeDimensionsTab.vue
+++ b/src/components/tabs/time-dimensions/ClassicTimeDimensionsTab.vue
@@ -23,6 +23,15 @@ export default {
   },
   computed: {
     costIncreases: () => TimeDimension(1).costIncreaseThresholds,
+    timeShardsText() {
+      // Rounding
+      if (this.timeShards.lt(1.05) && this.timeShards.gte(0.95)) return "Time Shard";
+      return "Time Shards";
+    },
+    tickspeedUpgradesText() {
+      if (player.totalTickGained === 1) return "Tickspeed Upgrade";
+      return "Tickspeed Upgrades";
+    },
   },
   methods: {
     update() {
@@ -67,8 +76,8 @@ export default {
     <div>
       <p>
         You have gained
-        <span class="c-time-dim-description__accent">{{ formatInt(totalUpgrades) }}</span> Tickspeed upgrades from
-        <span class="c-time-dim-description__accent">{{ format(timeShards, 2, 1) }}</span> Time Shards.
+        <span class="c-time-dim-description__accent">{{ formatInt(totalUpgrades) }}</span> {{ tickspeedUpgradesText }} from
+        <span class="c-time-dim-description__accent">{{ format(timeShards, 2, 1) }}</span> {{ timeShardsText }}.
       </p>
       <p>
         Next Tickspeed upgrade at
diff --git a/src/components/tabs/time-dimensions/ModernTimeDimensionRow.vue b/src/components/tabs/time-dimensions/ModernTimeDimensionRow.vue
index 4c48c1bd39..9581145f35 100644
--- a/src/components/tabs/time-dimensions/ModernTimeDimensionRow.vue
+++ b/src/components/tabs/time-dimensions/ModernTimeDimensionRow.vue
@@ -167,8 +167,9 @@ export default {
 
 <style scoped>
 .c-modern-dim-tooltip-container .c-modern-dim-purchase-count-tooltip {
-  position: absolute;
+  visibility: hidden;
   width: 20rem;
+  position: absolute;
   top: 50%;
   font-size: 1.3rem;
   line-height: 1.6rem;
@@ -176,9 +177,8 @@ export default {
   background: black;
   border: 0.1rem solid var(--color-text);
   border-radius: var(--var-border-width, 0.5rem);
+  padding: 0.5rem;
   /* Buttons are 40rem wide, tooltip is 20rem */
   transform: translate(calc(-175% - 1rem), -50%);
-  padding: 0.5rem;
-  visibility: hidden;
 }
 </style>
diff --git a/src/components/tabs/time-dimensions/ModernTimeDimensionsTab.vue b/src/components/tabs/time-dimensions/ModernTimeDimensionsTab.vue
index b0a0c14715..551d342dc8 100644
--- a/src/components/tabs/time-dimensions/ModernTimeDimensionsTab.vue
+++ b/src/components/tabs/time-dimensions/ModernTimeDimensionsTab.vue
@@ -23,6 +23,15 @@ export default {
   },
   computed: {
     costIncreases: () => TimeDimension(1).costIncreaseThresholds,
+    timeShardsText() {
+      // Rounding
+      if (this.timeShards.lt(1.05) && this.timeShards.gte(0.95)) return "Time Shard";
+      return "Time Shards";
+    },
+    tickspeedUpgradesText() {
+      if (player.totalTickGained === 1) return "Tickspeed Upgrade";
+      return "Tickspeed Upgrades";
+    },
   },
   methods: {
     update() {
@@ -67,8 +76,8 @@ export default {
     <div>
       <p>
         You have gained
-        <span class="c-time-dim-description__accent">{{ formatInt(totalUpgrades) }}</span> Tickspeed upgrades from
-        <span class="c-time-dim-description__accent">{{ format(timeShards, 2, 1) }}</span> Time Shards.
+        <span class="c-time-dim-description__accent">{{ formatInt(totalUpgrades) }}</span> {{ tickspeedUpgradesText }} from
+        <span class="c-time-dim-description__accent">{{ format(timeShards, 2, 1) }}</span> {{ timeShardsText }}.
       </p>
       <p>
         Next Tickspeed upgrade at
diff --git a/src/components/tabs/time-studies/DilationTimeStudy.vue b/src/components/tabs/time-studies/DilationTimeStudy.vue
index d2a4faf1ab..2ff95f8819 100644
--- a/src/components/tabs/time-studies/DilationTimeStudy.vue
+++ b/src/components/tabs/time-studies/DilationTimeStudy.vue
@@ -62,6 +62,10 @@ export default {
     clickHandler() {
       switch (this.id) {
         case 1:
+          if ((player.sidebarCurrencyUnlocks >> 3) % 2 === 0) {
+            player.sidebarCurrencyUnlocks += 8;
+            EventHub.dispatch(GAME_EVENT.SIDEBAR_CURRENCY_NEW_UNLOCKED);
+          }
           return () => Tab.eternity.dilation.show();
         case 2:
         case 3:
diff --git a/src/components/ui-modes/HeaderChallengeDisplay.vue b/src/components/ui-modes/HeaderChallengeDisplay.vue
index 1b70fe2380..826c97788b 100644
--- a/src/components/ui-modes/HeaderChallengeDisplay.vue
+++ b/src/components/ui-modes/HeaderChallengeDisplay.vue
@@ -233,8 +233,8 @@ export default {
 }
 
 .l-challenge-display--clickable {
-  cursor: pointer;
   user-select: none;
+  cursor: pointer;
 }
 
 .l-challenge-display--clickable:hover {
diff --git a/src/components/ui-modes/HeaderPrestigeGroup.vue b/src/components/ui-modes/HeaderPrestigeGroup.vue
index 4216b25be5..c0bfcdee90 100644
--- a/src/components/ui-modes/HeaderPrestigeGroup.vue
+++ b/src/components/ui-modes/HeaderPrestigeGroup.vue
@@ -25,26 +25,26 @@ export default {
 .c-prestige-info-blocks {
   display: flex;
   flex-direction: row;
-  height: 14rem;
   width: 100%;
+  height: 14rem;
   color: var(--color-text);
 }
 
 .l-game-header__eternity {
+  width: 22rem;
   position: absolute;
   left: calc(25% - 22rem);
-  width: 22rem;
 }
 
 .l-game-header__center {
+  width: 50rem;
   position: absolute;
   right: calc(50% - 25rem);
-  width: 50rem;
 }
 
 .l-game-header__infinity {
+  width: 22rem;
   position: absolute;
   right: calc(25% - 22rem);
-  width: 22rem;
 }
 </style>
diff --git a/src/components/ui-modes/classic/ClassicSubtabButton.vue b/src/components/ui-modes/classic/ClassicSubtabButton.vue
index 7f832bc735..957315669a 100644
--- a/src/components/ui-modes/classic/ClassicSubtabButton.vue
+++ b/src/components/ui-modes/classic/ClassicSubtabButton.vue
@@ -63,8 +63,8 @@ export default {
 
 <style scoped>
 .o-tab-btn {
-  position: relative;
   height: 2.5rem;
+  position: relative;
   vertical-align: middle;
   padding-top: 0.2rem;
 }
diff --git a/src/components/ui-modes/classic/ClassicTabButton.vue b/src/components/ui-modes/classic/ClassicTabButton.vue
index 8bf1036433..553be21ad4 100644
--- a/src/components/ui-modes/classic/ClassicTabButton.vue
+++ b/src/components/ui-modes/classic/ClassicTabButton.vue
@@ -61,8 +61,8 @@ export default {
 
 <style scoped>
 .o-tab-btn {
-  position: relative;
   height: 3.1rem;
+  position: relative;
   vertical-align: middle;
   margin: 0.2rem;
   margin-bottom: 0.7rem;
diff --git a/src/components/ui-modes/modern/ModernSidebarCurrency.vue b/src/components/ui-modes/modern/ModernSidebarCurrency.vue
index adc44a1a9a..7614823e2a 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: {
@@ -22,10 +24,25 @@ export default {
     displayValue() {
       // RM + iM seems to cause strange, undesirable linebreaks
       return this.resource.formatValue(this.resourceValue).replace(" + ", "+");
-    }
+    },
+  },
+  created() {
+    this.on$(GAME_EVENT.SIDEBAR_CURRENCY_NEW_UNLOCKED, () => {
+      // This is stupid but calling a recompute didnt work, and this does.
+      this.cycleResource(1);
+      this.cycleResource(-1);
+    });
   },
   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/big-crunch.js b/src/core/big-crunch.js
index f176fc4abc..11daa86107 100644
--- a/src/core/big-crunch.js
+++ b/src/core/big-crunch.js
@@ -69,6 +69,11 @@ function bigCrunchGiveRewards() {
   Currency.infinityPoints.add(infinityPoints);
   Currency.infinities.add(gainedInfinities().round());
 
+  if (player.sidebarCurrencyUnlocks % 2 === 0) {
+    player.sidebarCurrencyUnlocks += 1;
+    EventHub.dispatch(GAME_EVENT.SIDEBAR_CURRENCY_NEW_UNLOCKED);
+  }
+
   bigCrunchTabChange(!PlayerProgress.infinityUnlocked());
   bigCrunchCheckUnlocks();
 }
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..ed5ce7d83c 100644
--- a/src/core/celestials/pelle/pelle.js
+++ b/src/core/celestials/pelle/pelle.js
@@ -85,6 +85,10 @@ export const Pelle = {
     player.reality.automator.state.repeat = false;
     player.reality.automator.state.forceRestart = false;
     if (BlackHoles.arePaused) BlackHoles.togglePause();
+    if ((player.sidebarCurrencyUnlocks >> 8) % 2 === 0) {
+      player.sidebarCurrencyUnlocks += 256;
+      EventHub.dispatch(GAME_EVENT.SIDEBAR_CURRENCY_NEW_UNLOCKED);
+    }
     player.celestials.pelle.doomed = true;
     Pelle.armageddon(false);
     respecTimeStudies(true);
@@ -191,7 +195,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 +204,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 +221,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 +245,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..59d817e3f2 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,59 @@ 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] instanceof Decimal) {
+      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 (typeof value[item] === "number" && typeof value2[item] === "number") {
+      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 there is a mismatch (one decimal and one number) just override the item entirely, as it must have been modified through console
+    if (value[item] instanceof Decimal && typeof value2[item] === "number") {
+      value[item] = value2[item];
+    }
+    if (value2[item] instanceof Decimal && typeof value[item] === "number") {
+      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/eternity.js b/src/core/eternity.js
index 60d2c357b8..acc66451cd 100644
--- a/src/core/eternity.js
+++ b/src/core/eternity.js
@@ -12,8 +12,18 @@ function giveEternityRewards(auto) {
     Tab.dimensions.time.show();
   }
 
+  if ((player.sidebarCurrencyUnlocks >> 2) % 2 === 0) {
+    player.sidebarCurrencyUnlocks += 4;
+    EventHub.dispatch(GAME_EVENT.SIDEBAR_CURRENCY_NEW_UNLOCKED);
+  }
+
   Currency.eternities.add(newEternities);
 
+  Currency.infinitiesBanked.value = Currency.infinitiesBanked.value.plusEffectsOf(
+    Achievement(131).effects.bankedInfinitiesGain,
+    TimeStudy(191)
+  );
+
   if (EternityChallenge.isRunning) {
     const challenge = EternityChallenge.current;
     challenge.addCompletion(false);
@@ -43,11 +53,6 @@ function giveEternityRewards(auto) {
   player.records.bestEternity.bestEPminReality =
     player.records.bestEternity.bestEPminReality.max(player.records.thisEternity.bestEPmin);
 
-  Currency.infinitiesBanked.value = Currency.infinitiesBanked.value.plusEffectsOf(
-    Achievement(131).effects.bankedInfinitiesGain,
-    TimeStudy(191)
-  );
-
   if (Effarig.isRunning && !EffarigUnlock.eternity.isUnlocked) {
     EffarigUnlock.eternity.unlock();
     beginProcessReality(getRealityProps(true));
diff --git a/src/core/event-hub.js b/src/core/event-hub.js
index 0c2fe14230..af56e5285d 100644
--- a/src/core/event-hub.js
+++ b/src/core/event-hub.js
@@ -109,6 +109,10 @@ window.GAME_EVENT = {
   // event, not handled by the event hub
   ACHIEVEMENT_EVENT_OTHER: "ACHIEVEMENT_EVENT_OTHER",
 
+  // Used to forcefully update the sidebar. This occurs when the player reaches a new sidebar currency
+  // that has yet to be unlocked. If we don't do this, weird stuff goes on.
+  SIDEBAR_CURRENCY_NEW_UNLOCKED: "SIDEBAR_CURRENCY_NEW_UNLOCKED",
+
   ENTER_PRESSED: "ENTER_PRESSED",
   ARROW_KEY_PRESSED: "ARROW_KEY_PRESSED",
 
diff --git a/src/core/glyphs/glyph-purge-handler.js b/src/core/glyphs/glyph-purge-handler.js
index d9b4c54883..4322406835 100644
--- a/src/core/glyphs/glyph-purge-handler.js
+++ b/src/core/glyphs/glyph-purge-handler.js
@@ -21,6 +21,7 @@ export const GlyphSacrificeHandler = {
   handleSpecialGlyphTypes(glyph) {
     switch (glyph.type) {
       case "companion":
+        ui.chosenCompanionIDx = glyph.idx;
         Modal.deleteCompanion.show();
         return true;
       case "cursed":
diff --git a/src/core/hotkeys.js b/src/core/hotkeys.js
index 4a86929271..259994927d 100644
--- a/src/core/hotkeys.js
+++ b/src/core/hotkeys.js
@@ -91,8 +91,10 @@ export const shortcuts = [
     keys: ["r"],
     type: "bindHotkey",
     function: () => {
-      replicantiGalaxyRequest();
+      // Since this is called every tick that the button is held, we can just throw a return here and be fine
+      if (!Replicanti.galaxies.canBuyMore) return;
       setHoldingR(true);
+      replicantiGalaxyRequest();
     },
     visible: () => Replicanti.areUnlocked || PlayerProgress.eternityUnlocked()
   }, {
@@ -309,6 +311,7 @@ export const shortcuts = [
     name: "Fullscreen",
     keys: ["F10"],
     type: "bind",
+    // eslint-disable-next-line no-empty-function
     function: () => {},
     visible: () => false
   },
diff --git a/src/core/imaginary-upgrades.js b/src/core/imaginary-upgrades.js
index c8e362b3c3..e84ea05307 100644
--- a/src/core/imaginary-upgrades.js
+++ b/src/core/imaginary-upgrades.js
@@ -97,6 +97,10 @@ class ImaginaryUpgradeState extends BitPurchasableMechanicState {
       // Need to clear before retriggering, or else it won't actually show up on subsequent upgrades
       TabNotification.laitelaUnlock.clearTrigger();
       TabNotification.laitelaUnlock.tryTrigger();
+      if ((player.sidebarCurrencyUnlocks >> 7) % 2 === 0) {
+        player.sidebarCurrencyUnlocks += 128;
+        EventHub.dispatch(GAME_EVENT.SIDEBAR_CURRENCY_NEW_UNLOCKED);
+      }
     }
     if (this.id === 21) {
       Laitela.quotes.finalRowIM.show();
diff --git a/src/core/machines.js b/src/core/machines.js
index 056e45fa10..2d7020594d 100644
--- a/src/core/machines.js
+++ b/src/core/machines.js
@@ -54,6 +54,11 @@ export const MachineHandler = {
   // Use iMCap to store the base cap; applying multipliers separately avoids some design issues the 3xTP upgrade has
   updateIMCap() {
     if (this.uncappedRM.gte(this.baseRMCap)) {
+      // There isn't really a better place to put this, sorry
+      if ((player.sidebarCurrencyUnlocks >> 6) % 2 === 0) {
+        player.sidebarCurrencyUnlocks += 64;
+        EventHub.dispatch(GAME_EVENT.SIDEBAR_CURRENCY_NEW_UNLOCKED);
+      }
       if (this.baseIMCap > player.reality.iMCap) {
         player.records.bestReality.iMCapSet = Glyphs.copyForRecords(Glyphs.active.filter(g => g !== null));
         player.reality.iMCap = this.baseIMCap;
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/player.js b/src/core/player.js
index eac84b0214..9a01ea1b39 100644
--- a/src/core/player.js
+++ b/src/core/player.js
@@ -52,9 +52,6 @@ window.player = {
       requirementBits: 0,
     }
   },
-  infinity: {
-    upgradeBits: 0
-  },
   auto: {
     autobuyersOn: true,
     disableContinuum: false,
@@ -678,7 +675,6 @@ window.player = {
       thisCompletion: 3600,
       fastestCompletion: 3600,
       difficultyTier: 0,
-      upgrades: {},
       darkMatterMult: 1,
       darkEnergy: 0,
       singularitySorting: {
@@ -914,6 +910,8 @@ window.player = {
       id: false,
     }
   },
+  // This is a bitindex, fwiw
+  sidebarCurrencyUnlocks: 0
 };
 
 export const Player = {
@@ -1071,6 +1069,7 @@ export function guardFromNaNValues(obj) {
         enumerable: true,
         configurable: true,
         get: () => value,
+        // eslint-disable-next-line no-loop-func
         set: function guardedSetter(newValue) {
           if (newValue === null || newValue === undefined) {
             throw new Error("null/undefined player property assignment");
diff --git a/src/core/reality.js b/src/core/reality.js
index 19efc3ad5b..73cdaa4779 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;
@@ -324,6 +331,11 @@ function giveRealityRewards(realityProps) {
     Enslaved.boostReality = false;
   }
 
+  if ((player.sidebarCurrencyUnlocks >> 4) % 2 === 0) {
+    player.sidebarCurrencyUnlocks += 16;
+    EventHub.dispatch(GAME_EVENT.SIDEBAR_CURRENCY_NEW_UNLOCKED);
+  }
+
   if (Teresa.isRunning) {
     const current = Teresa.runRewardMultiplier;
     const newMultiplier = Teresa.rewardMultiplier(player.antimatter);
diff --git a/src/core/replicanti.js b/src/core/replicanti.js
index 5b9f5d813b..03da1d601a 100644
--- a/src/core/replicanti.js
+++ b/src/core/replicanti.js
@@ -517,6 +517,10 @@ export const Replicanti = {
   unlock(freeUnlock = false) {
     const cost = DC.E140.dividedByEffectOf(PelleRifts.vacuum.milestones[1]);
     if (player.replicanti.unl) return;
+    if ((player.sidebarCurrencyUnlocks >> 1) % 2 === 0) {
+      player.sidebarCurrencyUnlocks += 2;
+      EventHub.dispatch(GAME_EVENT.SIDEBAR_CURRENCY_NEW_UNLOCKED);
+    }
     if (freeUnlock || Currency.infinityPoints.gte(cost)) {
       if (!freeUnlock) Currency.infinityPoints.subtract(cost);
       player.replicanti.unl = true;
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..0c4c083a46 100644
--- a/src/core/secret-formula/celestials/rifts.js
+++ b/src/core/secret-formula/celestials/rifts.js
@@ -136,7 +136,7 @@ export const pelleRifts = {
       {
         resource: "chaos",
         requirement: 1,
-        description: () => `You gain ${formatPercents(0.01)} of your EP gained on Eternity per second`,
+        description: () => `You gain ${formatPercents(0.1)} of your EP gained on Eternity per second`,
       },
     ],
     galaxyGeneratorText: "Your Galaxies are too fragmented, you must stabilize the $value"
@@ -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/celestials/teresa.js b/src/core/secret-formula/celestials/teresa.js
index 8c6144f947..bd75b6bff0 100644
--- a/src/core/secret-formula/celestials/teresa.js
+++ b/src/core/secret-formula/celestials/teresa.js
@@ -16,7 +16,13 @@ export const teresa = {
       id: 3,
       price: 1e24,
       description: "Unlock Effarig, Celestial of Ancient Relics.",
-      onUnlock: () => Teresa.quotes.effarig.show(),
+      onUnlock() {
+        if ((player.sidebarCurrencyUnlocks >> 5) % 2 === 0) {
+          player.sidebarCurrencyUnlocks += 32;
+          EventHub.dispatch(GAME_EVENT.SIDEBAR_CURRENCY_NEW_UNLOCKED);
+        }
+        return Teresa.quotes.effarig.show();
+      },
     },
     shop: {
       id: 2,
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 e025ea7b5f..f17d461ea5 100644
--- a/src/core/secret-formula/changelog.js
+++ b/src/core/secret-formula/changelog.js
@@ -8,6 +8,95 @@ export const changelog = [
    *  @property {function: @return String} info  Text body of information for the entry.
    * }
    */
+  {
+    date: [2026, 8, 26],
+    name: "The Great Bugfix",
+    info: `
+<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 Attain 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 affected 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 arguments 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 consistency 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 Singularity 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 Replicanti, 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
+until 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 cases where numbers were not being handled as normal, resulting in the Blind theme not making them hidden.</li>
+<li>Fixed the Time Dimension tab stating you had "1 Tickspeed upgrades".</li>
+<li>Fixed a case where you would eternity in an EC, resulting in studies being reset before giving any banked infinities, leading to 
+the player gaining no eternities.</li>
+<li>Fixed the R keybind for Replicanti Galaxy showing the Cosmic Conglomerate lock modal when you could not actually buy an RG</li>
+<li>Removed useless player data.</li>
+<li>Fixed Scour to Empower checking the number of glyphs you had before you did a Reality reset, rather than after.</li>
+<li>Fixed the 3rd Pelle Rift stating that it allowed you to gain 1% of EP every second, rather than 10% of EP every second.</li>
+<li>Fixed the sidebar "Recent Currency" mode not updating upon unlocking a new currency</li>
+<li>Fixed deleting a companion randomly choosing a companion in your inventory (usually prioritising top and left) to delete, instead
+of deleting the glyph that the player selected to delete.</li>
+<li>Fixed some spelling/punctuation, and standardized it elsewhere.</li>
+</ul>
+<br>
+`
+  },
   {
     date: [2026, 7, 17],
     name: "Celebrate iOS Version Release",
@@ -53,9 +142,9 @@ A massive thank you to all the contributors who helped expand our dimensions to
 <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 dd2cf542ae..0be61baf5c 100644
--- a/src/core/secret-formula/h2p.js
+++ b/src/core/secret-formula/h2p.js
@@ -580,7 +580,7 @@ applied depends on which Infinity Dimension you purchase. <!-- Sorry Garnet :/ -
 <br>
 <br>
 <b>Infinity Dimension Production:</b> Just like Antimatter Dimensions, each Infinity Dimension produces the
-next lower Infinity Dimension.
+previous Infinity Dimension.
 <br>
 <br>
 Every crunch, your produced Infinity Dimensions are reset to the amount you purchased. While the production
@@ -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/news.js b/src/core/secret-formula/news.js
index 2662fb0a50..49f85b48df 100644
--- a/src/core/secret-formula/news.js
+++ b/src/core/secret-formula/news.js
@@ -3290,7 +3290,7 @@ export const news = [
   },
   {
     id: "p2",
-    text: 'Die Zahlen gehen hoooch'
+    text: "Die Zahlen gehen hoooch"
   },
   /* eslint-disable max-len */
   {
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..96db432d67 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],
@@ -282,7 +285,7 @@ export const realityUpgrades = [
       (You have ${formatInt(Glyphs.allGlyphs.countWhere(g => g.type !== "companion"))})`,
     hasFailed: () => Glyphs.allGlyphs.countWhere(g => g.type !== "companion") < 30,
     checkRequirement: () => Glyphs.allGlyphs.countWhere(g => g.type !== "companion") >= 30,
-    checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
+    checkEvent: GAME_EVENT.REALITY_RESET_AFTER,
     description: "You can sacrifice Glyphs for permanent bonuses (Shift + click)",
     formatCost: value => format(value, 1, 0)
   },
@@ -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..ac622b5f94 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() {
@@ -27,7 +27,7 @@ export const Theme = function Theme(name, config) {
 
   this.displayName = function() {
     if (!this.isSecret || !this.isAvailable()) return name;
-    // Secret themes are stored as "S9Whatever", so we need to strip the SN part
+    // Secret themes are stored as "S9Whatever", so we need to strip the S9 part
     return player.secretUnlocks.themes.find(theme => theme.match(/^S[0-9]*/u)[0] === name).replace(/^S[0-9]*/u, "");
   };
 
@@ -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/core/time-studies/time-studies.js b/src/core/time-studies/time-studies.js
index 3e4aa9266c..eaef994bff 100644
--- a/src/core/time-studies/time-studies.js
+++ b/src/core/time-studies/time-studies.js
@@ -131,7 +131,7 @@ export function buyStudiesUntil(id, ec = -1) {
 
   // Don't bother buying any more studies at or below row 22 unless the player has fully finished V, in which case just
   // brute-force all of them up to the specified study. This buys all pre-triads, then triads sequentially up to the id
-  if (id < 221 || !V.isFullyCompleted) return studyArray;
+  if (id < 221 || !V.isFullyCompleted || Pelle.isDoomed) return studyArray;
   studyArray.push(...range(221, Math.max(id, 234)));
   return studyArray;
 }
diff --git a/src/core/ui.init.js b/src/core/ui.init.js
index cafed5ca84..ba2a2e2cdc 100644
--- a/src/core/ui.init.js
+++ b/src/core/ui.init.js
@@ -54,4 +54,5 @@ export const state = {
   notationName: "",
   formatPreBreak: false,
   lastClickTime: 0,
+  chosenCompanionIDx: 0,
 };
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));