From ee9dcc69996e720bbc07ed6468bf0cb1a068368c Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 3 Apr 2022 00:02:26 +0800
Subject: [PATCH 01/89] Transfer all fixed elements to one container

---
 public/stylesheets/new-ui-styles.css |  2 +-
 public/stylesheets/styles.css        | 16 ++++++++++++---
 src/components/GameUIComponent.vue   | 30 +++++++++++++++++-----------
 src/components/SaveTimer.vue         |  4 ++--
 src/components/SpeedrunStatus.vue    |  4 ++--
 5 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/public/stylesheets/new-ui-styles.css b/public/stylesheets/new-ui-styles.css
index d980267ed..0363c9fe1 100644
--- a/public/stylesheets/new-ui-styles.css
+++ b/public/stylesheets/new-ui-styles.css
@@ -47,7 +47,7 @@ body.t-s9 {
   display: flex;
   flex-direction: column;
   width: 12rem;
-  position: fixed;
+  position: absolute;
   left: 0;
   z-index: 5;
 }
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index f23c36126..aa482a09c 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -258,8 +258,8 @@ button:focus {
 
 .TTbuttons {
   color: var(--color-text);
-  position: fixed;
-  bottom: 0;
+  position: absolute;
+  bottom: -100vh;
   font-family: Typewriter, serif;
   display: flex;
   align-items: flex-end;
@@ -1227,6 +1227,16 @@ screen and (max-width: 480px) {
   height: 100%;
 }
 
+.c-game-ui--fixed {
+  width: 100%;
+  position: fixed;
+  z-index: 5;
+  display: flex;
+  justify-content: center;
+  top: 0;
+  left: 0;
+}
+
 ._kong-test .c-game-ui {
   max-height: 100%;
 }
@@ -5897,7 +5907,7 @@ kbd {
   display: flex;
   flex-direction: column-reverse;
   align-items: flex-end;
-  position: fixed;
+  position: absolute;
   top: 0;
   right: 0;
   margin-top: 0.5rem;
diff --git a/src/components/GameUIComponent.vue b/src/components/GameUIComponent.vue
index 08ab6f25b..bbf7f48ac 100644
--- a/src/components/GameUIComponent.vue
+++ b/src/components/GameUIComponent.vue
@@ -90,21 +90,26 @@ export default {
         rel="stylesheet"
         :href="themeCss"
       >
-      <HowToPlay />
-      <InfoButton />
       <BackgroundAnimations />
     </div>
     <div
-      id="notification-container"
-      class="l-notification-container"
-    />
-    <TimeTheoremShop
-      v-if="view.subtab === 'studies'"
-      class="l-time-studies-tab__tt-shop"
-    />
-    <ModernSidebar v-if="view.newUI" />
-    <SaveTimer />
-    <SpeedrunStatus />
+      id="ui-fixed"
+      class="c-game-ui--fixed"
+    >
+      <div
+        id="notification-container"
+        class="l-notification-container"
+      />
+      <TimeTheoremShop
+        v-if="view.subtab === 'studies'"
+        class="l-time-studies-tab__tt-shop"
+      />
+      <ModernSidebar v-if="view.newUI" />
+      <SaveTimer />
+      <SpeedrunStatus />
+    </div>
+    <HowToPlay />
+    <InfoButton />
     <FadeToBlack v-if="rollCredits" />
     <CreditsContainer v-if="rollCredits" />
     <NewGame v-if="rollCredits" />
@@ -115,5 +120,6 @@ export default {
 .ui-wrapper {
   display: flex;
   justify-content: center;
+  position: relative;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/SaveTimer.vue b/src/components/SaveTimer.vue
index a603a8d8a..c7c807eac 100644
--- a/src/components/SaveTimer.vue
+++ b/src/components/SaveTimer.vue
@@ -39,9 +39,9 @@ export default {
 <style scoped>
 .o-save-timer {
   color: var(--color-text);
-  position: fixed;
+  position: absolute;
   left: 0;
-  bottom: 0;
+  bottom: -100vh;
   background-color: var(--color-base);
   white-space: nowrap;
   border-top: 0.1rem solid var(--color-accent);
diff --git a/src/components/SpeedrunStatus.vue b/src/components/SpeedrunStatus.vue
index b1c718800..8c4303d28 100644
--- a/src/components/SpeedrunStatus.vue
+++ b/src/components/SpeedrunStatus.vue
@@ -108,9 +108,9 @@ export default {
 .speedrun-status {
   font-size: 1.2rem;
   color: var(--color-text);
-  position: fixed;
+  position: absolute;
   right: 1rem;
-  bottom: 1rem;
+  bottom: calc(1rem - 100vh);
   background-color: var(--color-base);
   white-space: nowrap;
   border: 0.2rem solid var(--color-accent);

From 5fa9abfba3820d069b37fde54758e7bbbbf7fcb5 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 3 Apr 2022 18:51:53 +0800
Subject: [PATCH 02/89] Make height 100% for fixed container

---
 public/stylesheets/new-ui-styles.css | 1 +
 public/stylesheets/styles.css        | 7 ++++++-
 src/components/SaveTimer.vue         | 3 ++-
 src/components/SpeedrunStatus.vue    | 3 ++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/public/stylesheets/new-ui-styles.css b/public/stylesheets/new-ui-styles.css
index 0363c9fe1..fe459d758 100644
--- a/public/stylesheets/new-ui-styles.css
+++ b/public/stylesheets/new-ui-styles.css
@@ -50,6 +50,7 @@ body.t-s9 {
   position: absolute;
   left: 0;
   z-index: 5;
+  pointer-events: all;
 }
 
 .sidebar:hover .subtabs,
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index aa482a09c..36f6ea738 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -259,12 +259,13 @@ button:focus {
 .TTbuttons {
   color: var(--color-text);
   position: absolute;
-  bottom: -100vh;
+  bottom: 0;
   font-family: Typewriter, serif;
   display: flex;
   align-items: flex-end;
   z-index: 2;
   width: 55.5rem;
+  pointer-events: all;
 }
 
 .l-tt-buy-button {
@@ -1229,7 +1230,10 @@ screen and (max-width: 480px) {
 
 .c-game-ui--fixed {
   width: 100%;
+  height: 100%;
   position: fixed;
+  pointer-events: none;
+
   z-index: 5;
   display: flex;
   justify-content: center;
@@ -5908,6 +5912,7 @@ kbd {
   flex-direction: column-reverse;
   align-items: flex-end;
   position: absolute;
+  pointer-events: all;
   top: 0;
   right: 0;
   margin-top: 0.5rem;
diff --git a/src/components/SaveTimer.vue b/src/components/SaveTimer.vue
index c7c807eac..246630824 100644
--- a/src/components/SaveTimer.vue
+++ b/src/components/SaveTimer.vue
@@ -41,13 +41,14 @@ export default {
   color: var(--color-text);
   position: absolute;
   left: 0;
-  bottom: -100vh;
+  bottom: 0;
   background-color: var(--color-base);
   white-space: nowrap;
   border-top: 0.1rem solid var(--color-accent);
   border-right: 0.1rem solid var(--color-accent);
   cursor: pointer;
   user-select: none;
+  pointer-events: all;
   padding: 0 0.5rem;
   z-index: 5;
 }
diff --git a/src/components/SpeedrunStatus.vue b/src/components/SpeedrunStatus.vue
index 8c4303d28..f56b20f9b 100644
--- a/src/components/SpeedrunStatus.vue
+++ b/src/components/SpeedrunStatus.vue
@@ -110,11 +110,12 @@ export default {
   color: var(--color-text);
   position: absolute;
   right: 1rem;
-  bottom: calc(1rem - 100vh);
+  bottom: 1rem;
   background-color: var(--color-base);
   white-space: nowrap;
   border: 0.2rem solid var(--color-accent);
   user-select: none;
+  pointer-events: all;
   padding: 0.8rem 2rem;
   z-index: 5;
 }

From b4cf3381867f93458790ff6b4123714566d2078c Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 3 Apr 2022 21:05:03 +0800
Subject: [PATCH 03/89] "Fix" fixed positioned elements on animations

Except Crunch. This breaks crunch for non-fixed elements.
---
 javascripts/core/animations.js                 | 18 ++++++++++++++++++
 javascripts/core/app/options.js                |  5 ++---
 javascripts/core/big_crunch.js                 |  7 ++-----
 javascripts/core/devtools.js                   |  3 +--
 javascripts/core/dilation.js                   | 12 +++---------
 javascripts/core/eternity.js                   |  7 ++-----
 javascripts/core/utils.js                      |  2 ++
 .../modals/prestige/EnterDilationModal.vue     |  2 +-
 .../modals/prestige/EternityModal.vue          |  5 ++---
 9 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 javascripts/core/animations.js

diff --git a/javascripts/core/animations.js b/javascripts/core/animations.js
new file mode 100644
index 000000000..5e7e9a60e
--- /dev/null
+++ b/javascripts/core/animations.js
@@ -0,0 +1,18 @@
+export const AnimationHandler = {
+  isDisplaying: false,
+  displayForce(name, duration) {
+    document.getElementById("ui").style.animation = `${name} ${duration}s 1`;
+    document.getElementById("ui-fixed").style.animation = `${name} ${duration}s 1`;
+    this.isDisplaying = true;
+    setTimeout(() => {
+      document.getElementById("ui").style.animation = "";
+      document.getElementById("ui-fixed").style.animation = "";
+      this.isDisplaying = false;
+    }, duration * 1000);
+  },
+  display(name, duration) {
+    if (!this.isDisplaying) {
+      this.displayForce(name, duration);
+    }
+  }
+};
\ No newline at end of file
diff --git a/javascripts/core/app/options.js b/javascripts/core/app/options.js
index 8ceb639c8..71159f484 100644
--- a/javascripts/core/app/options.js
+++ b/javascripts/core/app/options.js
@@ -65,10 +65,9 @@ export function isSecretImport(data) {
 
 export function tryImportSecret(data) {
   const index = secretImportIndex(data);
-  if (index === 0 && document.body.style.animation === "") {
-    document.body.style.animation = "barrelRoll 5s 1";
+  if (index === 0 && !AnimationHandler.isDisplaying) {
+    AnimationHandler.display("barrelRoll", 5);
     SecretAchievement(15).unlock();
-    setTimeout(() => document.body.style.animation = "", 5000);
     return true;
   }
   if (index === 1) {
diff --git a/javascripts/core/big_crunch.js b/javascripts/core/big_crunch.js
index 48fdf30e8..21fcc65ea 100644
--- a/javascripts/core/big_crunch.js
+++ b/javascripts/core/big_crunch.js
@@ -3,10 +3,7 @@ import { DC } from "./constants.js";
 import { SpeedrunMilestones } from "./speedrun.js";
 
 export function bigCrunchAnimation() {
-  document.body.style.animation = "implode 2s 1";
-  setTimeout(() => {
-    document.body.style.animation = "";
-  }, 2000);
+  AnimationHandler.display("implode", 2);
 }
 
 function handleChallengeCompletion() {
@@ -25,7 +22,7 @@ function handleChallengeCompletion() {
 
 export function bigCrunchResetRequest(disableAnimation = false) {
   if (!Player.canCrunch) return;
-  if (!disableAnimation && player.options.animations.bigCrunch && document.body.style.animation === "") {
+  if (!disableAnimation && player.options.animations.bigCrunch && !AnimationHandler.isDisplaying) {
     bigCrunchAnimation();
     setTimeout(bigCrunchReset, 1000);
   } else {
diff --git a/javascripts/core/devtools.js b/javascripts/core/devtools.js
index e1ea9ed91..c35fbb43a 100644
--- a/javascripts/core/devtools.js
+++ b/javascripts/core/devtools.js
@@ -92,8 +92,7 @@ dev.tripleEverything = function() {
 };
 
 dev.barrelRoll = function() {
-  document.body.style.animation = "barrelRoll 5s 1";
-  setTimeout(() => document.body.style.animation = "", 5000);
+  AnimationHandler.display("barrelRoll", 5);
 };
 
 dev.spin3d = function() {
diff --git a/javascripts/core/dilation.js b/javascripts/core/dilation.js
index 4bc20bb5e..ff609cf3f 100644
--- a/javascripts/core/dilation.js
+++ b/javascripts/core/dilation.js
@@ -3,18 +3,12 @@ import { DC } from "./constants.js";
 import { SpeedrunMilestones } from "./speedrun.js";
 
 export function animateAndDilate() {
-  document.body.style.animation = "dilate 2s 1 linear";
-  setTimeout(() => {
-    document.body.style.animation = "";
-  }, 2000);
+  AnimationHandler.display("dilate", 2);
   setTimeout(startDilatedEternity, 1000);
 }
 
 export function animateAndUndilate() {
-  document.body.style.animation = "undilate 2s 1 linear";
-  setTimeout(() => {
-    document.body.style.animation = "";
-  }, 2000);
+  AnimationHandler.display("undilate", 2);
   setTimeout(() => {
     eternity(false, false, { switchingDilation: true });
   }, 1000);
@@ -22,7 +16,7 @@ export function animateAndUndilate() {
 
 export function startDilatedEternityRequest() {
   if (!PlayerProgress.dilationUnlocked() || (Pelle.isDoomed && !Pelle.canDilateInPelle)) return;
-  const playAnimation = player.options.animations.dilation && document.body.style.animation === "";
+  const playAnimation = player.options.animations.dilation && !AnimationHandler.isDisplaying;
   if (player.dilation.active) {
     // TODO Dilation modal
     if (playAnimation) {
diff --git a/javascripts/core/eternity.js b/javascripts/core/eternity.js
index cd3e0d2cf..53dea21e3 100644
--- a/javascripts/core/eternity.js
+++ b/javascripts/core/eternity.js
@@ -57,10 +57,7 @@ function giveEternityRewards(auto) {
 }
 
 export function eternityAnimation() {
-  document.body.style.animation = "eternify 3s 1";
-  setTimeout(() => {
-    document.body.style.animation = "";
-  }, 3000);
+  AnimationHandler.display("eternify", 3);
 }
 
 export function eternityResetRequest() {
@@ -176,7 +173,7 @@ function applyRealityUpgradesAfterEternity() {
 function askEternityConfirmation() {
   if (player.options.confirmations.eternity) {
     Modal.eternity.show();
-  } else if (player.options.animations.eternity && document.body.style.animation === "") {
+  } else if (player.options.animations.eternity && !AnimationHandler.isDisplaying) {
     eternityAnimation();
     setTimeout(eternity, 2250);
   } else {
diff --git a/javascripts/core/utils.js b/javascripts/core/utils.js
index 4365ea8e3..22a4b88ce 100644
--- a/javascripts/core/utils.js
+++ b/javascripts/core/utils.js
@@ -12,3 +12,5 @@ import "./async-utils.js";
 import "./event-hub.js";
 
 export * from "./game-mechanics/index.js";
+
+export * from "./animations.js";
\ No newline at end of file
diff --git a/src/components/modals/prestige/EnterDilationModal.vue b/src/components/modals/prestige/EnterDilationModal.vue
index daf1cac5c..e6fd9e64a 100644
--- a/src/components/modals/prestige/EnterDilationModal.vue
+++ b/src/components/modals/prestige/EnterDilationModal.vue
@@ -32,7 +32,7 @@ export default {
   methods: {
     handleYesClick() {
       if (player.dilation.active) return;
-      if (player.options.animations.dilation && document.body.style.animation === "") {
+      if (player.options.animations.dilation && !AnimationHandler.isDisplaying) {
         animateAndDilate();
       } else {
         startDilatedEternity();
diff --git a/src/components/modals/prestige/EternityModal.vue b/src/components/modals/prestige/EternityModal.vue
index bef6f0f4b..28261a193 100644
--- a/src/components/modals/prestige/EternityModal.vue
+++ b/src/components/modals/prestige/EternityModal.vue
@@ -52,11 +52,10 @@ export default {
       this.gainedEternityPoints = gainedEternityPoints();
     },
     handleYesClick() {
-      if (player.dilation.active && player.options.animations.dilation && document.body.style.animation === "") {
+      if (player.dilation.active && player.options.animations.dilation && !AnimationHandler.isDisplaying) {
         animateAndUndilate();
         setTimeout(eternity, 1000);
-      } else if (!player.dilation.active && player.options.animations.eternity &&
-        document.body.style.animation === "") {
+      } else if (!player.dilation.active && player.options.animations.eternity && !AnimationHander.isDisplaying) {
         eternityAnimation();
         setTimeout(eternity, 2250);
       } else {

From 175ef4a0d92a4983fa182ab4de85ce2f30e0a884 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Mon, 4 Apr 2022 21:28:38 +0800
Subject: [PATCH 04/89] Fix animation for crunch button

---
 public/stylesheets/styles.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index 36f6ea738..d37cdad3f 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -1225,7 +1225,9 @@ screen and (max-width: 480px) {
 
 .c-game-ui {
   width: 100%;
-  height: 100%;
+  height: 100vh;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 
 .c-game-ui--fixed {

From b1cc9345f72cc320f3cfc99c46c199f80cc483ef Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Wed, 6 Apr 2022 16:57:39 +0800
Subject: [PATCH 05/89] Fix blob animation in "move all fixed elements to one
 container"

---
 src/components/BlobSnowflakes.vue  | 4 ++--
 src/components/GameUIComponent.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/BlobSnowflakes.vue b/src/components/BlobSnowflakes.vue
index c9d9a17b9..bd65f4627 100644
--- a/src/components/BlobSnowflakes.vue
+++ b/src/components/BlobSnowflakes.vue
@@ -67,7 +67,7 @@ export default {
 
 <style scoped>
 .c-blob-snowflake-container {
-  position: fixed;
+  position: absolute;
   top: 0;
   left: 0;
   width: 100%;
@@ -80,7 +80,7 @@ export default {
 }
 
 .c-blob-background-container {
-  position: fixed;
+  position: absolute;
   top: 0;
   left: 0;
   width: 100%;
diff --git a/src/components/GameUIComponent.vue b/src/components/GameUIComponent.vue
index bbf7f48ac..d919bb3d0 100644
--- a/src/components/GameUIComponent.vue
+++ b/src/components/GameUIComponent.vue
@@ -90,7 +90,6 @@ export default {
         rel="stylesheet"
         :href="themeCss"
       >
-      <BackgroundAnimations />
     </div>
     <div
       id="ui-fixed"
@@ -107,6 +106,7 @@ export default {
       <ModernSidebar v-if="view.newUI" />
       <SaveTimer />
       <SpeedrunStatus />
+      <BackgroundAnimations />
     </div>
     <HowToPlay />
     <InfoButton />

From 11baa14dffd4ba790602d1259b4dd95008abd196 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Wed, 6 Apr 2022 17:51:07 +0800
Subject: [PATCH 06/89] Fix animation bug with modals

---
 public/stylesheets/styles.css      |  9 ++++++---
 src/components/GameUIComponent.vue | 14 +++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index d37cdad3f..cfe8cafad 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -1226,6 +1226,7 @@ screen and (max-width: 480px) {
 .c-game-ui {
   width: 100%;
   height: 100vh;
+  position: relative;
   overflow-y: auto;
   overflow-x: hidden;
 }
@@ -5155,7 +5156,8 @@ screen and (max-width: 480px) {
 }
 
 .l-modal-overlay {
-  position: fixed;
+  position: absolute;
+  pointer-events: all;
   left: 0;
   top: 0;
   width: 100vw;
@@ -5167,7 +5169,8 @@ screen and (max-width: 480px) {
 }
 
 .l-modal {
-  position: fixed;
+  position: absolute;
+  pointer-events: all;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
@@ -9164,7 +9167,7 @@ input.o-automator-block-input {
   position: absolute;
   top: 1rem;
   width: 2rem;
-  right: 2rem;
+  right: 1rem;
   height: 2rem;
   border-radius: 50%;
   line-height: 1.9rem;
diff --git a/src/components/GameUIComponent.vue b/src/components/GameUIComponent.vue
index d919bb3d0..2fa87f0f3 100644
--- a/src/components/GameUIComponent.vue
+++ b/src/components/GameUIComponent.vue
@@ -79,11 +79,8 @@ export default {
       <component :is="uiLayout">
         <component :is="page" />
       </component>
-      <PopupModal
-        v-if="view.modal.current"
-        :modal="view.modal.current"
-      />
-      <ModalProgressBar v-if="view.modal.progressBar" />
+      <HowToPlay />
+      <InfoButton />
       <link
         v-if="view.theme !== 'Normal'"
         type="text/css"
@@ -107,9 +104,12 @@ export default {
       <SaveTimer />
       <SpeedrunStatus />
       <BackgroundAnimations />
+      <PopupModal
+        v-if="view.modal.current"
+        :modal="view.modal.current"
+      />
+      <ModalProgressBar v-if="view.modal.progressBar" />
     </div>
-    <HowToPlay />
-    <InfoButton />
     <FadeToBlack v-if="rollCredits" />
     <CreditsContainer v-if="rollCredits" />
     <NewGame v-if="rollCredits" />

From e3b128f5d2c9230cd332dd398ef718d0ef998968 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 7 Apr 2022 20:49:13 +0800
Subject: [PATCH 07/89] Name Animation handler better

---
 javascripts/core/app/options.js                            | 5 +++--
 javascripts/core/big_crunch.js                             | 5 +++--
 javascripts/core/devtools.js                               | 3 ++-
 javascripts/core/dilation.js                               | 7 ++++---
 javascripts/core/eternity.js                               | 5 +++--
 .../{animations.js => full-screen-animation-handler.js}    | 2 +-
 javascripts/core/utils.js                                  | 4 +---
 src/components/modals/prestige/EnterDilationModal.vue      | 3 ++-
 src/components/modals/prestige/EternityModal.vue           | 3 ++-
 9 files changed, 21 insertions(+), 16 deletions(-)
 rename javascripts/core/{animations.js => full-screen-animation-handler.js} (92%)

diff --git a/javascripts/core/app/options.js b/javascripts/core/app/options.js
index 71159f484..6c3e337dc 100644
--- a/javascripts/core/app/options.js
+++ b/javascripts/core/app/options.js
@@ -1,4 +1,5 @@
 import { sha512_256 } from "js-sha512";
+import { FullScreenAnimationHandler } from "../full-screen-animation-handler";
 
 export class GameOptions {
 
@@ -65,8 +66,8 @@ export function isSecretImport(data) {
 
 export function tryImportSecret(data) {
   const index = secretImportIndex(data);
-  if (index === 0 && !AnimationHandler.isDisplaying) {
-    AnimationHandler.display("barrelRoll", 5);
+  if (index === 0 && !FullScreenAnimationHandler.isDisplaying) {
+    FullScreenAnimationHandler.display("barrelRoll", 5);
     SecretAchievement(15).unlock();
     return true;
   }
diff --git a/javascripts/core/big_crunch.js b/javascripts/core/big_crunch.js
index 21fcc65ea..38f38f780 100644
--- a/javascripts/core/big_crunch.js
+++ b/javascripts/core/big_crunch.js
@@ -1,9 +1,10 @@
 import { GameMechanicState, SetPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js";
 import { DC } from "./constants.js";
 import { SpeedrunMilestones } from "./speedrun.js";
+import { FullScreenAnimationHandler } from "./full-screen-animation-handler.js";
 
 export function bigCrunchAnimation() {
-  AnimationHandler.display("implode", 2);
+  FullScreenAnimationHandler.display("implode", 2);
 }
 
 function handleChallengeCompletion() {
@@ -22,7 +23,7 @@ function handleChallengeCompletion() {
 
 export function bigCrunchResetRequest(disableAnimation = false) {
   if (!Player.canCrunch) return;
-  if (!disableAnimation && player.options.animations.bigCrunch && !AnimationHandler.isDisplaying) {
+  if (!disableAnimation && player.options.animations.bigCrunch && !FullScreenAnimationHandler.isDisplaying) {
     bigCrunchAnimation();
     setTimeout(bigCrunchReset, 1000);
   } else {
diff --git a/javascripts/core/devtools.js b/javascripts/core/devtools.js
index c35fbb43a..9a9838b13 100644
--- a/javascripts/core/devtools.js
+++ b/javascripts/core/devtools.js
@@ -1,5 +1,6 @@
 import { DC } from "./constants.js";
 import { sha512_256 } from "js-sha512";
+import { FullScreenAnimationHandler } from "./full-screen-animation-handler.js";
 
 /* eslint-disable no-console */
 // Disabling no-console here seems
@@ -92,7 +93,7 @@ dev.tripleEverything = function() {
 };
 
 dev.barrelRoll = function() {
-  AnimationHandler.display("barrelRoll", 5);
+  FullScreenAnimationHandler.display("barrelRoll", 5);
 };
 
 dev.spin3d = function() {
diff --git a/javascripts/core/dilation.js b/javascripts/core/dilation.js
index ff609cf3f..3015ee34a 100644
--- a/javascripts/core/dilation.js
+++ b/javascripts/core/dilation.js
@@ -1,14 +1,15 @@
 import { SetPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js";
 import { DC } from "./constants.js";
 import { SpeedrunMilestones } from "./speedrun.js";
+import { FullScreenAnimationHandler } from "./full-screen-animation-handler.js";
 
 export function animateAndDilate() {
-  AnimationHandler.display("dilate", 2);
+  FullScreenAnimationHandler.display("dilate", 2);
   setTimeout(startDilatedEternity, 1000);
 }
 
 export function animateAndUndilate() {
-  AnimationHandler.display("undilate", 2);
+  FullScreenAnimationHandler.display("undilate", 2);
   setTimeout(() => {
     eternity(false, false, { switchingDilation: true });
   }, 1000);
@@ -16,7 +17,7 @@ export function animateAndUndilate() {
 
 export function startDilatedEternityRequest() {
   if (!PlayerProgress.dilationUnlocked() || (Pelle.isDoomed && !Pelle.canDilateInPelle)) return;
-  const playAnimation = player.options.animations.dilation && !AnimationHandler.isDisplaying;
+  const playAnimation = player.options.animations.dilation && !FullScreenAnimationHandler.isDisplaying;
   if (player.dilation.active) {
     // TODO Dilation modal
     if (playAnimation) {
diff --git a/javascripts/core/eternity.js b/javascripts/core/eternity.js
index 53dea21e3..6bd15eb6f 100644
--- a/javascripts/core/eternity.js
+++ b/javascripts/core/eternity.js
@@ -1,5 +1,6 @@
 import { GameMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index.js";
 import { DC } from "./constants.js";
+import { FullScreenAnimationHandler } from "./full-screen-animation-handler.js";
 
 function giveEternityRewards(auto) {
   player.records.bestEternity.time = Math.min(player.records.thisEternity.time, player.records.bestEternity.time);
@@ -57,7 +58,7 @@ function giveEternityRewards(auto) {
 }
 
 export function eternityAnimation() {
-  AnimationHandler.display("eternify", 3);
+  FullScreenAnimationHandler.display("eternify", 3);
 }
 
 export function eternityResetRequest() {
@@ -173,7 +174,7 @@ function applyRealityUpgradesAfterEternity() {
 function askEternityConfirmation() {
   if (player.options.confirmations.eternity) {
     Modal.eternity.show();
-  } else if (player.options.animations.eternity && !AnimationHandler.isDisplaying) {
+  } else if (player.options.animations.eternity && !FullScreenAnimationHandler.isDisplaying) {
     eternityAnimation();
     setTimeout(eternity, 2250);
   } else {
diff --git a/javascripts/core/animations.js b/javascripts/core/full-screen-animation-handler.js
similarity index 92%
rename from javascripts/core/animations.js
rename to javascripts/core/full-screen-animation-handler.js
index 5e7e9a60e..983cdf7d1 100644
--- a/javascripts/core/animations.js
+++ b/javascripts/core/full-screen-animation-handler.js
@@ -1,4 +1,4 @@
-export const AnimationHandler = {
+export const FullScreenAnimationHandler = {
   isDisplaying: false,
   displayForce(name, duration) {
     document.getElementById("ui").style.animation = `${name} ${duration}s 1`;
diff --git a/javascripts/core/utils.js b/javascripts/core/utils.js
index 22a4b88ce..dff4a24eb 100644
--- a/javascripts/core/utils.js
+++ b/javascripts/core/utils.js
@@ -11,6 +11,4 @@ import "./math.js";
 import "./async-utils.js";
 import "./event-hub.js";
 
-export * from "./game-mechanics/index.js";
-
-export * from "./animations.js";
\ No newline at end of file
+export * from "./game-mechanics/index.js";
\ No newline at end of file
diff --git a/src/components/modals/prestige/EnterDilationModal.vue b/src/components/modals/prestige/EnterDilationModal.vue
index e6fd9e64a..a34178547 100644
--- a/src/components/modals/prestige/EnterDilationModal.vue
+++ b/src/components/modals/prestige/EnterDilationModal.vue
@@ -1,5 +1,6 @@
 <script>
 import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
+import { FullScreenAnimationHandler } from "../../../../javascripts/core/full-screen-animation-handler.js";
 
 export default {
   name: "EnterDilationModal",
@@ -32,7 +33,7 @@ export default {
   methods: {
     handleYesClick() {
       if (player.dilation.active) return;
-      if (player.options.animations.dilation && !AnimationHandler.isDisplaying) {
+      if (player.options.animations.dilation && !FullScreenAnimationHandler.isDisplaying) {
         animateAndDilate();
       } else {
         startDilatedEternity();
diff --git a/src/components/modals/prestige/EternityModal.vue b/src/components/modals/prestige/EternityModal.vue
index 28261a193..10c9b3c09 100644
--- a/src/components/modals/prestige/EternityModal.vue
+++ b/src/components/modals/prestige/EternityModal.vue
@@ -1,5 +1,6 @@
 <script>
 import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
+import { FullScreenAnimationHandler } from "../../../../javascripts/core/full-screen-animation-handler.js";
 
 export default {
   name: "EternityModal",
@@ -52,7 +53,7 @@ export default {
       this.gainedEternityPoints = gainedEternityPoints();
     },
     handleYesClick() {
-      if (player.dilation.active && player.options.animations.dilation && !AnimationHandler.isDisplaying) {
+      if (player.dilation.active && player.options.animations.dilation && !FullScreenAnimationHandler.isDisplaying) {
         animateAndUndilate();
         setTimeout(eternity, 1000);
       } else if (!player.dilation.active && player.options.animations.eternity && !AnimationHander.isDisplaying) {

From d106943b4b9e51de89f85e06edaa2f59372110b3 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 7 Apr 2022 20:51:51 +0800
Subject: [PATCH 08/89] Address PR feedback

Barrel roll requirement
---
 javascripts/core/app/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascripts/core/app/options.js b/javascripts/core/app/options.js
index 6c3e337dc..ea835367d 100644
--- a/javascripts/core/app/options.js
+++ b/javascripts/core/app/options.js
@@ -66,7 +66,7 @@ export function isSecretImport(data) {
 
 export function tryImportSecret(data) {
   const index = secretImportIndex(data);
-  if (index === 0 && !FullScreenAnimationHandler.isDisplaying) {
+  if (index === 0) {
     FullScreenAnimationHandler.display("barrelRoll", 5);
     SecretAchievement(15).unlock();
     return true;

From b62452fbbe39a4f0df55bfafcc3ce379bf7723e2 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 7 Apr 2022 20:54:59 +0800
Subject: [PATCH 09/89] pointer-events: auto

---
 public/stylesheets/new-ui-styles.css | 2 +-
 public/stylesheets/styles.css        | 6 +++---
 src/components/SaveTimer.vue         | 2 +-
 src/components/SpeedrunStatus.vue    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/stylesheets/new-ui-styles.css b/public/stylesheets/new-ui-styles.css
index fe459d758..b559b8991 100644
--- a/public/stylesheets/new-ui-styles.css
+++ b/public/stylesheets/new-ui-styles.css
@@ -50,7 +50,7 @@ body.t-s9 {
   position: absolute;
   left: 0;
   z-index: 5;
-  pointer-events: all;
+  pointer-events: auto;
 }
 
 .sidebar:hover .subtabs,
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index cfe8cafad..d0bb9599c 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -5157,7 +5157,7 @@ screen and (max-width: 480px) {
 
 .l-modal-overlay {
   position: absolute;
-  pointer-events: all;
+  pointer-events: auto;
   left: 0;
   top: 0;
   width: 100vw;
@@ -5170,7 +5170,7 @@ screen and (max-width: 480px) {
 
 .l-modal {
   position: absolute;
-  pointer-events: all;
+  pointer-events: auto;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
@@ -5917,7 +5917,7 @@ kbd {
   flex-direction: column-reverse;
   align-items: flex-end;
   position: absolute;
-  pointer-events: all;
+  pointer-events: auto;
   top: 0;
   right: 0;
   margin-top: 0.5rem;
diff --git a/src/components/SaveTimer.vue b/src/components/SaveTimer.vue
index 246630824..ecb5a293d 100644
--- a/src/components/SaveTimer.vue
+++ b/src/components/SaveTimer.vue
@@ -48,7 +48,7 @@ export default {
   border-right: 0.1rem solid var(--color-accent);
   cursor: pointer;
   user-select: none;
-  pointer-events: all;
+  pointer-events: auto;
   padding: 0 0.5rem;
   z-index: 5;
 }
diff --git a/src/components/SpeedrunStatus.vue b/src/components/SpeedrunStatus.vue
index f56b20f9b..804963ebb 100644
--- a/src/components/SpeedrunStatus.vue
+++ b/src/components/SpeedrunStatus.vue
@@ -115,7 +115,7 @@ export default {
   white-space: nowrap;
   border: 0.2rem solid var(--color-accent);
   user-select: none;
-  pointer-events: all;
+  pointer-events: auto;
   padding: 0.8rem 2rem;
   z-index: 5;
 }

From 37e33f18ab4649535d038a144ac8d0405f97c1c9 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 7 Apr 2022 21:22:16 +0800
Subject: [PATCH 10/89] Move fixed stuff into SFC

---
 public/stylesheets/styles.css                 | 13 ---
 src/components/GameUIComponent.vue            | 60 +------------
 src/components/GameUIFixedComponents.vue      | 87 +++++++++++++++++++
 .../tabs/celestial-pelle/NewGame.vue          |  1 +
 4 files changed, 92 insertions(+), 69 deletions(-)
 create mode 100644 src/components/GameUIFixedComponents.vue

diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index d0bb9599c..a384cc434 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -1231,19 +1231,6 @@ screen and (max-width: 480px) {
   overflow-x: hidden;
 }
 
-.c-game-ui--fixed {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  pointer-events: none;
-
-  z-index: 5;
-  display: flex;
-  justify-content: center;
-  top: 0;
-  left: 0;
-}
-
 ._kong-test .c-game-ui {
   max-height: 100%;
 }
diff --git a/src/components/GameUIComponent.vue b/src/components/GameUIComponent.vue
index 2fa87f0f3..9204fafd3 100644
--- a/src/components/GameUIComponent.vue
+++ b/src/components/GameUIComponent.vue
@@ -1,19 +1,10 @@
 <script>
 import ClassicUi from "@/components/ui-modes/classic/ClassicUi";
 import ModernUi from "@/components/ui-modes/modern/ModernUi";
-import ModernSidebar from "@/components/ui-modes/modern/ModernSidebar";
 import TabComponents from "@/components/tabs";
-import PopupModal from "@/components/modals/PopupModal";
-import FadeToBlack from "@/components/tabs/celestial-pelle/FadeToBlack";
-import CreditsContainer from "@/components/tabs/celestial-pelle/CreditsContainer";
-import NewGame from "@/components/tabs/celestial-pelle/NewGame";
-import SaveTimer from "@/components/SaveTimer";
-import SpeedrunStatus from "@/components/SpeedrunStatus";
-import BackgroundAnimations from "@/components/BackgroundAnimations";
-import ModalProgressBar from "@/components/modals/ModalProgressBar";
+import GameUIFixedComponents from "@/components/GameUIFixedComponents";
 import HowToPlay from "@/components/HowToPlay";
 import InfoButton from "@/components/InfoButton";
-import TimeTheoremShop from "@/components/tabs/time-studies/tt-shop/TimeTheoremShop";
 
 export default {
   name: "GameUIComponent",
@@ -21,23 +12,9 @@ export default {
     ...TabComponents,
     ClassicUi,
     ModernUi,
-    ModernSidebar,
-    PopupModal,
-    FadeToBlack,
-    CreditsContainer,
-    NewGame,
-    SaveTimer,
-    SpeedrunStatus,
-    BackgroundAnimations,
-    ModalProgressBar,
+    GameUIFixedComponents,
     HowToPlay,
-    InfoButton,
-    TimeTheoremShop
-  },
-  data() {
-    return {
-      rollCredits: false,
-    };
+    InfoButton
   },
   computed: {
     view() {
@@ -56,11 +33,6 @@ export default {
     themeCss() {
       return `stylesheets/theme-${this.view.theme}.css`;
     }
-  },
-  methods: {
-    update() {
-      this.rollCredits = GameEnd.endState >= 2.5;
-    }
   }
 };
 </script>
@@ -88,31 +60,7 @@ export default {
         :href="themeCss"
       >
     </div>
-    <div
-      id="ui-fixed"
-      class="c-game-ui--fixed"
-    >
-      <div
-        id="notification-container"
-        class="l-notification-container"
-      />
-      <TimeTheoremShop
-        v-if="view.subtab === 'studies'"
-        class="l-time-studies-tab__tt-shop"
-      />
-      <ModernSidebar v-if="view.newUI" />
-      <SaveTimer />
-      <SpeedrunStatus />
-      <BackgroundAnimations />
-      <PopupModal
-        v-if="view.modal.current"
-        :modal="view.modal.current"
-      />
-      <ModalProgressBar v-if="view.modal.progressBar" />
-    </div>
-    <FadeToBlack v-if="rollCredits" />
-    <CreditsContainer v-if="rollCredits" />
-    <NewGame v-if="rollCredits" />
+    <GameUIFixedComponents />
   </div>
 </template>
 
diff --git a/src/components/GameUIFixedComponents.vue b/src/components/GameUIFixedComponents.vue
new file mode 100644
index 000000000..b7af001a8
--- /dev/null
+++ b/src/components/GameUIFixedComponents.vue
@@ -0,0 +1,87 @@
+<script>
+import TimeTheoremShop from "@/components/tabs/time-studies/tt-shop/TimeTheoremShop";
+import ModernSidebar from "@/components/ui-modes/modern/ModernSidebar";
+import SaveTimer from "@/components/SaveTimer";
+import SpeedrunStatus from "@/components/SpeedrunStatus";
+import BackgroundAnimations from "@/components/BackgroundAnimations";
+import PopupModal from "@/components/modals/PopupModal";
+import ModalProgressBar from "@/components/modals/ModalProgressBar";
+import FadeToBlack from "@/components/tabs/celestial-pelle/FadeToBlack";
+import CreditsContainer from "@/components/tabs/celestial-pelle/CreditsContainer";
+import NewGame from "@/components/tabs/celestial-pelle/NewGame";
+
+export default {
+  name: "GameUIFixedComponents",
+  components: {
+    TimeTheoremShop,
+    ModernSidebar,
+    SaveTimer,
+    SpeedrunStatus,
+    BackgroundAnimations,
+    PopupModal,
+    ModalProgressBar,
+    FadeToBlack,
+    CreditsContainer,
+    NewGame
+  },
+  data() {
+    return {
+      rollCredits: false,
+    };
+  },
+  computed: {
+    view() {
+      return this.$viewModel;
+    }
+  },
+  methods: {
+    update() {
+      this.rollCredits = GameEnd.endState >= 2.5;
+    }
+  }
+};
+</script>
+
+
+<template>
+  <div
+    id="ui-fixed"
+    class="c-game-ui--fixed"
+  >
+    <div
+      id="notification-container"
+      class="l-notification-container"
+    />
+    <TimeTheoremShop
+      v-if="view.subtab === 'studies'"
+      class="l-time-studies-tab__tt-shop"
+    />
+    <ModernSidebar v-if="view.newUI" />
+    <SaveTimer />
+    <SpeedrunStatus />
+    <BackgroundAnimations />
+    <PopupModal
+      v-if="view.modal.current"
+      :modal="view.modal.current"
+    />
+    <ModalProgressBar v-if="view.modal.progressBar" />
+    <FadeToBlack v-if="rollCredits" />
+    <CreditsContainer v-if="rollCredits" />
+    <NewGame v-if="rollCredits" />
+  </div>
+</template>
+
+<style scoped>
+.c-game-ui--fixed {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  pointer-events: none;
+
+  z-index: 5;
+  display: flex;
+  justify-content: center;
+  top: 0;
+  left: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/tabs/celestial-pelle/NewGame.vue b/src/components/tabs/celestial-pelle/NewGame.vue
index ff651716a..120323bb5 100644
--- a/src/components/tabs/celestial-pelle/NewGame.vue
+++ b/src/components/tabs/celestial-pelle/NewGame.vue
@@ -64,6 +64,7 @@ export default {
 <style scoped>
 .c-new-game-container {
   position: absolute;
+  pointer-events: auto;
   left: 50%;
   top: 50%;
   transform: translate(-50%, -50%);

From 1e3f74701cd8f4dd9b82580af81302e409604fa2 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 10 Apr 2022 09:30:08 +0800
Subject: [PATCH 11/89] Address PR feedback

All except barrelRoll
---
 javascripts/core/app/options.js                      |  2 +-
 javascripts/core/big_crunch.js                       |  2 +-
 javascripts/core/devtools.js                         |  2 +-
 javascripts/core/dilation.js                         |  2 +-
 javascripts/core/eternity.js                         |  2 +-
 javascripts/core/full-screen-animation-handler.js    |  3 ++-
 public/stylesheets/styles.css                        |  2 +-
 src/components/GameUIComponent.vue                   | 12 +++---------
 src/components/GameUIFixedComponents.vue             |  8 +++++++-
 .../modals/prestige/EnterDilationModal.vue           |  2 +-
 src/components/modals/prestige/EternityModal.vue     |  2 +-
 11 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/javascripts/core/app/options.js b/javascripts/core/app/options.js
index ea835367d..b1f33a1aa 100644
--- a/javascripts/core/app/options.js
+++ b/javascripts/core/app/options.js
@@ -1,5 +1,5 @@
 import { sha512_256 } from "js-sha512";
-import { FullScreenAnimationHandler } from "../full-screen-animation-handler";
+import FullScreenAnimationHandler from "../full-screen-animation-handler";
 
 export class GameOptions {
 
diff --git a/javascripts/core/big_crunch.js b/javascripts/core/big_crunch.js
index 38f38f780..67df03350 100644
--- a/javascripts/core/big_crunch.js
+++ b/javascripts/core/big_crunch.js
@@ -1,7 +1,7 @@
 import { GameMechanicState, SetPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js";
 import { DC } from "./constants.js";
 import { SpeedrunMilestones } from "./speedrun.js";
-import { FullScreenAnimationHandler } from "./full-screen-animation-handler.js";
+import FullScreenAnimationHandler from "./full-screen-animation-handler";
 
 export function bigCrunchAnimation() {
   FullScreenAnimationHandler.display("implode", 2);
diff --git a/javascripts/core/devtools.js b/javascripts/core/devtools.js
index 9a9838b13..c5c62d00c 100644
--- a/javascripts/core/devtools.js
+++ b/javascripts/core/devtools.js
@@ -1,6 +1,6 @@
 import { DC } from "./constants.js";
 import { sha512_256 } from "js-sha512";
-import { FullScreenAnimationHandler } from "./full-screen-animation-handler.js";
+import FullScreenAnimationHandler from "./full-screen-animation-handler";
 
 /* eslint-disable no-console */
 // Disabling no-console here seems
diff --git a/javascripts/core/dilation.js b/javascripts/core/dilation.js
index 3015ee34a..682f243ff 100644
--- a/javascripts/core/dilation.js
+++ b/javascripts/core/dilation.js
@@ -1,7 +1,7 @@
 import { SetPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js";
 import { DC } from "./constants.js";
 import { SpeedrunMilestones } from "./speedrun.js";
-import { FullScreenAnimationHandler } from "./full-screen-animation-handler.js";
+import FullScreenAnimationHandler from "./full-screen-animation-handler";
 
 export function animateAndDilate() {
   FullScreenAnimationHandler.display("dilate", 2);
diff --git a/javascripts/core/eternity.js b/javascripts/core/eternity.js
index 6bd15eb6f..26178bd34 100644
--- a/javascripts/core/eternity.js
+++ b/javascripts/core/eternity.js
@@ -1,6 +1,6 @@
 import { GameMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index.js";
 import { DC } from "./constants.js";
-import { FullScreenAnimationHandler } from "./full-screen-animation-handler.js";
+import FullScreenAnimationHandler from "./full-screen-animation-handler";
 
 function giveEternityRewards(auto) {
   player.records.bestEternity.time = Math.min(player.records.thisEternity.time, player.records.bestEternity.time);
diff --git a/javascripts/core/full-screen-animation-handler.js b/javascripts/core/full-screen-animation-handler.js
index 983cdf7d1..eb16410b4 100644
--- a/javascripts/core/full-screen-animation-handler.js
+++ b/javascripts/core/full-screen-animation-handler.js
@@ -1,4 +1,5 @@
-export const FullScreenAnimationHandler = {
+export default {
+  name: "FullScreenAnimationHandler",
   isDisplaying: false,
   displayForce(name, duration) {
     document.getElementById("ui").style.animation = `${name} ${duration}s 1`;
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index a384cc434..2964f9c29 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -9154,7 +9154,7 @@ input.o-automator-block-input {
   position: absolute;
   top: 1rem;
   width: 2rem;
-  right: 1rem;
+  right: 2rem;
   height: 2rem;
   border-radius: 50%;
   line-height: 1.9rem;
diff --git a/src/components/GameUIComponent.vue b/src/components/GameUIComponent.vue
index 9204fafd3..b572f670b 100644
--- a/src/components/GameUIComponent.vue
+++ b/src/components/GameUIComponent.vue
@@ -2,9 +2,7 @@
 import ClassicUi from "@/components/ui-modes/classic/ClassicUi";
 import ModernUi from "@/components/ui-modes/modern/ModernUi";
 import TabComponents from "@/components/tabs";
-import GameUIFixedComponents from "@/components/GameUIFixedComponents";
-import HowToPlay from "@/components/HowToPlay";
-import InfoButton from "@/components/InfoButton";
+import GameUiFixedComponents from "@/components/GameUiFixedComponents";
 
 export default {
   name: "GameUIComponent",
@@ -12,9 +10,7 @@ export default {
     ...TabComponents,
     ClassicUi,
     ModernUi,
-    GameUIFixedComponents,
-    HowToPlay,
-    InfoButton
+    GameUiFixedComponents
   },
   computed: {
     view() {
@@ -51,8 +47,6 @@ export default {
       <component :is="uiLayout">
         <component :is="page" />
       </component>
-      <HowToPlay />
-      <InfoButton />
       <link
         v-if="view.theme !== 'Normal'"
         type="text/css"
@@ -60,7 +54,7 @@ export default {
         :href="themeCss"
       >
     </div>
-    <GameUIFixedComponents />
+    <GameUiFixedComponents />
   </div>
 </template>
 
diff --git a/src/components/GameUIFixedComponents.vue b/src/components/GameUIFixedComponents.vue
index b7af001a8..a9429d6d2 100644
--- a/src/components/GameUIFixedComponents.vue
+++ b/src/components/GameUIFixedComponents.vue
@@ -1,4 +1,6 @@
 <script>
+import HowToPlay from "@/components/HowToPlay";
+import InfoButton from "@/components/InfoButton";
 import TimeTheoremShop from "@/components/tabs/time-studies/tt-shop/TimeTheoremShop";
 import ModernSidebar from "@/components/ui-modes/modern/ModernSidebar";
 import SaveTimer from "@/components/SaveTimer";
@@ -11,8 +13,10 @@ import CreditsContainer from "@/components/tabs/celestial-pelle/CreditsContainer
 import NewGame from "@/components/tabs/celestial-pelle/NewGame";
 
 export default {
-  name: "GameUIFixedComponents",
+  name: "GameUiFixedComponents",
   components: {
+    HowToPlay,
+    InfoButton,
     TimeTheoremShop,
     ModernSidebar,
     SaveTimer,
@@ -52,6 +56,8 @@ export default {
       id="notification-container"
       class="l-notification-container"
     />
+    <HowToPlay />
+    <InfoButton />
     <TimeTheoremShop
       v-if="view.subtab === 'studies'"
       class="l-time-studies-tab__tt-shop"
diff --git a/src/components/modals/prestige/EnterDilationModal.vue b/src/components/modals/prestige/EnterDilationModal.vue
index a34178547..5dad013df 100644
--- a/src/components/modals/prestige/EnterDilationModal.vue
+++ b/src/components/modals/prestige/EnterDilationModal.vue
@@ -1,6 +1,6 @@
 <script>
 import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
-import { FullScreenAnimationHandler } from "../../../../javascripts/core/full-screen-animation-handler.js";
+import FullScreenAnimationHandler from "../../../../javascripts/core/full-screen-animation-handler";
 
 export default {
   name: "EnterDilationModal",
diff --git a/src/components/modals/prestige/EternityModal.vue b/src/components/modals/prestige/EternityModal.vue
index 10c9b3c09..af59e9c80 100644
--- a/src/components/modals/prestige/EternityModal.vue
+++ b/src/components/modals/prestige/EternityModal.vue
@@ -1,6 +1,6 @@
 <script>
 import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
-import { FullScreenAnimationHandler } from "../../../../javascripts/core/full-screen-animation-handler.js";
+import FullScreenAnimationHandler from "../../../../javascripts/core/full-screen-animation-handler";
 
 export default {
   name: "EternityModal",

From a3883d4d3124691b7c3e09075bc7746a61d4df00 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Tue, 12 Apr 2022 20:08:13 +0800
Subject: [PATCH 12/89] No name

---
 javascripts/core/full-screen-animation-handler.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/javascripts/core/full-screen-animation-handler.js b/javascripts/core/full-screen-animation-handler.js
index eb16410b4..2b61602cf 100644
--- a/javascripts/core/full-screen-animation-handler.js
+++ b/javascripts/core/full-screen-animation-handler.js
@@ -1,5 +1,4 @@
 export default {
-  name: "FullScreenAnimationHandler",
   isDisplaying: false,
   displayForce(name, duration) {
     document.getElementById("ui").style.animation = `${name} ${duration}s 1`;

From 74ec4cc4ef536ee73b66b04ec6da84a0fb3d31ef Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Fri, 15 Apr 2022 23:42:31 +0800
Subject: [PATCH 13/89] Recapitalise GameUiFixedComponents

---
 src/components/GameUiFixedComponents.vue | 83 ++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 src/components/GameUiFixedComponents.vue

diff --git a/src/components/GameUiFixedComponents.vue b/src/components/GameUiFixedComponents.vue
new file mode 100644
index 000000000..2d19fa81b
--- /dev/null
+++ b/src/components/GameUiFixedComponents.vue
@@ -0,0 +1,83 @@
+<script>
+import HowToPlay from "@/components/HowToPlay";
+import InfoButton from "@/components/InfoButton";
+import TimeTheoremShop from "@/components/tabs/time-studies/tt-shop/TimeTheoremShop";
+import ModernSidebar from "@/components/ui-modes/modern/ModernSidebar";
+import SaveTimer from "@/components/SaveTimer";
+import SpeedrunStatus from "@/components/SpeedrunStatus";
+import BackgroundAnimations from "@/components/BackgroundAnimations";
+import PopupModal from "@/components/modals/PopupModal";
+import ModalProgressBar from "@/components/modals/ModalProgressBar";
+import FadeToBlack from "@/components/tabs/celestial-pelle/FadeToBlack";
+import CreditsContainer from "@/components/tabs/celestial-pelle/CreditsContainer";
+import NewGame from "@/components/tabs/celestial-pelle/NewGame";
+
+export default {
+  name: "GameUiFixedComponents",
+  components: {
+    HowToPlay,
+    InfoButton,
+    TimeTheoremShop,
+    ModernSidebar,
+    SaveTimer,
+    SpeedrunStatus,
+    BackgroundAnimations,
+    PopupModal,
+    ModalProgressBar,
+    FadeToBlack,
+    CreditsContainer,
+    NewGame
+  },
+  computed: {
+    view() {
+      return this.$viewModel;
+    }
+  }
+};
+</script>
+
+
+<template>
+  <div
+    id="ui-fixed"
+    class="c-game-ui--fixed"
+  >
+    <div
+      id="notification-container"
+      class="l-notification-container"
+    />
+    <HowToPlay />
+    <InfoButton />
+    <TimeTheoremShop
+      v-if="view.subtab === 'studies'"
+      class="l-time-studies-tab__tt-shop"
+    />
+    <ModernSidebar v-if="view.newUI" />
+    <SaveTimer />
+    <SpeedrunStatus />
+    <BackgroundAnimations />
+    <PopupModal
+      v-if="view.modal.current"
+      :modal="view.modal.current"
+    />
+    <ModalProgressBar v-if="view.modal.progressBar" />
+    <FadeToBlack />
+    <CreditsContainer />
+    <NewGame />
+  </div>
+</template>
+
+<style scoped>
+.c-game-ui--fixed {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  pointer-events: none;
+
+  z-index: 5;
+  display: flex;
+  justify-content: center;
+  top: 0;
+  left: 0;
+}
+</style>
\ No newline at end of file

From 3c87dcd0e787060e133d3ca5fcd03a518d9a136e Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 17 Apr 2022 10:52:16 +0800
Subject: [PATCH 14/89] Hide fixed components during fullscreen

---
 javascripts/core/app/ui.init.js          | 1 -
 src/components/GameUiFixedComponents.vue | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/javascripts/core/app/ui.init.js b/javascripts/core/app/ui.init.js
index d2f240753..c220e1564 100644
--- a/javascripts/core/app/ui.init.js
+++ b/javascripts/core/app/ui.init.js
@@ -1,4 +1,3 @@
-// eslint-disable-next-line prefer-const
 export const state = {
   view: {
     modal: {
diff --git a/src/components/GameUiFixedComponents.vue b/src/components/GameUiFixedComponents.vue
index 2d19fa81b..2690cf280 100644
--- a/src/components/GameUiFixedComponents.vue
+++ b/src/components/GameUiFixedComponents.vue
@@ -38,9 +38,13 @@ export default {
 
 
 <template>
+  <!-- Hide the button if the automator is in fullscreen mode: Nothing here needs to be visible during fullscreen -->
   <div
     id="ui-fixed"
     class="c-game-ui--fixed"
+    :style="{
+      visibility: view.tabs.reality.automator.fullScreen ? 'hidden' : 'visible'
+    }"
   >
     <div
       id="notification-container"

From 04a7ab1bbfabd9f909666bd264746cb05301845f Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 17 Apr 2022 23:23:43 +0800
Subject: [PATCH 15/89] Fix inverted theme for fixed container elements

---
 public/stylesheets/theme-Inverted.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/public/stylesheets/theme-Inverted.css b/public/stylesheets/theme-Inverted.css
index d390c7b16..611c95f7c 100644
--- a/public/stylesheets/theme-Inverted.css
+++ b/public/stylesheets/theme-Inverted.css
@@ -4,10 +4,7 @@ body.t-inverted {
 
 .t-inverted #container,
 .t-inverted #page,
-.t-inverted .l-notification-container,
-.t-inverted .c-modal,
-.t-inverted #TTbuttons,
-.t-inverted .sidebar,
+.t-inverted #ui-fixed,
 .t-inverted .c-glyph-tooltip {
   filter: invert(100%);
 }

From acf3318bd816b72f74005aa03ccbd5f1fa076fa7 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 17 Apr 2022 23:26:36 +0800
Subject: [PATCH 16/89] Whoops, missed inverted metro and confused for the last
 fix

---
 public/stylesheets/theme-Inverted Metro.css | 5 +----
 public/stylesheets/theme-S3.css             | 5 +----
 src/components/SaveTimer.vue                | 5 -----
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/public/stylesheets/theme-Inverted Metro.css b/public/stylesheets/theme-Inverted Metro.css
index 5f40eb0e0..06414ae92 100644
--- a/public/stylesheets/theme-Inverted Metro.css	
+++ b/public/stylesheets/theme-Inverted Metro.css	
@@ -4,10 +4,7 @@ body.t-inverted-metro {
 
 .t-inverted-metro #container,
 .t-inverted-metro #page,
-.t-inverted-metro .l-notification-container,
-.t-inverted-metro .c-modal,
-.t-inverted-metro #TTbuttons,
-.t-inverted-metro .sidebar,
+.t-inverted-metro #ui-fixed,
 .t-inverted-metro .c-glyph-tooltip {
   filter: invert(100%);
 }
diff --git a/public/stylesheets/theme-S3.css b/public/stylesheets/theme-S3.css
index 9295871b0..e3e0a2965 100644
--- a/public/stylesheets/theme-S3.css
+++ b/public/stylesheets/theme-S3.css
@@ -4,10 +4,7 @@ body {
 
 .t-s3 #container,
 .t-s3 #page,
-.t-s3 .l-notification-container,
-.t-s3 .c-modal,
-.t-s3 #TTbuttons,
-.t-s3 .sidebar,
+.t-s3 #ui-fixed,
 .t-s3 .c-glyph-tooltip {
   animation: glasses 7s infinite;
 }
diff --git a/src/components/SaveTimer.vue b/src/components/SaveTimer.vue
index ecb5a293d..652b13e8e 100644
--- a/src/components/SaveTimer.vue
+++ b/src/components/SaveTimer.vue
@@ -53,11 +53,6 @@ export default {
   z-index: 5;
 }
 
-.t-inverted .o-save-timer,
-.t-inverted-metro .o-save-timer {
-  filter: invert(100%)
-}
-
 .t-s2 .o-save-timer {
   filter: sepia(100%) hue-rotate(180deg) saturate(250%);
 }

From 15505586a5f6a496a4839e8e89823eff18093d9a Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 17 Apr 2022 23:45:01 +0800
Subject: [PATCH 17/89] Address PR feedback

---
 public/stylesheets/automator.css         |  3 +++
 src/components/GameUiFixedComponents.vue | 21 +++++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/public/stylesheets/automator.css b/public/stylesheets/automator.css
index 1a1cebcf1..9a3dc2ae4 100644
--- a/public/stylesheets/automator.css
+++ b/public/stylesheets/automator.css
@@ -245,6 +245,9 @@
   display: flex;
   flex-direction: column;
   flex: 1 1 auto;
+  /* I'm honestly scared of CSS. Despite this element having static positioning,
+  z-index is required here to stop the scrollbar of this from intersecting with anything else */
+  z-index: 1;
 }
 
 .CodeMirror-hint {
diff --git a/src/components/GameUiFixedComponents.vue b/src/components/GameUiFixedComponents.vue
index 2690cf280..509e778ec 100644
--- a/src/components/GameUiFixedComponents.vue
+++ b/src/components/GameUiFixedComponents.vue
@@ -31,6 +31,11 @@ export default {
   computed: {
     view() {
       return this.$viewModel;
+    },
+    hideIfMatoFullscreen() {
+      return {
+        visibility: ui.view.tabs.reality.automator.fullScreen ? "hidden" : "visible"
+      };
     }
   }
 };
@@ -42,23 +47,23 @@ export default {
   <div
     id="ui-fixed"
     class="c-game-ui--fixed"
-    :style="{
-      visibility: view.tabs.reality.automator.fullScreen ? 'hidden' : 'visible'
-    }"
   >
     <div
       id="notification-container"
       class="l-notification-container"
     />
-    <HowToPlay />
-    <InfoButton />
+    <HowToPlay :style="hideIfMatoFullscreen" />
+    <InfoButton :style="hideIfMatoFullscreen" />
     <TimeTheoremShop
       v-if="view.subtab === 'studies'"
       class="l-time-studies-tab__tt-shop"
     />
-    <ModernSidebar v-if="view.newUI" />
-    <SaveTimer />
-    <SpeedrunStatus />
+    <ModernSidebar
+      v-if="view.newUI"
+      :style="hideIfMatoFullscreen"
+    />
+    <SaveTimer :style="hideIfMatoFullscreen" />
+    <SpeedrunStatus :style="hideIfMatoFullscreen" />
     <BackgroundAnimations />
     <PopupModal
       v-if="view.modal.current"

From 7c2af9ff6395cf4b39fc4574d9ed4814a67a8dcf Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Tue, 19 Apr 2022 10:56:02 +0800
Subject: [PATCH 18/89] Address PR feedback

Apply fixes to background animation elements
---
 .../core/full-screen-animation-handler.js     |  6 +-
 javascripts/game.js                           |  1 -
 public/stylesheets/styles.css                 |  3 +-
 src/components/BackgroundAnimations.vue       | 25 ++++-
 src/components/GameUIComponent.vue            |  9 +-
 src/components/GameUIFixedComponents.vue      | 93 -------------------
 ...omponents.vue => GameUiComponentFixed.vue} | 21 +++--
 .../tabs/time-dilation/TimeDilationTab.vue    |  7 +-
 8 files changed, 46 insertions(+), 119 deletions(-)
 delete mode 100644 src/components/GameUIFixedComponents.vue
 rename src/components/{GameUiFixedComponents.vue => GameUiComponentFixed.vue} (87%)

diff --git a/javascripts/core/full-screen-animation-handler.js b/javascripts/core/full-screen-animation-handler.js
index 2b61602cf..1f21f73ec 100644
--- a/javascripts/core/full-screen-animation-handler.js
+++ b/javascripts/core/full-screen-animation-handler.js
@@ -1,12 +1,10 @@
 export default {
   isDisplaying: false,
   displayForce(name, duration) {
-    document.getElementById("ui").style.animation = `${name} ${duration}s 1`;
-    document.getElementById("ui-fixed").style.animation = `${name} ${duration}s 1`;
+    document.body.style.animation = `${name} ${duration}s 1`;
     this.isDisplaying = true;
     setTimeout(() => {
-      document.getElementById("ui").style.animation = "";
-      document.getElementById("ui-fixed").style.animation = "";
+      document.body.style.animation = "";
       this.isDisplaying = false;
     }, duration * 1000);
   },
diff --git a/javascripts/game.js b/javascripts/game.js
index 603ad305f..e1d507809 100644
--- a/javascripts/game.js
+++ b/javascripts/game.js
@@ -1057,7 +1057,6 @@ window.onload = function() {
       playFabLogin();
     }
     document.getElementById("loading").style.display = "none";
-    document.body.style.overflowY = "auto";
   }, 500);
   if (!supportedBrowser) {
     GameIntervals.stop();
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index 2964f9c29..cffae3815 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -5117,7 +5117,7 @@ screen and (max-width: 480px) {
 
 
 .c-tachyon-particle-container {
-  position: fixed;
+  position: absolute;
   top: 0;
   left: 0;
   width: 100%;
@@ -9152,6 +9152,7 @@ input.o-automator-block-input {
 
 .l-help-me {
   position: absolute;
+  pointer-events: auto;
   top: 1rem;
   width: 2rem;
   right: 2rem;
diff --git a/src/components/BackgroundAnimations.vue b/src/components/BackgroundAnimations.vue
index f3bd72fc3..b1aba63c1 100644
--- a/src/components/BackgroundAnimations.vue
+++ b/src/components/BackgroundAnimations.vue
@@ -1,26 +1,43 @@
 <script>
 import BlobSnowflakes from "@/components/BlobSnowflakes";
+import TachyonParticles from "@/components/tabs/time-dilation/TachyonParticles";
 
 export default {
   name: "BackgroundAnimations",
   components: {
     BlobSnowflakes,
+    TachyonParticles
   },
   data() {
     return {
-      animateBackground: false,
       blob: false,
+      animateTachyons: false
     };
   },
   methods: {
     update() {
-      this.animateBackground = player.options.animations.background;
       this.blob = player.options.theme === "S11";
+      this.animateTachyons = player.options.animations.tachyonParticles &&
+        Tabs.current[this.$viewModel.subtab].name === "Time Dilation";
     }
   },
 };
 </script>
 
 <template>
-  <BlobSnowflakes v-if="blob" />
-</template>
\ No newline at end of file
+  <div
+    id="ui-background-animations"
+    class="l-background-animations"
+  >
+    <BlobSnowflakes v-if="blob" />
+    <TachyonParticles v-if="animateTachyons" />
+  </div>
+</template>
+
+<style scoped>
+.l-background-animataions {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/GameUIComponent.vue b/src/components/GameUIComponent.vue
index b572f670b..007fdc651 100644
--- a/src/components/GameUIComponent.vue
+++ b/src/components/GameUIComponent.vue
@@ -2,7 +2,8 @@
 import ClassicUi from "@/components/ui-modes/classic/ClassicUi";
 import ModernUi from "@/components/ui-modes/modern/ModernUi";
 import TabComponents from "@/components/tabs";
-import GameUiFixedComponents from "@/components/GameUiFixedComponents";
+import GameUiComponentFixed from "@/components/GameUiComponentFixed";
+import BackgroundAnimations from "@/components/BackgroundAnimations";
 
 export default {
   name: "GameUIComponent",
@@ -10,7 +11,8 @@ export default {
     ...TabComponents,
     ClassicUi,
     ModernUi,
-    GameUiFixedComponents
+    GameUiComponentFixed,
+    BackgroundAnimations
   },
   computed: {
     view() {
@@ -54,7 +56,8 @@ export default {
         :href="themeCss"
       >
     </div>
-    <GameUiFixedComponents />
+    <GameUiComponentFixed />
+    <BackgroundAnimations />
   </div>
 </template>
 
diff --git a/src/components/GameUIFixedComponents.vue b/src/components/GameUIFixedComponents.vue
deleted file mode 100644
index a9429d6d2..000000000
--- a/src/components/GameUIFixedComponents.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<script>
-import HowToPlay from "@/components/HowToPlay";
-import InfoButton from "@/components/InfoButton";
-import TimeTheoremShop from "@/components/tabs/time-studies/tt-shop/TimeTheoremShop";
-import ModernSidebar from "@/components/ui-modes/modern/ModernSidebar";
-import SaveTimer from "@/components/SaveTimer";
-import SpeedrunStatus from "@/components/SpeedrunStatus";
-import BackgroundAnimations from "@/components/BackgroundAnimations";
-import PopupModal from "@/components/modals/PopupModal";
-import ModalProgressBar from "@/components/modals/ModalProgressBar";
-import FadeToBlack from "@/components/tabs/celestial-pelle/FadeToBlack";
-import CreditsContainer from "@/components/tabs/celestial-pelle/CreditsContainer";
-import NewGame from "@/components/tabs/celestial-pelle/NewGame";
-
-export default {
-  name: "GameUiFixedComponents",
-  components: {
-    HowToPlay,
-    InfoButton,
-    TimeTheoremShop,
-    ModernSidebar,
-    SaveTimer,
-    SpeedrunStatus,
-    BackgroundAnimations,
-    PopupModal,
-    ModalProgressBar,
-    FadeToBlack,
-    CreditsContainer,
-    NewGame
-  },
-  data() {
-    return {
-      rollCredits: false,
-    };
-  },
-  computed: {
-    view() {
-      return this.$viewModel;
-    }
-  },
-  methods: {
-    update() {
-      this.rollCredits = GameEnd.endState >= 2.5;
-    }
-  }
-};
-</script>
-
-
-<template>
-  <div
-    id="ui-fixed"
-    class="c-game-ui--fixed"
-  >
-    <div
-      id="notification-container"
-      class="l-notification-container"
-    />
-    <HowToPlay />
-    <InfoButton />
-    <TimeTheoremShop
-      v-if="view.subtab === 'studies'"
-      class="l-time-studies-tab__tt-shop"
-    />
-    <ModernSidebar v-if="view.newUI" />
-    <SaveTimer />
-    <SpeedrunStatus />
-    <BackgroundAnimations />
-    <PopupModal
-      v-if="view.modal.current"
-      :modal="view.modal.current"
-    />
-    <ModalProgressBar v-if="view.modal.progressBar" />
-    <FadeToBlack v-if="rollCredits" />
-    <CreditsContainer v-if="rollCredits" />
-    <NewGame v-if="rollCredits" />
-  </div>
-</template>
-
-<style scoped>
-.c-game-ui--fixed {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  pointer-events: none;
-
-  z-index: 5;
-  display: flex;
-  justify-content: center;
-  top: 0;
-  left: 0;
-}
-</style>
\ No newline at end of file
diff --git a/src/components/GameUiFixedComponents.vue b/src/components/GameUiComponentFixed.vue
similarity index 87%
rename from src/components/GameUiFixedComponents.vue
rename to src/components/GameUiComponentFixed.vue
index 509e778ec..908010c4f 100644
--- a/src/components/GameUiFixedComponents.vue
+++ b/src/components/GameUiComponentFixed.vue
@@ -5,7 +5,6 @@ import TimeTheoremShop from "@/components/tabs/time-studies/tt-shop/TimeTheoremS
 import ModernSidebar from "@/components/ui-modes/modern/ModernSidebar";
 import SaveTimer from "@/components/SaveTimer";
 import SpeedrunStatus from "@/components/SpeedrunStatus";
-import BackgroundAnimations from "@/components/BackgroundAnimations";
 import PopupModal from "@/components/modals/PopupModal";
 import ModalProgressBar from "@/components/modals/ModalProgressBar";
 import FadeToBlack from "@/components/tabs/celestial-pelle/FadeToBlack";
@@ -13,7 +12,7 @@ import CreditsContainer from "@/components/tabs/celestial-pelle/CreditsContainer
 import NewGame from "@/components/tabs/celestial-pelle/NewGame";
 
 export default {
-  name: "GameUiFixedComponents",
+  name: "GameUiComponentFixed",
   components: {
     HowToPlay,
     InfoButton,
@@ -21,13 +20,17 @@ export default {
     ModernSidebar,
     SaveTimer,
     SpeedrunStatus,
-    BackgroundAnimations,
     PopupModal,
     ModalProgressBar,
     FadeToBlack,
     CreditsContainer,
     NewGame
   },
+  data() {
+    return {
+      rollingCredits: false
+    };
+  },
   computed: {
     view() {
       return this.$viewModel;
@@ -37,6 +40,11 @@ export default {
         visibility: ui.view.tabs.reality.automator.fullScreen ? "hidden" : "visible"
       };
     }
+  },
+  methods: {
+    update() {
+      this.rollingCredits = GameEnd.endState >= 2.5;
+    }
   }
 };
 </script>
@@ -64,15 +72,14 @@ export default {
     />
     <SaveTimer :style="hideIfMatoFullscreen" />
     <SpeedrunStatus :style="hideIfMatoFullscreen" />
-    <BackgroundAnimations />
     <PopupModal
       v-if="view.modal.current"
       :modal="view.modal.current"
     />
     <ModalProgressBar v-if="view.modal.progressBar" />
-    <FadeToBlack />
-    <CreditsContainer />
-    <NewGame />
+    <FadeToBlack v-if="rollingCredits" />
+    <CreditsContainer v-if="rollingCredits" />
+    <NewGame v-if="rollingCredits" />
   </div>
 </template>
 
diff --git a/src/components/tabs/time-dilation/TimeDilationTab.vue b/src/components/tabs/time-dilation/TimeDilationTab.vue
index 688b8dcd1..9fafbcf1e 100644
--- a/src/components/tabs/time-dilation/TimeDilationTab.vue
+++ b/src/components/tabs/time-dilation/TimeDilationTab.vue
@@ -1,14 +1,12 @@
 <script>
 import DilationButton from "./DilationButton";
 import DilationUpgradeButton from "./DilationUpgradeButton";
-import TachyonParticles from "./TachyonParticles";
 
 export default {
   name: "TimeDilationTab",
   components: {
     DilationButton,
-    DilationUpgradeButton,
-    TachyonParticles
+    DilationUpgradeButton
   },
   data() {
     return {
@@ -17,7 +15,6 @@ export default {
       dilatedTimeIncome: new Decimal(),
       galaxyThreshold: new Decimal(),
       galaxies: 0,
-      animateTachyons: true,
       tachyonGalaxyGain: 1,
       hasPelleDilationUpgrades: false
     };
@@ -85,7 +82,6 @@ export default {
       }
       this.galaxyThreshold.copyFrom(player.dilation.nextThreshold);
       this.galaxies = player.dilation.totalTachyonGalaxies;
-      this.animateTachyons = player.options.animations.tachyonParticles;
       this.hasPelleDilationUpgrades = PelleRifts.death.milestones[0].canBeApplied;
       if (this.galaxies < 1000 && DilationUpgrade.doubleGalaxies.isBought) {
         this.tachyonGalaxyGain = DilationUpgrade.doubleGalaxies.effectValue;
@@ -172,7 +168,6 @@ export default {
         />
       </div>
     </div>
-    <TachyonParticles v-if="animateTachyons" />
   </div>
 </template>
 

From 95e7181f3a20c37eb6cfc9572c40ffc733728841 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Mon, 25 Apr 2022 15:05:52 +0800
Subject: [PATCH 19/89] Changes to t-s3 and remove l-background-animataions
 mispelled property

---
 public/stylesheets/theme-S3.css         | 3 +--
 src/components/BackgroundAnimations.vue | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/public/stylesheets/theme-S3.css b/public/stylesheets/theme-S3.css
index e3e0a2965..27c40c94d 100644
--- a/public/stylesheets/theme-S3.css
+++ b/public/stylesheets/theme-S3.css
@@ -2,8 +2,7 @@ body {
   background: none !important;
 }
 
-.t-s3 #container,
-.t-s3 #page,
+.t-s3 #ui,
 .t-s3 #ui-fixed,
 .t-s3 .c-glyph-tooltip {
   animation: glasses 7s infinite;
diff --git a/src/components/BackgroundAnimations.vue b/src/components/BackgroundAnimations.vue
index b1aba63c1..4a02cfdec 100644
--- a/src/components/BackgroundAnimations.vue
+++ b/src/components/BackgroundAnimations.vue
@@ -35,9 +35,5 @@ export default {
 </template>
 
 <style scoped>
-.l-background-animataions {
-  position: fixed;
-  width: 100vw;
-  height: 100vh;
-}
+
 </style>
\ No newline at end of file

From 7927d8829fb452027dec95cea86727335cb06b36 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Tue, 26 Apr 2022 10:48:45 +0800
Subject: [PATCH 20/89] Add greyscale to ui-fixed

---
 public/stylesheets/theme-S7.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/theme-S7.css b/public/stylesheets/theme-S7.css
index d58c41386..227e60d38 100644
--- a/public/stylesheets/theme-S7.css
+++ b/public/stylesheets/theme-S7.css
@@ -7,7 +7,8 @@
   animation: none !important;
 }
 
-#ui {
+#ui,
+#ui-fixed {
   filter: saturate(0) !important;
 }
 

From 85c0e339180f43f5459e0ad55ceb6f4904149802 Mon Sep 17 00:00:00 2001
From: L4R5W <lars3.8.1999@gmail.com>
Date: Wed, 4 May 2022 14:18:27 +0200
Subject: [PATCH 21/89] "store game/real time" consistency

---
 javascripts/core/automator/automator-commands.js | 10 +++++-----
 javascripts/core/celestials/celestials.js        |  2 +-
 javascripts/core/secret-formula/h2p.js           | 16 ++++++++--------
 .../core/secret-formula/reality/automator.js     |  6 +++---
 src/components/modals/EnslavedHintsModal.vue     |  6 +++---
 .../tabs/celestial-enslaved/EnslavedTab.vue      |  4 ++--
 .../tabs/glyphs/RealityAmplifyButton.vue         |  2 +-
 7 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/javascripts/core/automator/automator-commands.js b/javascripts/core/automator/automator-commands.js
index c1c87eaf9..bf79fe088 100644
--- a/javascripts/core/automator/automator-commands.js
+++ b/javascripts/core/automator/automator-commands.js
@@ -571,8 +571,8 @@ export const AutomatorCommands = ((() => {
       validate: (ctx, V) => {
         ctx.startLine = ctx.StoreTime[0].startLine;
         if (!Enslaved.isUnlocked) {
-          V.addError(ctx.StoreTime[0], "You do not yet know how to store time",
-            "Unlock the ability to store time");
+          V.addError(ctx.StoreTime[0], "You do not yet know how to store game time",
+            "Unlock the ability to store game time");
           return false;
         }
         return true;
@@ -581,9 +581,9 @@ export const AutomatorCommands = ((() => {
         if (ctx.Use) return () => {
           if (Enslaved.isUnlocked) {
             Enslaved.useStoredTime(false);
-            AutomatorData.logCommandEvent(`Stored time used`, ctx.startLine);
+            AutomatorData.logCommandEvent(`Stored game time used`, ctx.startLine);
           } else {
-            AutomatorData.logCommandEvent(`Attempted to use stored time, but failed (not unlocked yet)`,
+            AutomatorData.logCommandEvent(`Attempted to use stored game time, but failed (not unlocked yet)`,
               ctx.startLine);
           }
           return AUTOMATOR_COMMAND_STATUS.NEXT_INSTRUCTION;
@@ -591,7 +591,7 @@ export const AutomatorCommands = ((() => {
         const on = Boolean(ctx.On);
         return () => {
           if (on !== player.celestials.enslaved.isStoring) Enslaved.toggleStoreBlackHole();
-          AutomatorData.logCommandEvent(`Storing time toggled ${ctx.On ? "ON" : "OFF"}`, ctx.startLine);
+          AutomatorData.logCommandEvent(`Storing game time toggled ${ctx.On ? "ON" : "OFF"}`, ctx.startLine);
           return AUTOMATOR_COMMAND_STATUS.NEXT_INSTRUCTION;
         };
       },
diff --git a/javascripts/core/celestials/celestials.js b/javascripts/core/celestials/celestials.js
index 398206786..2563eaff6 100644
--- a/javascripts/core/celestials/celestials.js
+++ b/javascripts/core/celestials/celestials.js
@@ -44,7 +44,7 @@ GameDatabase.celestials.descriptions = [
       Tachyon Particle production and Dilated Time production are severely reduced
       Time Theorem generation from Dilation Glyphs is disabled
       Certain challenge goals have been increased
-      Stored 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)}) `;
     }
   },
   {
diff --git a/javascripts/core/secret-formula/h2p.js b/javascripts/core/secret-formula/h2p.js
index d1617d2b8..6b910d3ee 100644
--- a/javascripts/core/secret-formula/h2p.js
+++ b/javascripts/core/secret-formula/h2p.js
@@ -1136,11 +1136,11 @@ When unlocking The Enslaved Ones, you immediately gain access to two new mechani
 Stored game time is also used as a currency for purchasing unlocks from The Enslaved Ones.
 <br>
 <br>
-Charging your Black Hole gives you stored time, which it does at the expense of setting your game speed to
-${formatInt(1)}. The game is in effect using your increased game speed in order to store time itself. Its
-main use is to discharge the Black Hole, which takes uses your stored time to skip forward in time by a duration
-equal to the time stored. This is different than regular game speed multipliers in that discharging is not subject to
-any modifiers to game speed when it is used, only when it is stored.
+Charging your Black Hole gives you stored game time, which it does at the expense of setting your game speed to
+${formatInt(1)}. The game is in effect using your increased game speed in order to store game time itself. Its
+main use is to discharge the Black Hole, which takes uses your stored game time to skip forward in time by a duration
+equal to the game time stored. This is different than regular game speed multipliers in that discharging is not subject
+to any modifiers to game speed when it is used, only when it is stored.
 <br>
 <br>
 Storing real time completely stops all production, effectively pausing your game. For every real-time second that
@@ -1158,13 +1158,13 @@ You can toggle a setting to automatically store offline time as stored real time
 <br>
 <br>
 Their first unlock costs ${format(TimeSpan.fromMilliseconds(ENSLAVED_UNLOCKS.FREE_TICKSPEED_SOFTCAP.price).totalYears)}
-years of stored time. It increases the softcap to Tickspeed Upgrades gained from Time Dimensions
+years of stored game time. It increases the softcap to Tickspeed Upgrades gained from Time Dimensions
 (the point at which their cost starts increasing faster)
 by ${format(1e5)} Tickspeed Upgrades.
 <br>
 <br>
-At ${format(TimeSpan.fromMilliseconds(ENSLAVED_UNLOCKS.RUN.price).totalYears)} years of stored time, you are able to
-finally unlock their Reality. The reward for completing The Enslaved Ones' Reality is
+At ${format(TimeSpan.fromMilliseconds(ENSLAVED_UNLOCKS.RUN.price).totalYears)} years of stored game time, you are able
+to finally unlock their Reality. The reward for completing The Enslaved Ones' Reality is
 ${Enslaved.isCompleted
     ? "unlocking Tesseracts, which have their own How To Play entry."
     : "<span style='color: var(--color-bad);'>(complete The Enslaved Ones' Reality to see reward details)</span>"}
diff --git a/javascripts/core/secret-formula/reality/automator.js b/javascripts/core/secret-formula/reality/automator.js
index a2ea46538..a2b51aa5c 100644
--- a/javascripts/core/secret-formula/reality/automator.js
+++ b/javascripts/core/secret-formula/reality/automator.js
@@ -138,7 +138,7 @@ GameDatabase.reality.automator = {
       id: 5,
       isUnlocked: () => Enslaved.isUnlocked,
       keyword: "store time",
-      name: "<b>store time</b> - either turns on/off the storing of time or can be used to use stored time",
+      name: "<b>store time</b> - either turns on/off the storing of game time or can be used to use stored game time",
       syntax: "<b>store time</b> action",
       sections: [
         {
@@ -147,13 +147,13 @@ GameDatabase.reality.automator = {
             {
               header: "<i>on/off</i>",
               description: `
-                Turns storing time on or off.
+                Turns storing game time on or off.
               `
             },
             {
               header: "<i>use</i>",
               description: `
-                Uses stored time.
+                Uses stored game time.
               `
             }
           ]
diff --git a/src/components/modals/EnslavedHintsModal.vue b/src/components/modals/EnslavedHintsModal.vue
index e1f04258c..46cc966fd 100644
--- a/src/components/modals/EnslavedHintsModal.vue
+++ b/src/components/modals/EnslavedHintsModal.vue
@@ -117,12 +117,12 @@ export default {
       <br>
     </div>
     <div v-if="realityHintsLeft + glyphHintsLeft > 0">
-      You can spend some time looking for some more cracks in the Reality, but every hint you spend Stored Time on
-      will increase the Stored Time needed for the next by a factor of {{ formatInt(3) }}. This cost bump will
+      You can spend some time looking for some more cracks in the Reality, but every hint you spend stored game time on
+      will increase the stored game time needed for the next by a factor of {{ formatInt(3) }}. This cost bump will
       gradually go away over {{ formatInt(24) }} hours and figuring out what the hint means will immediately
       divide the cost by {{ formatInt(2) }}. The cost can't be reduced below {{ format(1e40) }} years.
       <br><br>
-      The next hint will cost {{ hintCost }} Stored Time. You currently have {{ formattedStored }} stored.
+      The next hint will cost {{ hintCost }} stored game time. You currently have {{ formattedStored }} stored.
       <span v-if="currentStored < nextHintCost">
         You will reach this if you charge your Black Hole for {{ timeEstimate }}.
       </span>
diff --git a/src/components/tabs/celestial-enslaved/EnslavedTab.vue b/src/components/tabs/celestial-enslaved/EnslavedTab.vue
index f6104648f..860fe3a90 100644
--- a/src/components/tabs/celestial-enslaved/EnslavedTab.vue
+++ b/src/components/tabs/celestial-enslaved/EnslavedTab.vue
@@ -210,8 +210,8 @@ export default {
         <div class="l-enslaved-top-container">
           <div class="l-enslaved-top-container__half">
             While charging, the Black Hole's speed boost is {{ canAdjustStoredTime ? "decreased" : "disabled" }},
-            and the lost speed is converted into Stored Time. Discharging the Black Hole allows you to skip
-            forward in time. Stored Time is also used to unlock certain upgrades.
+            and the lost speed is converted into stored game time. Discharging the Black Hole allows you to skip
+            forward in time. Stored game time is also used to unlock certain upgrades.
             <button
               :class="['o-enslaved-mechanic-button',
                        {'o-enslaved-mechanic-button--storing-time': isStoringBlackHole }]"
diff --git a/src/components/tabs/glyphs/RealityAmplifyButton.vue b/src/components/tabs/glyphs/RealityAmplifyButton.vue
index cdcadf41b..d6f64d701 100644
--- a/src/components/tabs/glyphs/RealityAmplifyButton.vue
+++ b/src/components/tabs/glyphs/RealityAmplifyButton.vue
@@ -14,7 +14,7 @@ export default {
       if (this.isDoomed) return "You cannot amplify a Doomed Reality";
       if (this.isDisabled) return "You cannot amplify Celestial Realities";
       if (!this.canAmplify) {
-        return "Store more or complete the Reality faster to amplify";
+        return "Store more real time or complete the Reality faster to amplify";
       }
       return null;
     }

From add979b633ead6d9994db397928a51f0ca6f8c22 Mon Sep 17 00:00:00 2001
From: L4R5W <lars3.8.1999@gmail.com>
Date: Wed, 4 May 2022 14:50:29 +0200
Subject: [PATCH 22/89] apply to tomato

---
 javascripts/core/automator/automator-codemirror.js   |  2 +-
 javascripts/core/automator/automator-commands.js     | 10 +++++-----
 javascripts/core/automator/lexer.js                  |  4 ++--
 javascripts/core/secret-formula/reality/automator.js |  5 +++--
 src/components/tabs/automator/AutomatorBlocks.vue    |  3 ++-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/javascripts/core/automator/automator-codemirror.js b/javascripts/core/automator/automator-codemirror.js
index e7f5e6ddb..4882becab 100644
--- a/javascripts/core/automator/automator-codemirror.js
+++ b/javascripts/core/automator/automator-codemirror.js
@@ -60,7 +60,7 @@ import { AutomatorLexer } from "./lexer.js";
       { regex: /blob\s\s/ui, token: "blob" },
       {
         // eslint-disable-next-line max-len
-        regex: /auto\s|if\s|pause\s|studies\s|tt\s|time theorems\s|until\s|wait\s|while\s|black[ \t]+hole\s|stored?[ \t]time\s|notify/ui,
+        regex: /auto\s|if\s|pause\s|studies\s|tt\s|time theorems\s|until\s|wait\s|while\s|black[ \t]+hole\s|stored?[ \t]+game?[ \t]+time\s|notify/ui,
         token: "keyword",
         next: "commandArgs"
       },
diff --git a/javascripts/core/automator/automator-commands.js b/javascripts/core/automator/automator-commands.js
index bf79fe088..b23a02d54 100644
--- a/javascripts/core/automator/automator-commands.js
+++ b/javascripts/core/automator/automator-commands.js
@@ -559,9 +559,9 @@ export const AutomatorCommands = ((() => {
       })
     },
     {
-      id: "storeTime",
+      id: "storeGameTime",
       rule: $ => () => {
-        $.CONSUME(T.StoreTime);
+        $.CONSUME(T.StoreGameTime);
         $.OR([
           { ALT: () => $.CONSUME(T.On) },
           { ALT: () => $.CONSUME(T.Off) },
@@ -569,9 +569,9 @@ export const AutomatorCommands = ((() => {
         ]);
       },
       validate: (ctx, V) => {
-        ctx.startLine = ctx.StoreTime[0].startLine;
+        ctx.startLine = ctx.StoreGameTime[0].startLine;
         if (!Enslaved.isUnlocked) {
-          V.addError(ctx.StoreTime[0], "You do not yet know how to store game time",
+          V.addError(ctx.StoreGameTime[0], "You do not yet know how to store game time",
             "Unlock the ability to store game time");
           return false;
         }
@@ -598,7 +598,7 @@ export const AutomatorCommands = ((() => {
       blockify: ctx => ({
         // eslint-disable-next-line no-nested-ternary
         target: ctx.Use ? "USE" : (ctx.On ? "ON" : "OFF"),
-        ...automatorBlocksMap["STORE TIME"]
+        ...automatorBlocksMap["STORE GAME TIME"]
       })
     },
     {
diff --git a/javascripts/core/automator/lexer.js b/javascripts/core/automator/lexer.js
index e71f09d46..a10034f60 100644
--- a/javascripts/core/automator/lexer.js
+++ b/javascripts/core/automator/lexer.js
@@ -304,8 +304,8 @@ export const AutomatorLexer = (() => {
   createKeyword("BlackHole", /black[ \t]+hole/i, {
     $autocomplete: "black hole",
   });
-  createKeyword("StoreTime", /stored?[ \t]+time/i, {
-    $autocomplete: "store time",
+  createKeyword("StoreGameTime", /stored?[ \t]+game?[ \t]+time/i, {
+    $autocomplete: "store game time",
   });
 
   createKeyword("Dilation", /dilation/i);
diff --git a/javascripts/core/secret-formula/reality/automator.js b/javascripts/core/secret-formula/reality/automator.js
index a2b51aa5c..51a60dc77 100644
--- a/javascripts/core/secret-formula/reality/automator.js
+++ b/javascripts/core/secret-formula/reality/automator.js
@@ -137,8 +137,9 @@ GameDatabase.reality.automator = {
     {
       id: 5,
       isUnlocked: () => Enslaved.isUnlocked,
-      keyword: "store time",
-      name: "<b>store time</b> - either turns on/off the storing of game time or can be used to use stored game time",
+      keyword: "store game time",
+      name: `<b>store game time</b> - either turns on/off the storing of game time or can be used to use
+          stored game time`,
       syntax: "<b>store time</b> action",
       sections: [
         {
diff --git a/src/components/tabs/automator/AutomatorBlocks.vue b/src/components/tabs/automator/AutomatorBlocks.vue
index a239b9e73..278721e3d 100644
--- a/src/components/tabs/automator/AutomatorBlocks.vue
+++ b/src/components/tabs/automator/AutomatorBlocks.vue
@@ -93,7 +93,7 @@ export const automatorBlocks = [
     targets: ["ON", "OFF"],
     isUnlocked: () => BlackHole(1).isUnlocked
   }, {
-    cmd: "STORE TIME",
+    cmd: "STORE GAME TIME",
     targets: ["ON", "OFF", "USE"],
     isUnlocked: () => Enslaved.isUnlocked
   }, {
@@ -174,5 +174,6 @@ export const automatorBlocksMap = automatorBlocks.mapToObject(b => b.cmd, b => b
   text-align: center;
   align-items: center;
   height: 5.5rem;
+  width: 8.7rem;
 }
 </style>

From 130ea30a562d9ca7b71dab37f6fad42bda3ba8ca Mon Sep 17 00:00:00 2001
From: L4R5W <lars3.8.1999@gmail.com>
Date: Thu, 5 May 2022 13:20:03 +0200
Subject: [PATCH 23/89] review

---
 javascripts/core/automator/automator-codemirror.js   | 2 +-
 javascripts/core/automator/lexer.js                  | 2 +-
 javascripts/core/secret-formula/reality/automator.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/javascripts/core/automator/automator-codemirror.js b/javascripts/core/automator/automator-codemirror.js
index 4882becab..4acedd864 100644
--- a/javascripts/core/automator/automator-codemirror.js
+++ b/javascripts/core/automator/automator-codemirror.js
@@ -60,7 +60,7 @@ import { AutomatorLexer } from "./lexer.js";
       { regex: /blob\s\s/ui, token: "blob" },
       {
         // eslint-disable-next-line max-len
-        regex: /auto\s|if\s|pause\s|studies\s|tt\s|time theorems\s|until\s|wait\s|while\s|black[ \t]+hole\s|stored?[ \t]+game?[ \t]+time\s|notify/ui,
+        regex: /(auto|if|pause|studies|tt|time[ \t]+theorems?|until|wait|while|black[ \t]+hole|stored?[ \t]+game[ \t]+time|notify)\s/ui,
         token: "keyword",
         next: "commandArgs"
       },
diff --git a/javascripts/core/automator/lexer.js b/javascripts/core/automator/lexer.js
index a10034f60..1d1b6270e 100644
--- a/javascripts/core/automator/lexer.js
+++ b/javascripts/core/automator/lexer.js
@@ -304,7 +304,7 @@ export const AutomatorLexer = (() => {
   createKeyword("BlackHole", /black[ \t]+hole/i, {
     $autocomplete: "black hole",
   });
-  createKeyword("StoreGameTime", /stored?[ \t]+game?[ \t]+time/i, {
+  createKeyword("StoreGameTime", /stored?[ \t]+game[ \t]+time/i, {
     $autocomplete: "store game time",
   });
 
diff --git a/javascripts/core/secret-formula/reality/automator.js b/javascripts/core/secret-formula/reality/automator.js
index 51a60dc77..10a42b5b1 100644
--- a/javascripts/core/secret-formula/reality/automator.js
+++ b/javascripts/core/secret-formula/reality/automator.js
@@ -140,7 +140,7 @@ GameDatabase.reality.automator = {
       keyword: "store game time",
       name: `<b>store game time</b> - either turns on/off the storing of game time or can be used to use
           stored game time`,
-      syntax: "<b>store time</b> action",
+      syntax: "<b>store game time</b> action",
       sections: [
         {
           name: "ACTIONS",

From f9f881537a78c05ce9f914f0faaee56bb7c46aaa Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 5 May 2022 19:27:20 +0800
Subject: [PATCH 24/89] Modal priority system updates

- prioritized modals no longer forcefully unshifted into the queue
- You can now set levels of priority
---
 javascripts/core/app/modal.js | 69 +++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js
index 6f7d14b79..fbc7798e5 100644
--- a/javascripts/core/app/modal.js
+++ b/javascripts/core/app/modal.js
@@ -66,26 +66,31 @@ export class Modal {
     this._component = component;
     this._bare = bare;
     this._modalConfig = {};
-    this._prioritize = false;
+    this._priority = 0;
   }
 
   show(modalConfig) {
     if (!GameUI.initialized) return;
     this._props = Object.assign({}, modalConfig || {});
-    if (ui.view.modal.queue.length === 0) ui.view.modal.current = this;
+    const modalQueue = ui.view.modal.queue;
     // New modals go to the back of the queue (shown last).
-    if (!ui.view.modal.queue.includes(this)) {
-      if (this._prioritize) {
-        ui.view.modal.queue.unshift(this);
-        ui.view.modal.current = this;
+    if (!modalQueue.includes(this)) {
+      if (!modalQueue.length || this._priority <= modalQueue.last()._priority) {
+        modalQueue.push(this);
       } else {
-        ui.view.modal.queue.push(this);
+        for (let i = 0; i < modalQueue.length; i++) {
+          if (modalQueue[i]._priority < this._priority) {
+            modalQueue.splice(i, 0, this);
+            break;
+          }
+        }
       }
+      ui.view.modal.current = modalQueue[0];
     }
   }
 
-  prioritize() {
-    this._prioritize = true;
+  setPriority(x) {
+    this._priority = x;
     return this;
   }
 
@@ -144,20 +149,20 @@ Modal.startEternityChallenge = new ChallengeConfirmationModal(EternityChallengeS
 Modal.startInfinityChallenge = new ChallengeConfirmationModal(InfinityChallengeStartModal);
 Modal.startNormalChallenge = new ChallengeConfirmationModal(NormalChallengeStartModal);
 
-Modal.dimensionBoost = new Modal(DimensionBoostModal).prioritize();
-Modal.antimatterGalaxy = new Modal(AntimatterGalaxyModal).prioritize();
-Modal.bigCrunch = new Modal(BigCrunchModal).prioritize();
-Modal.replicantiGalaxy = new Modal(ReplicantiGalaxyModal).prioritize();
-Modal.eternity = new Modal(EternityModal).prioritize();
-Modal.enterDilation = new Modal(EnterDilationModal).prioritize();
-Modal.reality = new Modal(RealityModal).prioritize();
-Modal.resetReality = new Modal(ResetRealityModal).prioritize();
-Modal.exitCelestialReality = new Modal(ExitCelestialModal).prioritize();
-Modal.celestials = new Modal(EnterCelestialsModal).prioritize();
-Modal.hardReset = new Modal(HardResetModal).prioritize();
+Modal.dimensionBoost = new Modal(DimensionBoostModal).setPriority(1);
+Modal.antimatterGalaxy = new Modal(AntimatterGalaxyModal).setPriority(1);
+Modal.bigCrunch = new Modal(BigCrunchModal).setPriority(1);
+Modal.replicantiGalaxy = new Modal(ReplicantiGalaxyModal).setPriority(1);
+Modal.eternity = new Modal(EternityModal).setPriority(1);
+Modal.enterDilation = new Modal(EnterDilationModal).setPriority(1);
+Modal.reality = new Modal(RealityModal).setPriority(1);
+Modal.resetReality = new Modal(ResetRealityModal).setPriority(1);
+Modal.exitCelestialReality = new Modal(ExitCelestialModal).setPriority(1);
+Modal.celestials = new Modal(EnterCelestialsModal).setPriority(1);
+Modal.hardReset = new Modal(HardResetModal).setPriority(1);
 Modal.enterSpeedrun = new Modal(SpeedrunModeModal);
 Modal.changeName = new Modal(ChangeNameModal);
-Modal.armageddon = new Modal(ArmageddonModal).prioritize();
+Modal.armageddon = new Modal(ArmageddonModal).setPriority(1);
 
 Modal.confirmationOptions = new Modal(ConfirmationOptionsModal);
 Modal.infoDisplayOptions = new Modal(InfoDisplayOptionsModal);
@@ -168,16 +173,16 @@ Modal.animationOptions = new Modal(AnimationOptionsModal);
 Modal.hiddenTabs = new Modal(HiddenTabsModal);
 Modal.preferredTree = new Modal(PreferredTreeModal);
 
-Modal.deleteCompanion = new Modal(DeleteCompanionGlyphModal).prioritize();
-Modal.glyphDelete = new Modal(DeleteGlyphModal).prioritize();
-Modal.glyphPurge = new Modal(PurgeGlyphModal).prioritize();
-Modal.glyphSacrifice = new Modal(SacrificeGlyphModal).prioritize();
-Modal.glyphRefine = new Modal(RefineGlyphModal).prioritize();
-Modal.deleteAllUnprotectedGlyphs = new Modal(PurgeAllUnprotectedGlyphsModal).prioritize();
-Modal.deleteAllRejectedGlyphs = new Modal(PurgeAllRejectedGlyphsModal).prioritize();
+Modal.deleteCompanion = new Modal(DeleteCompanionGlyphModal).setPriority(1);
+Modal.glyphDelete = new Modal(DeleteGlyphModal).setPriority(1);
+Modal.glyphPurge = new Modal(PurgeGlyphModal).setPriority(1);
+Modal.glyphSacrifice = new Modal(SacrificeGlyphModal).setPriority(1);
+Modal.glyphRefine = new Modal(RefineGlyphModal).setPriority(1);
+Modal.deleteAllUnprotectedGlyphs = new Modal(PurgeAllUnprotectedGlyphsModal).setPriority(1);
+Modal.deleteAllRejectedGlyphs = new Modal(PurgeAllRejectedGlyphsModal).setPriority(1);
 
 Modal.glyphShowcasePanel = new Modal(GlyphShowcasePanelModal);
-Modal.glyphUndo = new Modal(UndoGlyphModal).prioritize();
+Modal.glyphUndo = new Modal(UndoGlyphModal).setPriority(1);
 Modal.glyphReplace = new Modal(ReplaceGlyphModal);
 Modal.enslavedHints = new Modal(EnslavedHintsModal);
 Modal.realityGlyph = new Modal(RealityGlyphCreationModal);
@@ -195,7 +200,7 @@ Modal.shop = new Modal(StdStoreModal);
 Modal.studyString = new Modal(StudyStringModal);
 Modal.singularityMilestones = new Modal(SingularityMilestonesModal);
 Modal.pelleEffects = new Modal(PelleEffectsModal);
-Modal.sacrifice = new Modal(SacrificeModal).prioritize();
+Modal.sacrifice = new Modal(SacrificeModal).setPriority(1);
 Modal.breakInfinity = new Modal(BreakInfinityModal);
 Modal.celestialQuote = new class extends Modal {
   show(celestial, lines) {
@@ -245,7 +250,7 @@ Modal.celestialQuote = new class extends Modal {
     }
     return x;
   }
-}(CelestialQuoteModal, true);
+}(CelestialQuoteModal, true).setPriority(2);
 
 Modal.cloudSaveConflict = new Modal(CloudSaveConflictModal);
 Modal.cloudLoadConflict = new Modal(CloudLoadConflictModal);
@@ -319,4 +324,4 @@ Modal.message = new class extends Modal {
       this.closeButton = this.queue[0].closeButton;
     }
   }
-}(MessageModal);
+}(MessageModal).setPriority(2);

From 82fba855f0d1ce64e639f8277bae7862d5561e4e Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Sat, 7 May 2022 19:38:33 -0700
Subject: [PATCH 25/89] remove helpme

---
 src/components/HelpMe.vue | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 src/components/HelpMe.vue

diff --git a/src/components/HelpMe.vue b/src/components/HelpMe.vue
deleted file mode 100644
index 9ef2f28f1..000000000
--- a/src/components/HelpMe.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-<script>
-export default {
-  name: "HelpMe",
-  methods: {
-    showModal() {
-      Modal.h2p.show();
-    }
-  }
-};
-</script>
-
-<template>
-  <div
-    class="o-tab-btn l-help-me"
-    @click="showModal"
-  >
-    ?
-  </div>
-</template>
-
-<style scoped>
-
-</style>
\ No newline at end of file

From 2025d8aa08dcd171301751ab0e659195ff48d0be Mon Sep 17 00:00:00 2001
From: Hirame1 <56225774+Hirame1@users.noreply.github.com>
Date: Sun, 8 May 2022 15:55:19 +0700
Subject: [PATCH 26/89] Fix error when step forward blockmato after reload

Fix #2583
---
 src/components/tabs/automator/AutomatorTextEditor.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/tabs/automator/AutomatorTextEditor.vue b/src/components/tabs/automator/AutomatorTextEditor.vue
index 961cff408..ab381c5c4 100644
--- a/src/components/tabs/automator/AutomatorTextEditor.vue
+++ b/src/components/tabs/automator/AutomatorTextEditor.vue
@@ -139,7 +139,9 @@ export const AutomatorTextUI = {
   // Used to return back to the same line the editor was on from before switching tabs
   savedVertPos: 0,
   scrollToLine(line) {
-    this.editor.scrollIntoView({ line, ch: 0 });
+    if (this.editor) {
+      this.editor.scrollIntoView({ line, ch: 0 });
+    }
   },
   // Line highlighting requires a reference to the row in order to clear it, so keep track of the lines currently
   // being highlighted for errors or events so that they can be referenced to be cleared instead of the alternative

From 344166b58b7d3f31e10f2234f0c07f52d1f2fd44 Mon Sep 17 00:00:00 2001
From: L4R5W <lars3.8.1999@gmail.com>
Date: Mon, 9 May 2022 17:34:43 +0200
Subject: [PATCH 27/89] fix teresa tab notification

---
 javascripts/core/secret-formula/tab-notifications.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascripts/core/secret-formula/tab-notifications.js b/javascripts/core/secret-formula/tab-notifications.js
index 8f03eb1e9..7edf277f6 100644
--- a/javascripts/core/secret-formula/tab-notifications.js
+++ b/javascripts/core/secret-formula/tab-notifications.js
@@ -143,7 +143,7 @@ GameDatabase.tabNotifications = {
         tab: "teresa"
       }
     ],
-    condition: () => player.celestials.teresa.pouredAmount !== 0 && Teresa.isUnlocked,
+    condition: () => player.celestials.teresa.pouredAmount === 0 && Teresa.isUnlocked,
     events: [GAME_EVENT.REALITY_UPGRADE_BOUGHT]
   },
   alchemyUnlock: {

From 7e426da34af53d72519b4ab1fa9419f2195758a1 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Wed, 11 May 2022 21:22:25 +0800
Subject: [PATCH 28/89] Fix being able to buy "You cannot escape a doomed
 reality" study

---
 .../eternity/time-studies/dilation-time-studies.js             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js b/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js
index d82fb9b3a..2a02794ea 100644
--- a/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js
+++ b/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js
@@ -51,6 +51,7 @@ GameDatabase.eternity.timeStudies.dilation = [
     cost: () => 1,
     requirement: () => TimeStudy.timeDimension(8).isBought &&
       player.records.thisReality.maxEP.exponent >= 4000 &&
-      (Perk.firstPerk.isBought ? true : Achievements.preReality.every(a => a.isUnlocked))
+      (Perk.firstPerk.isBought ? true : Achievements.preReality.every(a => a.isUnlocked)) &&
+      !Pelle.isDoomed
   }
 ];

From 0d8a169d9d4e21b09748be2ec0dfa79ef9fa26ae Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Sun, 8 May 2022 06:02:15 -0700
Subject: [PATCH 29/89] add eslint-plugin-import, configure, and apply changes

---
 .eslintrc.json                                |   41 +-
 .../core/achievements/normal-achievement.js   |    2 +-
 .../core/achievements/secret-achievement.js   |    2 +-
 javascripts/core/app/modal.js                 |   84 +-
 javascripts/core/app/ui.js                    |    8 +-
 .../core/autobuyers/annihilation-autobuyer.js |    2 +-
 .../antimatter-dimension-autobuyer.js         |    5 +-
 javascripts/core/autobuyers/autobuyers.js     |    2 +-
 .../core/autobuyers/big-crunch-autobuyer.js   |    2 +-
 .../autobuyers/black-hole-power-autobuyer.js  |    2 +-
 ...rk-matter-dimension-ascension-autobuyer.js |    2 +-
 .../dark-matter-dimension-autobuyer.js        |    2 +-
 .../autobuyers/dilation-upgrade-autobuyer.js  |    2 +-
 .../core/autobuyers/dimboost-autobuyer.js     |    2 +-
 .../core/autobuyers/eternity-autobuyer.js     |    2 +-
 .../core/autobuyers/galaxy-autobuyer.js       |    2 +-
 .../autobuyers/imaginary-upgrade-autobuyer.js |    2 +-
 javascripts/core/autobuyers/index.js          |   48 +-
 .../infinity-dimension-autobuyer.js           |    5 +-
 .../prestige-currency-multiplier-autobuyer.js |    2 +-
 .../core/autobuyers/reality-autobuyer.js      |    2 +-
 .../autobuyers/reality-upgrade-autobuyer.js   |    2 +-
 .../autobuyers/replicanti-galaxy-autobuyer.js |    2 +-
 .../replicanti-upgrade-autobuyer.js           |    2 +-
 .../core/autobuyers/sacrifice-autobuyer.js    |    2 +-
 .../core/autobuyers/singularity-autobuyer.js  |    2 +-
 .../core/autobuyers/tickspeed-autobuyer.js    |    5 +-
 .../autobuyers/time-dimension-autobuyer.js    |    2 +-
 .../core/autobuyers/time-theorem-autobuyer.js |    2 +-
 .../core/automator/automator-codemirror.js    |    4 +-
 .../core/automator/automator-commands.js      |    4 +-
 javascripts/core/automator/compiler.js        |    6 +-
 javascripts/core/automator/index.js           |    8 +-
 javascripts/core/automator/lexer.js           |    3 +-
 javascripts/core/automator/parser.js          |    7 +-
 javascripts/core/big_crunch.js                |   14 +-
 javascripts/core/black_hole.js                |    4 +-
 javascripts/core/celestials/V.js              |   10 +-
 javascripts/core/celestials/celestials.js     |   12 +-
 javascripts/core/celestials/effarig.js        |   10 +-
 javascripts/core/celestials/enslaved.js       |    7 +-
 .../laitela/dark-matter-dimension.js          |    4 +-
 .../core/celestials/laitela/laitela.js        |    7 +-
 .../core/celestials/laitela/singularity.js    |    3 +-
 .../core/celestials/pelle/galaxy-generator.js |    1 +
 javascripts/core/celestials/pelle/pelle.js    |    6 +-
 javascripts/core/celestials/ra/alchemy.js     |    2 +-
 javascripts/core/celestials/ra/ra.js          |    4 +-
 javascripts/core/celestials/teresa.js         |    7 +-
 javascripts/core/challenge.js                 |    4 +-
 javascripts/core/currency.js                  |    2 +-
 javascripts/core/devtools.js                  |    3 +-
 javascripts/core/dilation.js                  |    6 +-
 javascripts/core/dimboost.js                  |    2 +-
 .../core/dimensions/antimatter-dimension.js   |    5 +-
 .../core/dimensions/infinity-dimension.js     |    5 +-
 javascripts/core/dimensions/time-dimension.js |    5 +-
 javascripts/core/eternity.js                  |    4 +-
 javascripts/core/eternity_challenge.js        |    4 +-
 .../core/game-mechanics/bit-purchasable.js    |    2 +-
 .../core/game-mechanics/bit-upgrade-state.js  |    2 +-
 .../core/game-mechanics/game-mechanic.js      |    2 +-
 javascripts/core/game-mechanics/index.js      |   16 +-
 javascripts/core/game-mechanics/puchasable.js |    2 +-
 javascripts/core/game-mechanics/rebuyable.js  |    2 +-
 .../core/game-mechanics/set-purchasable.js    |    2 +-
 javascripts/core/globals.js                   |  152 +--
 javascripts/core/glyph-effects.js             |    4 +-
 javascripts/core/glyphs/glyph-core.js         |    2 +-
 javascripts/core/hotkeys.js                   |    3 +-
 javascripts/core/imaginary-upgrades.js        |    4 +-
 javascripts/core/kong.js                      |    2 +-
 javascripts/core/machines.js                  |    2 +-
 javascripts/core/math.js                      |    3 +-
 javascripts/core/perks.js                     |    2 +-
 javascripts/core/player.js                    |    6 +-
 javascripts/core/reality-upgrades.js          |    2 +-
 javascripts/core/reality.js                   |    2 +-
 javascripts/core/replicanti.js                |    2 +-
 javascripts/core/sacrifice.js                 |    2 +-
 .../achievements/normal-achievements.js       |    4 +-
 .../achievements/secret-achievements.js       |    2 +-
 .../secret-formula/away-progress-types.js     |    2 +-
 .../core/secret-formula/celestials/alchemy.js |    4 +-
 .../core/secret-formula/celestials/effarig.js |    4 +-
 .../secret-formula/celestials/enslaved.js     |    2 +-
 .../celestials/galaxy-generator.js            |    2 +-
 .../secret-formula/celestials/navigation.js   |    4 +-
 .../secret-formula/celestials/pelle-quotes.js |    2 +-
 .../celestials/pelle-upgrades.js              |    2 +-
 .../secret-formula/celestials/perk-shop.js    |    2 +-
 .../core/secret-formula/celestials/ra.js      |    2 +-
 .../core/secret-formula/celestials/rifts.js   |    4 +-
 .../celestials/singularity-milestones.js      |    2 +-
 .../core/secret-formula/celestials/strikes.js |    4 +-
 .../core/secret-formula/celestials/teresa.js  |    4 +-
 .../core/secret-formula/celestials/v.js       |    5 +-
 .../challenges/eternity-challenges.js         |    4 +-
 .../challenges/infinity-challenges.js         |    4 +-
 .../challenges/normal-challenges.js           |    4 +-
 .../core/secret-formula/confirmation-types.js |    2 +-
 javascripts/core/secret-formula/credits.js    |    4 +-
 .../eternity/dilation-upgrades.js             |    4 +-
 .../eternity/eternity-milestones.js           |    2 +-
 .../eternity/eternity-upgrades.js             |    4 +-
 .../time-studies/dilation-time-studies.js     |    2 +-
 .../eternity/time-studies/ec-time-studies.js  |    4 +-
 .../time-studies/normal-time-studies.js       |    4 +-
 javascripts/core/secret-formula/h2p.js        |    7 +-
 javascripts/core/secret-formula/index.js      |   86 +-
 .../infinity/break-infinity-upgrades.js       |    4 +-
 .../infinity/infinity-upgrades.js             |    4 +-
 javascripts/core/secret-formula/news.js       |    5 +-
 .../core/secret-formula/reality/automator.js  |    2 +-
 .../reality/glyph-sacrifices.js               |    2 +-
 .../reality/imaginary-upgrades.js             |    6 +-
 .../core/secret-formula/reality/perks.js      |    4 +-
 .../reality/reality-upgrades.js               |    4 +-
 .../core/secret-formula/script-templates.js   |    2 +-
 .../core/secret-formula/shop-purchases.js     |    2 +-
 .../secret-formula/speedrun-milestones.js     |    2 +-
 .../core/secret-formula/tab-notifications.js  |    5 +-
 javascripts/core/secret-formula/tabs.js       |    2 +-
 javascripts/core/speedrun.js                  |    2 +-
 javascripts/core/storage/cloud-saving.js      |   12 +-
 javascripts/core/storage/dev-migrations.js    |    2 +-
 javascripts/core/storage/index.js             |   10 +-
 javascripts/core/storage/migrations.js        |    2 +-
 javascripts/core/storage/serializer.js        |    2 +
 javascripts/core/storage/storage.js           |    1 +
 javascripts/core/tickspeed.js                 |    2 +-
 .../core/time-studies/dilation-time-study.js  |    4 +-
 .../core/time-studies/ec-time-study.js        |    4 +-
 javascripts/core/time-studies/index.js        |   12 +-
 .../core/time-studies/normal-time-study.js    |    2 +-
 javascripts/core/time-studies/time-studies.js |    2 +-
 .../time-studies/time-study-connections.js    |    2 +-
 javascripts/core/time-theorems.js             |    2 +-
 javascripts/core/utils.js                     |   20 +-
 javascripts/game.js                           |    7 +-
 package-lock.json                             | 1198 ++++++++++++++++-
 package.json                                  |    2 +
 src/components/BlobSnowflake.vue              |    2 +-
 src/components/BlobSnowflakes.vue             |    2 +-
 src/components/GameUIComponent.vue            |   24 +-
 src/components/InfinityUpgradeButton.vue      |    2 +-
 src/components/modals/AwayProgressModal.vue   |    2 +-
 .../modals/GlyphSetSaveDeleteModal.vue        |    2 +-
 .../modals/GlyphShowcasePanelModal.vue        |    2 +-
 src/components/modals/LoadGameModal.vue       |    2 +-
 src/components/modals/MessageModal.vue        |    2 +-
 src/components/modals/ModalWrapperChoice.vue  |    6 +-
 src/components/modals/PelleEffectsModal.vue   |    2 +-
 .../modals/SingularityMilestonesModal.vue     |    2 +-
 src/components/modals/SpeedrunModeModal.vue   |    2 +-
 src/components/modals/StudyStringModal.vue    |    3 +-
 .../options/ConfirmationOptionsModal.vue      |    2 +-
 .../modals/options/NewsOptionsModal.vue       |    2 +-
 .../modals/prestige/EnterCelestialsModal.vue  |    2 +-
 .../modals/prestige/RealityModal.vue          |    4 +-
 .../tabs/alchemy/AlchemyCircleNode.vue        |    2 +-
 src/components/tabs/alchemy/AlchemyTab.vue    |    4 +-
 .../ClassicAntimatterDimensionsTab.vue        |    6 +-
 .../ModernAntimatterDimensionsTab.vue         |    2 +-
 .../tabs/autobuyers/AutobuyersTab.vue         |   12 +-
 .../tabs/autobuyers/BigCrunchAutobuyerBox.vue |    2 +-
 .../tabs/autobuyers/DimensionAutobuyerBox.vue |    2 +-
 .../autobuyers/DimensionBoostAutobuyerBox.vue |    2 +-
 .../tabs/autobuyers/GalaxyAutobuyerBox.vue    |    2 +-
 .../tabs/autobuyers/MultipleAutobuyersBox.vue |    2 +-
 .../tabs/autobuyers/SingleAutobuyerBox.vue    |    4 +-
 .../tabs/autobuyers/SingleAutobuyerInRow.vue  |    2 +-
 .../tabs/automator/AutomatorBlockEditor.vue   |    3 +-
 .../tabs/automator/AutomatorDocs.vue          |    4 +-
 .../tabs/automator/AutomatorEditor.vue        |    2 +-
 .../tabs/automator/AutomatorTab.vue           |    3 +-
 .../tabs/black-hole/BlackHoleTab.vue          |    6 +-
 .../black-hole/BlackHoleUpgradeButton.vue     |    4 +-
 .../tabs/celestial-effarig/EffarigTab.vue     |    4 +-
 .../tabs/celestial-enslaved/EnslavedTab.vue   |    2 +-
 .../DarkMatterDimensionGroup.vue              |    3 +-
 .../tabs/celestial-laitela/LaitelaTab.vue     |   12 +-
 .../CelestialNavigationTab.vue                |    6 +-
 .../tabs/celestial-pelle/PelleRift.vue        |    2 +-
 .../tabs/celestial-pelle/PelleRiftBar.vue     |    3 +-
 .../tabs/celestial-pelle/PelleTab.vue         |    4 +-
 src/components/tabs/celestial-ra/RaPet.vue    |    2 +-
 src/components/tabs/celestial-ra/RaTab.vue    |    2 +-
 .../tabs/celestial-teresa/TeresaTab.vue       |    5 +-
 src/components/tabs/celestial-v/VTab.vue      |    2 +-
 .../EternityChallengesTab.vue                 |    2 +-
 .../EternityUpgradeButton.vue                 |    2 +-
 .../eternity-upgrades/EternityUpgradesTab.vue |    2 +-
 .../tabs/glyphs/CurrentGlyphEffects.vue       |    2 +-
 .../tabs/glyphs/GlyphLevelsAndWeights.vue     |    2 +-
 src/components/tabs/glyphs/GlyphsTab.vue      |   16 +-
 .../tabs/glyphs/SacrificedGlyphs.vue          |    1 +
 .../sidebar/GlyphAutosortButtonGroup.vue      |    2 +-
 .../tabs/glyphs/sidebar/GlyphFilterPanel.vue  |    6 +-
 .../sidebar/GlyphInventoryManagementPanel.vue |    4 +-
 .../tabs/glyphs/sidebar/GlyphSetSavePanel.vue |    4 +-
 .../tabs/glyphs/sidebar/GlyphTabSidebar.vue   |    4 +-
 .../ImaginaryUpgradeButton.vue                |    4 +-
 src/components/tabs/index.js                  |   62 +-
 .../ClassicInfinityDimensionsTab.vue          |    2 +-
 .../ModernInfinityDimensionsTab.vue           |    2 +-
 .../infinity-upgrades/InfinityUpgradesTab.vue |    2 +-
 .../infinity-upgrades/IpMultiplierButton.vue  |    2 +-
 .../NormalAchievementsTab.vue                 |    2 +-
 .../options-gameplay/OptionsGameplayTab.vue   |    4 +-
 .../tabs/options-saving/OptionsSavingTab.vue  |    4 +-
 .../tabs/options-visual/OptionsVisualTab.vue  |   15 +-
 src/components/tabs/perks/PerksTab.vue        |    1 +
 .../reality-upgrades/RealityUpgradeButton.vue |    4 +-
 .../tabs/replicanti/ReplicantiTab.vue         |    4 +-
 .../time-dilation/DilationUpgradeButton.vue   |    4 +-
 .../ModernTimeDimensionsTab.vue               |    2 +-
 .../tabs/time-studies/DilationTimeStudy.vue   |    2 +-
 .../tabs/time-studies/ECTimeStudy.vue         |    2 +-
 .../tabs/time-studies/TimeStudiesTab.vue      |   11 +-
 .../time-studies/time-study-tree-layout.js    |    2 +-
 .../time-studies/tt-shop/TimeTheoremShop.vue  |    4 +-
 src/components/ui-modes/GameHeader.vue        |   10 +-
 src/components/ui-modes/HeaderBlackHole.vue   |    2 +-
 .../ui-modes/HeaderTickspeedRow.vue           |    2 +-
 src/components/ui-modes/classic/ClassicUi.vue |    5 +-
 src/components/ui-modes/modern/ModernUi.vue   |    6 +-
 src/main.js                                   |    3 +-
 src/merge-globals.js                          |    1 +
 src/shims.js                                  |   12 +-
 230 files changed, 1861 insertions(+), 671 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index b80c8fa3c..c2454acf9 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,6 +1,7 @@
 {
   "extends": [
     "eslint:recommended",
+    "plugin:import/recommended",
     "plugin:vue/recommended"
   ],
   "env": {
@@ -14,7 +15,46 @@
     "sourceType": "module",
     "parser": "@babel/eslint-parser"
   },
+  "settings": {
+    "import/resolver": {
+      "alias": {
+        "map": [
+          ["@", "./src"]
+        ],
+        "extensions": [".js", ".vue"]
+      }
+    }
+  },
   "rules": {
+    "import/prefer-default-export": "off",
+
+    "import/no-unresolved": "error",
+    "import/named": "error",
+    "import/namespace": "error",
+    "import/default": "error",
+    "import/export": "error",
+    "import/no-named-as-default": "warn",
+    "import/no-named-as-default-member": "warn",
+    "import/no-duplicates": "warn",
+    "import/extensions": ["warn", "never"],
+    "import/first": "warn",
+    "import/newline-after-import": "warn",
+    "import/no-named-default": "warn",
+    "import/no-self-import": "warn",
+    "import/order": [
+      "warn",
+      {
+        "newlines-between": "always-and-inside-groups",
+        "pathGroups": [{ "pattern": "@/**", "group": "sibling" }]
+      }
+    ],
+    "sort-imports": [
+      "warn",
+      {
+        "ignoreCase": true,
+        "allowSeparatedGroups": true
+      }
+    ],
     "no-console": "warn",
     "no-template-curly-in-string": "warn",
     "array-callback-return": "error",
@@ -32,7 +72,6 @@
         "allowElseIf": false
       }
     ],
-
     "vue/one-component-per-file": "error",
     "vue/component-definition-name-casing": "warn",
     "vue/order-in-components": "warn",
diff --git a/javascripts/core/achievements/normal-achievement.js b/javascripts/core/achievements/normal-achievement.js
index a1db5a63c..b66955cb5 100644
--- a/javascripts/core/achievements/normal-achievement.js
+++ b/javascripts/core/achievements/normal-achievement.js
@@ -1,4 +1,4 @@
-import { GameMechanicState } from "../game-mechanics/index.js";
+import { GameMechanicState } from "../game-mechanics/index";
 
 class AchievementState extends GameMechanicState {
   constructor(config) {
diff --git a/javascripts/core/achievements/secret-achievement.js b/javascripts/core/achievements/secret-achievement.js
index 8d2ec2710..35d351738 100644
--- a/javascripts/core/achievements/secret-achievement.js
+++ b/javascripts/core/achievements/secret-achievement.js
@@ -1,4 +1,4 @@
-import { GameMechanicState } from "../game-mechanics/index.js";
+import { GameMechanicState } from "../game-mechanics/index";
 
 class SecretAchievementState extends GameMechanicState {
   constructor(config) {
diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js
index 6f7d14b79..faaf3ad85 100644
--- a/javascripts/core/app/modal.js
+++ b/javascripts/core/app/modal.js
@@ -1,64 +1,64 @@
-import MessageModal from "@/components/modals/MessageModal";
 import CelestialQuoteModal from "@/components/modals/CelestialQuoteModal";
-import CloudSaveConflictModal from "@/components/modals/cloud/CloudSaveConflictModal";
 import CloudLoadConflictModal from "@/components/modals/cloud/CloudLoadConflictModal";
+import CloudSaveConflictModal from "@/components/modals/cloud/CloudSaveConflictModal";
 import EternityChallengeStartModal from "@/components/modals/challenges/EternityChallengeStartModal";
 import InfinityChallengeStartModal from "@/components/modals/challenges/InfinityChallengeStartModal";
+import MessageModal from "@/components/modals/MessageModal";
 import NormalChallengeStartModal from "@/components/modals/challenges/NormalChallengeStartModal";
 
-import DimensionBoostModal from "@/components/modals/prestige/DimensionBoostModal";
 import AntimatterGalaxyModal from "@/components/modals/prestige/AntimatterGalaxyModal";
-import BigCrunchModal from "@/components/modals/prestige/BigCrunchModal";
-import ReplicantiGalaxyModal from "@/components/modals/prestige/ReplicantiGalaxyModal";
-import EternityModal from "@/components/modals/prestige/EternityModal";
-import EnterDilationModal from "@/components/modals/prestige/EnterDilationModal";
-import RealityModal from "@/components/modals/prestige/RealityModal";
-import ResetRealityModal from "@/components/modals/prestige/ResetRealityModal";
-import ExitCelestialModal from "@/components/modals/prestige/ExitCelestialModal";
-import EnterCelestialsModal from "@/components/modals/prestige/EnterCelestialsModal";
-import HardResetModal from "@/components/modals/prestige/HardResetModal";
-import SpeedrunModeModal from "@/components/modals/SpeedrunModeModal";
-import ChangeNameModal from "@/components/modals/ChangeNameModal";
 import ArmageddonModal from "@/components/modals/prestige/ArmageddonModal";
+import BigCrunchModal from "@/components/modals/prestige/BigCrunchModal";
+import ChangeNameModal from "@/components/modals/ChangeNameModal";
+import DimensionBoostModal from "@/components/modals/prestige/DimensionBoostModal";
+import EnterCelestialsModal from "@/components/modals/prestige/EnterCelestialsModal";
+import EnterDilationModal from "@/components/modals/prestige/EnterDilationModal";
+import EternityModal from "@/components/modals/prestige/EternityModal";
+import ExitCelestialModal from "@/components/modals/prestige/ExitCelestialModal";
+import HardResetModal from "@/components/modals/prestige/HardResetModal";
+import RealityModal from "@/components/modals/prestige/RealityModal";
+import ReplicantiGalaxyModal from "@/components/modals/prestige/ReplicantiGalaxyModal";
+import ResetRealityModal from "@/components/modals/prestige/ResetRealityModal";
+import SpeedrunModeModal from "@/components/modals/SpeedrunModeModal";
 
-import ConfirmationOptionsModal from "@/components/modals/options/ConfirmationOptionsModal";
-import InfoDisplayOptionsModal from "@/components/modals/options/InfoDisplayOptionsModal";
-import AwayProgressOptionsModal from "@/components/modals/options/AwayProgressOptionsModal";
-import HotkeysModal from "@/components/modals/options/HotkeysModal";
-import NewsOptionsModal from "@/components/modals/options/NewsOptionsModal";
 import AnimationOptionsModal from "@/components/modals/options/AnimationOptionsModal";
-import PreferredTreeModal from "@/components/modals/options/PreferredTreeModal";
+import AwayProgressOptionsModal from "@/components/modals/options/AwayProgressOptionsModal";
+import ConfirmationOptionsModal from "@/components/modals/options/ConfirmationOptionsModal";
 import HiddenTabsModal from "@/components/modals/options/hidden-tabs/HiddenTabsModal";
+import HotkeysModal from "@/components/modals/options/HotkeysModal";
+import InfoDisplayOptionsModal from "@/components/modals/options/InfoDisplayOptionsModal";
+import NewsOptionsModal from "@/components/modals/options/NewsOptionsModal";
+import PreferredTreeModal from "@/components/modals/options/PreferredTreeModal";
 
 import DeleteCompanionGlyphModal from "@/components/modals/glyph-management/DeleteCompanionGlyphModal";
 import DeleteGlyphModal from "@/components/modals/glyph-management/DeleteGlyphModal";
-import PurgeGlyphModal from "@/components/modals/glyph-management/PurgeGlyphModal";
-import SacrificeGlyphModal from "@/components/modals/glyph-management/SacrificeGlyphModal";
-import RefineGlyphModal from "@/components/modals/glyph-management/RefineGlyphModal";
-import PurgeAllUnprotectedGlyphsModal from "@/components/modals/glyph-management/PurgeAllUnprotectedGlyphsModal";
 import PurgeAllRejectedGlyphsModal from "@/components/modals/glyph-management/PurgeAllRejectedGlyphsModal";
+import PurgeAllUnprotectedGlyphsModal from "@/components/modals/glyph-management/PurgeAllUnprotectedGlyphsModal";
+import PurgeGlyphModal from "@/components/modals/glyph-management/PurgeGlyphModal";
+import RefineGlyphModal from "@/components/modals/glyph-management/RefineGlyphModal";
+import SacrificeGlyphModal from "@/components/modals/glyph-management/SacrificeGlyphModal";
 
-import H2PModal from "@/components/modals/H2PModal";
-import InformationModal from "@/components/modals/InformationModal";
-import GlyphShowcasePanelModal from "@/components/modals/GlyphShowcasePanelModal";
-import UndoGlyphModal from "@/components/modals/UndoGlyphModal";
-import ReplaceGlyphModal from "@/components/modals/ReplaceGlyphModal";
-import UiChoiceModal from "@/components/modals/UiChoiceModal";
-import AwayProgressModal from "@/components/modals/AwayProgressModal";
-import LoadGameModal from "@/components/modals/LoadGameModal";
-import ImportSaveModal from "@/components/modals/ImportSaveModal";
-import ImportAutomatorScriptModal from "@/components/modals/ImportAutomatorScriptModal";
-import DeleteAutomatorScriptModal from "@/components/modals/DeleteAutomatorScriptModal";
 import AutomatorScriptTemplate from "@/components/modals/AutomatorScriptTemplate";
+import AwayProgressModal from "@/components/modals/AwayProgressModal";
+import BreakInfinityModal from "@/components/modals/BreakInfinityModal";
+import DeleteAutomatorScriptModal from "@/components/modals/DeleteAutomatorScriptModal";
+import EnslavedHintsModal from "@/components/modals/EnslavedHintsModal";
+import GlyphSetSaveDeleteModal from "@/components/modals/GlyphSetSaveDeleteModal";
+import GlyphShowcasePanelModal from "@/components/modals/GlyphShowcasePanelModal";
+import H2PModal from "@/components/modals/H2PModal";
+import ImportAutomatorScriptModal from "@/components/modals/ImportAutomatorScriptModal";
+import ImportSaveModal from "@/components/modals/ImportSaveModal";
+import InformationModal from "@/components/modals/InformationModal";
+import LoadGameModal from "@/components/modals/LoadGameModal";
+import PelleEffectsModal from "@/components/modals/PelleEffectsModal";
+import RealityGlyphCreationModal from "@/components/modals/RealityGlyphCreationModal";
+import ReplaceGlyphModal from "@/components/modals/ReplaceGlyphModal";
+import SacrificeModal from "@/components/modals/SacrificeModal";
+import SingularityMilestonesModal from "@/components/modals/SingularityMilestonesModal";
 import StdStoreModal from "@/components/modals/StdStoreModal";
 import StudyStringModal from "@/components/modals/StudyStringModal";
-import SacrificeModal from "@/components/modals/SacrificeModal";
-import BreakInfinityModal from "@/components/modals/BreakInfinityModal";
-import GlyphSetSaveDeleteModal from "@/components/modals/GlyphSetSaveDeleteModal";
-import RealityGlyphCreationModal from "@/components/modals/RealityGlyphCreationModal";
-import EnslavedHintsModal from "@/components/modals/EnslavedHintsModal";
-import SingularityMilestonesModal from "@/components/modals/SingularityMilestonesModal";
-import PelleEffectsModal from "@/components/modals/PelleEffectsModal";
+import UiChoiceModal from "@/components/modals/UiChoiceModal";
+import UndoGlyphModal from "@/components/modals/UndoGlyphModal";
 
 
 export class Modal {
diff --git a/javascripts/core/app/ui.js b/javascripts/core/app/ui.js
index a84c9749a..3d2c53787 100644
--- a/javascripts/core/app/ui.js
+++ b/javascripts/core/app/ui.js
@@ -1,8 +1,10 @@
-import { notify } from "./notify.js";
-import { state } from "./ui.init.js";
 import VTooltip from "v-tooltip";
-import { useLongPress, useRepeatingClick } from "./longpress";
 import VueGtag from "vue-gtag";
+
+import { useLongPress, useRepeatingClick } from "./longpress";
+import { notify } from "./notify";
+import { state } from "./ui.init";
+
 import GameUIComponent from "@/components/GameUIComponent";
 
 Vue.mixin({
diff --git a/javascripts/core/autobuyers/annihilation-autobuyer.js b/javascripts/core/autobuyers/annihilation-autobuyer.js
index 2dfa16fc7..ca2a1d629 100644
--- a/javascripts/core/autobuyers/annihilation-autobuyer.js
+++ b/javascripts/core/autobuyers/annihilation-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 Autobuyer.annihilation = new class AnnihilationAutobuyerState extends AutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/antimatter-dimension-autobuyer.js b/javascripts/core/autobuyers/antimatter-dimension-autobuyer.js
index 8ec91a596..861eb39a8 100644
--- a/javascripts/core/autobuyers/antimatter-dimension-autobuyer.js
+++ b/javascripts/core/autobuyers/antimatter-dimension-autobuyer.js
@@ -1,5 +1,6 @@
-import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer.js";
-import { DC } from "../constants.js";
+import { DC } from "../constants";
+
+import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer";
 
 class AntimatterDimensionAutobuyerState extends UpgradeableAutobuyerState {
   get tier() {
diff --git a/javascripts/core/autobuyers/autobuyers.js b/javascripts/core/autobuyers/autobuyers.js
index 359859a07..c4d97dc78 100644
--- a/javascripts/core/autobuyers/autobuyers.js
+++ b/javascripts/core/autobuyers/autobuyers.js
@@ -1,4 +1,4 @@
-import { Autobuyer } from "./autobuyer.js";
+import { Autobuyer } from "./autobuyer";
 
 export const Autobuyers = (function() {
   const antimatterDimensions = Autobuyer.antimatterDimension.zeroIndexed;
diff --git a/javascripts/core/autobuyers/big-crunch-autobuyer.js b/javascripts/core/autobuyers/big-crunch-autobuyer.js
index fc6ee2eab..2542d321e 100644
--- a/javascripts/core/autobuyers/big-crunch-autobuyer.js
+++ b/javascripts/core/autobuyers/big-crunch-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer.js";
+import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer";
 
 Autobuyer.bigCrunch = new class BigCrunchAutobuyerState extends UpgradeableAutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/black-hole-power-autobuyer.js b/javascripts/core/autobuyers/black-hole-power-autobuyer.js
index 108eeba6e..9ccf311e0 100644
--- a/javascripts/core/autobuyers/black-hole-power-autobuyer.js
+++ b/javascripts/core/autobuyers/black-hole-power-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 class BlackHolePowerAutobuyerState extends AutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/dark-matter-dimension-ascension-autobuyer.js b/javascripts/core/autobuyers/dark-matter-dimension-ascension-autobuyer.js
index d86f133f8..32c919472 100644
--- a/javascripts/core/autobuyers/dark-matter-dimension-ascension-autobuyer.js
+++ b/javascripts/core/autobuyers/dark-matter-dimension-ascension-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js";
+import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer";
 
 Autobuyer.darkMatterDimsAscension =
 new class DarkMatterDimensionAscensionAutobuyerState extends IntervaledAutobuyerState {
diff --git a/javascripts/core/autobuyers/dark-matter-dimension-autobuyer.js b/javascripts/core/autobuyers/dark-matter-dimension-autobuyer.js
index 502d53990..c3c39bba7 100644
--- a/javascripts/core/autobuyers/dark-matter-dimension-autobuyer.js
+++ b/javascripts/core/autobuyers/dark-matter-dimension-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js";
+import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer";
 
 Autobuyer.darkMatterDims = new class DarkMatterDimensionAutobuyerState extends IntervaledAutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/dilation-upgrade-autobuyer.js b/javascripts/core/autobuyers/dilation-upgrade-autobuyer.js
index 0c46b71f7..9f00eaa87 100644
--- a/javascripts/core/autobuyers/dilation-upgrade-autobuyer.js
+++ b/javascripts/core/autobuyers/dilation-upgrade-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js";
+import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer";
 
 class DilationUpgradeAutobuyerState extends IntervaledAutobuyerState {
   get _upgradeName() { return ["dtGain", "galaxyThreshold", "tachyonGain"][this.id - 1]; }
diff --git a/javascripts/core/autobuyers/dimboost-autobuyer.js b/javascripts/core/autobuyers/dimboost-autobuyer.js
index 2b3de13a2..ee27c01f6 100644
--- a/javascripts/core/autobuyers/dimboost-autobuyer.js
+++ b/javascripts/core/autobuyers/dimboost-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer.js";
+import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer";
 
 Autobuyer.dimboost = new class DimBoostAutobuyerState extends UpgradeableAutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/eternity-autobuyer.js b/javascripts/core/autobuyers/eternity-autobuyer.js
index cbf187cd4..2254ee2cd 100644
--- a/javascripts/core/autobuyers/eternity-autobuyer.js
+++ b/javascripts/core/autobuyers/eternity-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 Autobuyer.eternity = new class EternityAutobuyerState extends AutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/galaxy-autobuyer.js b/javascripts/core/autobuyers/galaxy-autobuyer.js
index 0109fd878..fa50801d8 100644
--- a/javascripts/core/autobuyers/galaxy-autobuyer.js
+++ b/javascripts/core/autobuyers/galaxy-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer.js";
+import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer";
 
 Autobuyer.galaxy = new class GalaxyAutobuyerState extends UpgradeableAutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/imaginary-upgrade-autobuyer.js b/javascripts/core/autobuyers/imaginary-upgrade-autobuyer.js
index 18407020c..9064b4d84 100644
--- a/javascripts/core/autobuyers/imaginary-upgrade-autobuyer.js
+++ b/javascripts/core/autobuyers/imaginary-upgrade-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 class ImaginaryUpgradeAutobuyerState extends AutobuyerState {
   get name() {
diff --git a/javascripts/core/autobuyers/index.js b/javascripts/core/autobuyers/index.js
index c8b7d8a89..977d7d2f4 100644
--- a/javascripts/core/autobuyers/index.js
+++ b/javascripts/core/autobuyers/index.js
@@ -1,27 +1,27 @@
-import "./autobuyer.js";
+import "./autobuyer";
 
-import "./antimatter-dimension-autobuyer.js";
-import "./tickspeed-autobuyer.js";
-import "./dimboost-autobuyer.js";
-import "./galaxy-autobuyer.js";
-import "./big-crunch-autobuyer.js";
-import "./sacrifice-autobuyer.js";
-import "./eternity-autobuyer.js";
-import "./reality-autobuyer.js";
+import "./antimatter-dimension-autobuyer";
+import "./tickspeed-autobuyer";
+import "./dimboost-autobuyer";
+import "./galaxy-autobuyer";
+import "./big-crunch-autobuyer";
+import "./sacrifice-autobuyer";
+import "./eternity-autobuyer";
+import "./reality-autobuyer";
 
-import "./infinity-dimension-autobuyer.js";
-import "./time-dimension-autobuyer.js";
-import "./time-theorem-autobuyer.js";
-import "./black-hole-power-autobuyer.js";
-import "./reality-upgrade-autobuyer.js";
-import "./imaginary-upgrade-autobuyer.js";
-import "./replicanti-upgrade-autobuyer.js";
-import "./dilation-upgrade-autobuyer.js";
-import "./prestige-currency-multiplier-autobuyer.js";
-import "./replicanti-galaxy-autobuyer.js";
-import "./dark-matter-dimension-autobuyer.js";
-import "./dark-matter-dimension-ascension-autobuyer.js";
-import "./singularity-autobuyer.js";
-import "./annihilation-autobuyer.js";
+import "./infinity-dimension-autobuyer";
+import "./time-dimension-autobuyer";
+import "./time-theorem-autobuyer";
+import "./black-hole-power-autobuyer";
+import "./reality-upgrade-autobuyer";
+import "./imaginary-upgrade-autobuyer";
+import "./replicanti-upgrade-autobuyer";
+import "./dilation-upgrade-autobuyer";
+import "./prestige-currency-multiplier-autobuyer";
+import "./replicanti-galaxy-autobuyer";
+import "./dark-matter-dimension-autobuyer";
+import "./dark-matter-dimension-ascension-autobuyer";
+import "./singularity-autobuyer";
+import "./annihilation-autobuyer";
 
-export * from "./autobuyers.js";
+export * from "./autobuyers";
diff --git a/javascripts/core/autobuyers/infinity-dimension-autobuyer.js b/javascripts/core/autobuyers/infinity-dimension-autobuyer.js
index f2c4400c7..fa3e5a0eb 100644
--- a/javascripts/core/autobuyers/infinity-dimension-autobuyer.js
+++ b/javascripts/core/autobuyers/infinity-dimension-autobuyer.js
@@ -1,5 +1,6 @@
-import { InfinityDimensions } from "../globals.js";
-import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js";
+import { InfinityDimensions } from "../globals";
+
+import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer";
 
 class InfinityDimensionAutobuyerState extends IntervaledAutobuyerState {
   get tier() {
diff --git a/javascripts/core/autobuyers/prestige-currency-multiplier-autobuyer.js b/javascripts/core/autobuyers/prestige-currency-multiplier-autobuyer.js
index 049e7a4c5..f85e85019 100644
--- a/javascripts/core/autobuyers/prestige-currency-multiplier-autobuyer.js
+++ b/javascripts/core/autobuyers/prestige-currency-multiplier-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 Autobuyer.ipMult = new class IPMultAutobuyerState extends AutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/reality-autobuyer.js b/javascripts/core/autobuyers/reality-autobuyer.js
index ae43a486c..ed094e199 100644
--- a/javascripts/core/autobuyers/reality-autobuyer.js
+++ b/javascripts/core/autobuyers/reality-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 Autobuyer.reality = new class RealityAutobuyerState extends AutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/reality-upgrade-autobuyer.js b/javascripts/core/autobuyers/reality-upgrade-autobuyer.js
index 2c7db85a5..f94dc7aae 100644
--- a/javascripts/core/autobuyers/reality-upgrade-autobuyer.js
+++ b/javascripts/core/autobuyers/reality-upgrade-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 class RealityUpgradeAutobuyerState extends AutobuyerState {
   get name() {
diff --git a/javascripts/core/autobuyers/replicanti-galaxy-autobuyer.js b/javascripts/core/autobuyers/replicanti-galaxy-autobuyer.js
index 8f8b91032..08ce679b4 100644
--- a/javascripts/core/autobuyers/replicanti-galaxy-autobuyer.js
+++ b/javascripts/core/autobuyers/replicanti-galaxy-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 Autobuyer.replicantiGalaxy = new class ReplicantiGalaxyAutobuyerState extends AutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/replicanti-upgrade-autobuyer.js b/javascripts/core/autobuyers/replicanti-upgrade-autobuyer.js
index 49fe1ade5..8530745ba 100644
--- a/javascripts/core/autobuyers/replicanti-upgrade-autobuyer.js
+++ b/javascripts/core/autobuyers/replicanti-upgrade-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js";
+import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer";
 
 class ReplicantiUpgradeAutobuyerState extends IntervaledAutobuyerState {
   get _upgradeName() { return ["chance", "interval", "galaxies"][this.id - 1]; }
diff --git a/javascripts/core/autobuyers/sacrifice-autobuyer.js b/javascripts/core/autobuyers/sacrifice-autobuyer.js
index 4f17908ac..49b475630 100644
--- a/javascripts/core/autobuyers/sacrifice-autobuyer.js
+++ b/javascripts/core/autobuyers/sacrifice-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 Autobuyer.sacrifice = new class SacrificeAutobuyerState extends AutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/singularity-autobuyer.js b/javascripts/core/autobuyers/singularity-autobuyer.js
index cd791bd98..5a9468637 100644
--- a/javascripts/core/autobuyers/singularity-autobuyer.js
+++ b/javascripts/core/autobuyers/singularity-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 Autobuyer.singularity = new class SingularityAutobuyerState extends AutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/tickspeed-autobuyer.js b/javascripts/core/autobuyers/tickspeed-autobuyer.js
index 6801f1532..f42debb64 100644
--- a/javascripts/core/autobuyers/tickspeed-autobuyer.js
+++ b/javascripts/core/autobuyers/tickspeed-autobuyer.js
@@ -1,5 +1,6 @@
-import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer.js";
-import { DC } from "../constants.js";
+import { DC } from "../constants";
+
+import { Autobuyer, UpgradeableAutobuyerState } from "./autobuyer";
 
 Autobuyer.tickspeed = new class TickspeedAutobuyerState extends UpgradeableAutobuyerState {
   get data() {
diff --git a/javascripts/core/autobuyers/time-dimension-autobuyer.js b/javascripts/core/autobuyers/time-dimension-autobuyer.js
index ce9c29dad..523417699 100644
--- a/javascripts/core/autobuyers/time-dimension-autobuyer.js
+++ b/javascripts/core/autobuyers/time-dimension-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer.js";
+import { Autobuyer, IntervaledAutobuyerState } from "./autobuyer";
 
 class TimeDimensionAutobuyerState extends IntervaledAutobuyerState {
   get tier() {
diff --git a/javascripts/core/autobuyers/time-theorem-autobuyer.js b/javascripts/core/autobuyers/time-theorem-autobuyer.js
index a63110afa..13d0e061b 100644
--- a/javascripts/core/autobuyers/time-theorem-autobuyer.js
+++ b/javascripts/core/autobuyers/time-theorem-autobuyer.js
@@ -1,4 +1,4 @@
-import { Autobuyer, AutobuyerState } from "./autobuyer.js";
+import { Autobuyer, AutobuyerState } from "./autobuyer";
 
 Autobuyer.timeTheorem = new class TimeTheoremAutobuyerState extends AutobuyerState {
   get data() {
diff --git a/javascripts/core/automator/automator-codemirror.js b/javascripts/core/automator/automator-codemirror.js
index 4acedd864..8d3812c36 100644
--- a/javascripts/core/automator/automator-codemirror.js
+++ b/javascripts/core/automator/automator-codemirror.js
@@ -1,5 +1,5 @@
-import { AutomatorGrammar } from "./parser.js";
-import { AutomatorLexer } from "./lexer.js";
+import { AutomatorGrammar } from "./parser";
+import { AutomatorLexer } from "./lexer";
 
 (function() {
   function walkSuggestion(suggestion, prefix, output) {
diff --git a/javascripts/core/automator/automator-commands.js b/javascripts/core/automator/automator-commands.js
index b23a02d54..23d85fb14 100644
--- a/javascripts/core/automator/automator-commands.js
+++ b/javascripts/core/automator/automator-commands.js
@@ -1,4 +1,4 @@
-import { AutomatorLexer } from "./lexer.js";
+import { AutomatorLexer } from "./lexer";
 
 /**
  * Note: the $ shorthand for the parser object is required by Chevrotain. Don't mess with it.
@@ -723,7 +723,7 @@ export const AutomatorCommands = ((() => {
           if (missingStudyCount === 0) {
             AutomatorData.logCommandEvent(`Fully loaded study preset ${ctx.Preset[0].image}`, ctx.startLine);
           } else if (afterCount > beforeCount) {
-            AutomatorData.logCommandEvent(`Partially loaded study preset ${ctx.Preset[0].image} 
+            AutomatorData.logCommandEvent(`Partially loaded study preset ${ctx.Preset[0].image}
               (missing ${quantifyInt("study", missingStudyCount)})`, ctx.startLine);
           }
           return ctx.Nowait !== undefined || missingStudyCount === 0
diff --git a/javascripts/core/automator/compiler.js b/javascripts/core/automator/compiler.js
index 23cc57247..ced011a23 100644
--- a/javascripts/core/automator/compiler.js
+++ b/javascripts/core/automator/compiler.js
@@ -1,6 +1,6 @@
-import { AutomatorCommands } from "./automator-commands.js";
-import { AutomatorGrammar } from "./parser.js";
-import { AutomatorLexer } from "./lexer.js";
+import { AutomatorCommands } from "./automator-commands";
+import { AutomatorGrammar } from "./parser";
+import { AutomatorLexer } from "./lexer";
 
 (function() {
   if (AutomatorGrammar === undefined) {
diff --git a/javascripts/core/automator/index.js b/javascripts/core/automator/index.js
index 72759cf64..019909292 100644
--- a/javascripts/core/automator/index.js
+++ b/javascripts/core/automator/index.js
@@ -1,5 +1,5 @@
-import "./compiler.js";
-import "./automator-codemirror.js";
+import "./compiler";
+import "./automator-codemirror";
 
-export { AutomatorGrammar } from "./parser.js";
-export { standardizeAutomatorCurrencyName } from "./lexer.js";
+export { AutomatorGrammar } from "./parser";
+export { standardizeAutomatorCurrencyName } from "./lexer";
diff --git a/javascripts/core/automator/lexer.js b/javascripts/core/automator/lexer.js
index 1d1b6270e..7118aa06c 100644
--- a/javascripts/core/automator/lexer.js
+++ b/javascripts/core/automator/lexer.js
@@ -2,7 +2,8 @@
 /* eslint-disable require-unicode-regexp */
 /* eslint-disable camelcase */
 import { createToken, Lexer } from "chevrotain";
-import { DC } from "../constants.js";
+
+import { DC } from "../constants";
 
 export const AutomatorLexer = (() => {
   const createCategory = name => createToken({ name, pattern: Lexer.NA, longer_alt: Identifier });
diff --git a/javascripts/core/automator/parser.js b/javascripts/core/automator/parser.js
index 32bac32f7..714554a2f 100644
--- a/javascripts/core/automator/parser.js
+++ b/javascripts/core/automator/parser.js
@@ -1,6 +1,7 @@
-import { Parser, EOF } from "chevrotain";
-import { AutomatorCommands } from "./automator-commands.js";
-import { AutomatorLexer } from "./lexer.js";
+import { EOF, Parser } from "chevrotain";
+
+import { AutomatorCommands } from "./automator-commands";
+import { AutomatorLexer } from "./lexer";
 
 export const AutomatorGrammar = (function() {
   const T = AutomatorLexer.tokenMap;
diff --git a/javascripts/core/big_crunch.js b/javascripts/core/big_crunch.js
index 48fdf30e8..063572e1c 100644
--- a/javascripts/core/big_crunch.js
+++ b/javascripts/core/big_crunch.js
@@ -1,6 +1,6 @@
-import { GameMechanicState, SetPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js";
-import { DC } from "./constants.js";
-import { SpeedrunMilestones } from "./speedrun.js";
+import { GameMechanicState, RebuyableMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index";
+import { DC } from "./constants";
+import { SpeedrunMilestones } from "./speedrun";
 
 export function bigCrunchAnimation() {
   document.body.style.animation = "implode 2s 1";
@@ -52,10 +52,10 @@ export function bigCrunchReset() {
   if (Pelle.isDoomed) PelleStrikes.infinity.trigger();
 
   EventHub.dispatch(GAME_EVENT.BIG_CRUNCH_AFTER);
-  if (firstInfinity && !Pelle.isDoomed) Modal.message.show(`Upon Infinity, all Dimensions, Dimension Boosts, and Antimatter
-  Galaxies are reset, but in return, you gain an Infinity Point (IP). This allows you to buy multiple upgrades that
-  you can find in the Infinity tab. You will also gain one Infinity, which is the stat shown in the Statistics
-  tab.`);
+  if (firstInfinity && !Pelle.isDoomed) Modal.message.show(`Upon Infinity, all Dimensions, Dimension Boosts, and
+  Antimatter Galaxies are reset, but in return, you gain an Infinity Point (IP). This allows you to buy multiple
+  upgrades that you can find in the Infinity tab. You will also gain one Infinity, which is the stat shown in the
+  Statistics tab.`);
 }
 
 function bigCrunchUpdateStatistics() {
diff --git a/javascripts/core/black_hole.js b/javascripts/core/black_hole.js
index 597c6ca2b..f4cf69aa2 100644
--- a/javascripts/core/black_hole.js
+++ b/javascripts/core/black_hole.js
@@ -1,5 +1,5 @@
-import { DC } from "./constants.js";
-import { SpeedrunMilestones } from "./speedrun.js";
+import { DC } from "./constants";
+import { SpeedrunMilestones } from "./speedrun";
 
 class BlackHoleUpgradeState {
   constructor(config) {
diff --git a/javascripts/core/celestials/V.js b/javascripts/core/celestials/V.js
index fa00faa17..918da7264 100644
--- a/javascripts/core/celestials/V.js
+++ b/javascripts/core/celestials/V.js
@@ -1,7 +1,9 @@
-import { GameDatabase } from "../secret-formula/game-database.js";
-import { GameMechanicState, BitUpgradeState } from "../game-mechanics/index.js";
-import { CelestialQuotes } from "./quotes.js";
-import { SpeedrunMilestones } from "../speedrun.js";
+import { BitUpgradeState, GameMechanicState } from "../game-mechanics/index";
+import { GameDatabase } from "../secret-formula/game-database";
+
+import { SpeedrunMilestones } from "../speedrun";
+
+import { CelestialQuotes } from "./quotes";
 
 /**
  * Information about how to format runUnlocks:
diff --git a/javascripts/core/celestials/celestials.js b/javascripts/core/celestials/celestials.js
index 2563eaff6..e7ad90555 100644
--- a/javascripts/core/celestials/celestials.js
+++ b/javascripts/core/celestials/celestials.js
@@ -1,10 +1,10 @@
-import { Teresa } from "./teresa.js";
-import { Effarig } from "./effarig.js";
-import { Enslaved } from "./enslaved.js";
-import { V } from "./V.js";
-import { Ra } from "./ra/ra.js";
-import { Laitela } from "./laitela/laitela.js";
+import { Effarig } from "./effarig";
+import { Enslaved } from "./enslaved";
+import { Laitela } from "./laitela/laitela";
 import { Pelle } from "./pelle/pelle";
+import { Ra } from "./ra/ra";
+import { Teresa } from "./teresa";
+import { V } from "./V";
 
 export const Celestials = {
   teresa: Teresa,
diff --git a/javascripts/core/celestials/effarig.js b/javascripts/core/celestials/effarig.js
index 1ddee8829..823a0984e 100644
--- a/javascripts/core/celestials/effarig.js
+++ b/javascripts/core/celestials/effarig.js
@@ -1,7 +1,9 @@
-import { GameDatabase } from "../secret-formula/game-database.js";
-import { BitUpgradeState } from "../game-mechanics/index.js";
-import { CelestialQuotes } from "./quotes.js";
-import { DC } from "../constants.js";
+import { BitUpgradeState } from "../game-mechanics/index";
+import { GameDatabase } from "../secret-formula/game-database";
+
+import { DC } from "../constants";
+
+import { CelestialQuotes } from "./quotes";
 
 export const EFFARIG_STAGES = {
   INFINITY: 1,
diff --git a/javascripts/core/celestials/enslaved.js b/javascripts/core/celestials/enslaved.js
index 78900e9b8..bf34196ec 100644
--- a/javascripts/core/celestials/enslaved.js
+++ b/javascripts/core/celestials/enslaved.js
@@ -1,6 +1,7 @@
-import { GameDatabase } from "../secret-formula/game-database.js";
-import { BitUpgradeState } from "../game-mechanics/index.js";
-import { CelestialQuotes } from "./quotes.js";
+import { BitUpgradeState } from "../game-mechanics/index";
+import { GameDatabase } from "../secret-formula/game-database";
+
+import { CelestialQuotes } from "./quotes";
 
 export const ENSLAVED_UNLOCKS = {
   FREE_TICKSPEED_SOFTCAP: {
diff --git a/javascripts/core/celestials/laitela/dark-matter-dimension.js b/javascripts/core/celestials/laitela/dark-matter-dimension.js
index 98577bdb4..bf9aaa4a4 100644
--- a/javascripts/core/celestials/laitela/dark-matter-dimension.js
+++ b/javascripts/core/celestials/laitela/dark-matter-dimension.js
@@ -1,5 +1,5 @@
-import { DimensionState } from "../../dimensions/dimension.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { DimensionState } from "../../dimensions/dimension";
 
 /**
  * Constants for easily adjusting values
diff --git a/javascripts/core/celestials/laitela/laitela.js b/javascripts/core/celestials/laitela/laitela.js
index f14bbe65a..c8544a9a7 100644
--- a/javascripts/core/celestials/laitela/laitela.js
+++ b/javascripts/core/celestials/laitela/laitela.js
@@ -1,6 +1,7 @@
-import { CelestialQuotes } from "../quotes.js";
-import { DC } from "../../constants.js";
-import { DarkMatterDimensions } from "./dark-matter-dimension.js";
+import { CelestialQuotes } from "../quotes";
+import { DC } from "../../constants";
+
+import { DarkMatterDimensions } from "./dark-matter-dimension";
 
 export const Laitela = {
   displayName: "Lai'tela",
diff --git a/javascripts/core/celestials/laitela/singularity.js b/javascripts/core/celestials/laitela/singularity.js
index a0afdb20a..bfc172164 100644
--- a/javascripts/core/celestials/laitela/singularity.js
+++ b/javascripts/core/celestials/laitela/singularity.js
@@ -1,4 +1,5 @@
-import { GameMechanicState } from "../../game-mechanics/index.js";
+import { GameMechanicState } from "../../game-mechanics/index";
+
 import { deepmergeAll } from "@/utility/deepmerge";
 
 class SingularityMilestoneState extends GameMechanicState {
diff --git a/javascripts/core/celestials/pelle/galaxy-generator.js b/javascripts/core/celestials/pelle/galaxy-generator.js
index 1ab9144c3..b5249e0ad 100644
--- a/javascripts/core/celestials/pelle/galaxy-generator.js
+++ b/javascripts/core/celestials/pelle/galaxy-generator.js
@@ -1,5 +1,6 @@
 import { DC } from "../../constants";
 import { RebuyableMechanicState } from "../../game-mechanics/rebuyable";
+
 import { PelleRifts } from "./rifts";
 
 export const GalaxyGenerator = {
diff --git a/javascripts/core/celestials/pelle/pelle.js b/javascripts/core/celestials/pelle/pelle.js
index 89dd64349..e9d522e41 100644
--- a/javascripts/core/celestials/pelle/pelle.js
+++ b/javascripts/core/celestials/pelle/pelle.js
@@ -1,9 +1,11 @@
-import { DC } from "../../constants";
 import { Currency } from "../../currency";
+import { DC } from "../../constants";
 import { RebuyableMechanicState } from "../../game-mechanics/rebuyable";
 import { SetPurchasableMechanicState } from "../../utils";
+
+import { CelestialQuotes } from "../quotes";
+
 import zalgo from "./zalgo";
-import { CelestialQuotes } from "../quotes.js";
 
 const disabledMechanicUnlocks = {
   achievements: () => ({}),
diff --git a/javascripts/core/celestials/ra/alchemy.js b/javascripts/core/celestials/ra/alchemy.js
index 84e7f6e8f..fe02a65bd 100644
--- a/javascripts/core/celestials/ra/alchemy.js
+++ b/javascripts/core/celestials/ra/alchemy.js
@@ -1,4 +1,4 @@
-import { GameMechanicState } from "../../game-mechanics/index.js";
+import { GameMechanicState } from "../../game-mechanics/index";
 
 /**
  * @abstract
diff --git a/javascripts/core/celestials/ra/ra.js b/javascripts/core/celestials/ra/ra.js
index 1ded82f31..102cf7c2f 100644
--- a/javascripts/core/celestials/ra/ra.js
+++ b/javascripts/core/celestials/ra/ra.js
@@ -1,5 +1,5 @@
-import { GameMechanicState, BitUpgradeState } from "../../game-mechanics/index.js";
-import { CelestialQuotes } from "../quotes.js";
+import { BitUpgradeState, GameMechanicState } from "../../game-mechanics/index";
+import { CelestialQuotes } from "../quotes";
 
 class RaUnlockState extends BitUpgradeState {
   get bits() { return player.celestials.ra.unlockBits; }
diff --git a/javascripts/core/celestials/teresa.js b/javascripts/core/celestials/teresa.js
index c255fc9f1..e8e99da69 100644
--- a/javascripts/core/celestials/teresa.js
+++ b/javascripts/core/celestials/teresa.js
@@ -1,6 +1,7 @@
-import { GameDatabase } from "../secret-formula/game-database.js";
-import { BitUpgradeState, RebuyableMechanicState } from "../game-mechanics/index.js";
-import { CelestialQuotes } from "./quotes.js";
+import { BitUpgradeState, RebuyableMechanicState } from "../game-mechanics/index";
+import { GameDatabase } from "../secret-formula/game-database";
+
+import { CelestialQuotes } from "./quotes";
 
 export const Teresa = {
   timePoured: 0,
diff --git a/javascripts/core/challenge.js b/javascripts/core/challenge.js
index 78d7613e2..19d2fc835 100644
--- a/javascripts/core/challenge.js
+++ b/javascripts/core/challenge.js
@@ -1,5 +1,5 @@
-import { GameMechanicState } from "./game-mechanics/index.js";
-import { DC } from "./constants.js";
+import { DC } from "./constants";
+import { GameMechanicState } from "./game-mechanics/index";
 
 // This function does *not* reset anything. Only call it when you've already
 // done all the non-UI stuff. Right now the only UI thing to do is switch to
diff --git a/javascripts/core/currency.js b/javascripts/core/currency.js
index 695514a03..08521d49e 100644
--- a/javascripts/core/currency.js
+++ b/javascripts/core/currency.js
@@ -1,4 +1,4 @@
-import { DC } from "./constants.js";
+import { DC } from "./constants";
 
 
 /**
diff --git a/javascripts/core/devtools.js b/javascripts/core/devtools.js
index e1ea9ed91..8ac429cbd 100644
--- a/javascripts/core/devtools.js
+++ b/javascripts/core/devtools.js
@@ -1,6 +1,7 @@
-import { DC } from "./constants.js";
 import { sha512_256 } from "js-sha512";
 
+import { DC } from "./constants";
+
 /* eslint-disable no-console */
 // Disabling no-console here seems
 // reasonable, since these are the devtools after all
diff --git a/javascripts/core/dilation.js b/javascripts/core/dilation.js
index 4bc20bb5e..00e780749 100644
--- a/javascripts/core/dilation.js
+++ b/javascripts/core/dilation.js
@@ -1,6 +1,6 @@
-import { SetPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js";
-import { DC } from "./constants.js";
-import { SpeedrunMilestones } from "./speedrun.js";
+import { RebuyableMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index";
+import { DC } from "./constants";
+import { SpeedrunMilestones } from "./speedrun";
 
 export function animateAndDilate() {
   document.body.style.animation = "dilate 2s 1 linear";
diff --git a/javascripts/core/dimboost.js b/javascripts/core/dimboost.js
index 2b39897f9..ef475da11 100644
--- a/javascripts/core/dimboost.js
+++ b/javascripts/core/dimboost.js
@@ -1,4 +1,4 @@
-import { DC } from "./constants.js";
+import { DC } from "./constants";
 
 class DimBoostRequirement {
   constructor(tier, amount) {
diff --git a/javascripts/core/dimensions/antimatter-dimension.js b/javascripts/core/dimensions/antimatter-dimension.js
index 294c1e0e8..627a6d706 100644
--- a/javascripts/core/dimensions/antimatter-dimension.js
+++ b/javascripts/core/dimensions/antimatter-dimension.js
@@ -1,5 +1,6 @@
-import { DimensionState } from "./dimension.js";
-import { DC } from "../constants.js";
+import { DC } from "../constants";
+
+import { DimensionState } from "./dimension";
 
 // Multiplier applied to all Antimatter Dimensions, regardless of tier. This is cached using a Lazy
 // and invalidated every update.
diff --git a/javascripts/core/dimensions/infinity-dimension.js b/javascripts/core/dimensions/infinity-dimension.js
index b626d9cc4..de810c5da 100644
--- a/javascripts/core/dimensions/infinity-dimension.js
+++ b/javascripts/core/dimensions/infinity-dimension.js
@@ -1,5 +1,6 @@
-import { DimensionState } from "./dimension.js";
-import { DC } from "../constants.js";
+import { DC } from "../constants";
+
+import { DimensionState } from "./dimension";
 
 export function infinityDimensionCommonMultiplier() {
   let mult = new Decimal(ShopPurchase.allDimPurchases.currentMult)
diff --git a/javascripts/core/dimensions/time-dimension.js b/javascripts/core/dimensions/time-dimension.js
index 1571006b3..503998a18 100644
--- a/javascripts/core/dimensions/time-dimension.js
+++ b/javascripts/core/dimensions/time-dimension.js
@@ -1,5 +1,6 @@
-import { DimensionState } from "./dimension.js";
-import { DC } from "../constants.js";
+import { DC } from "../constants";
+
+import { DimensionState } from "./dimension";
 
 export function buySingleTimeDimension(tier) {
   const dim = TimeDimension(tier);
diff --git a/javascripts/core/eternity.js b/javascripts/core/eternity.js
index cd3e0d2cf..0475eb0cc 100644
--- a/javascripts/core/eternity.js
+++ b/javascripts/core/eternity.js
@@ -1,5 +1,5 @@
-import { GameMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index.js";
-import { DC } from "./constants.js";
+import { GameMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index";
+import { DC } from "./constants";
 
 function giveEternityRewards(auto) {
   player.records.bestEternity.time = Math.min(player.records.thisEternity.time, player.records.bestEternity.time);
diff --git a/javascripts/core/eternity_challenge.js b/javascripts/core/eternity_challenge.js
index dcb640a7e..08172b901 100644
--- a/javascripts/core/eternity_challenge.js
+++ b/javascripts/core/eternity_challenge.js
@@ -1,6 +1,6 @@
-import { GameMechanicState } from "./game-mechanics/index.js";
-import { DC } from "./constants.js";
+import { DC } from "./constants";
 import { deepmergeAll } from "@/utility/deepmerge";
+import { GameMechanicState } from "./game-mechanics/index";
 
 export function startEternityChallenge() {
   initializeChallengeCompletions();
diff --git a/javascripts/core/game-mechanics/bit-purchasable.js b/javascripts/core/game-mechanics/bit-purchasable.js
index 670998158..c2c339858 100644
--- a/javascripts/core/game-mechanics/bit-purchasable.js
+++ b/javascripts/core/game-mechanics/bit-purchasable.js
@@ -1,4 +1,4 @@
-import { PurchasableMechanicState } from "./puchasable.js";
+import { PurchasableMechanicState } from "./puchasable";
 
 /**
  * @abstract
diff --git a/javascripts/core/game-mechanics/bit-upgrade-state.js b/javascripts/core/game-mechanics/bit-upgrade-state.js
index 2c21de72a..ff971913b 100644
--- a/javascripts/core/game-mechanics/bit-upgrade-state.js
+++ b/javascripts/core/game-mechanics/bit-upgrade-state.js
@@ -1,4 +1,4 @@
-import { GameMechanicState } from "./game-mechanic.js";
+import { GameMechanicState } from "./game-mechanic";
 
 /**
  * @abstract
diff --git a/javascripts/core/game-mechanics/game-mechanic.js b/javascripts/core/game-mechanics/game-mechanic.js
index de6012e04..03e156de6 100644
--- a/javascripts/core/game-mechanics/game-mechanic.js
+++ b/javascripts/core/game-mechanics/game-mechanic.js
@@ -1,4 +1,4 @@
-import { Effect } from "./effect.js";
+import { Effect } from "./effect";
 
 /**
  * @abstract
diff --git a/javascripts/core/game-mechanics/index.js b/javascripts/core/game-mechanics/index.js
index 5268f10d4..9756ec589 100644
--- a/javascripts/core/game-mechanics/index.js
+++ b/javascripts/core/game-mechanics/index.js
@@ -1,8 +1,8 @@
-export * from "./effect.js";
-export * from "./effects.js";
-export * from "./game-mechanic.js";
-export * from "./bit-upgrade-state.js";
-export * from "./puchasable.js";
-export * from "./set-purchasable.js";
-export * from "./bit-purchasable.js";
-export * from "./rebuyable.js";
+export * from "./effect";
+export * from "./effects";
+export * from "./game-mechanic";
+export * from "./bit-upgrade-state";
+export * from "./puchasable";
+export * from "./set-purchasable";
+export * from "./bit-purchasable";
+export * from "./rebuyable";
diff --git a/javascripts/core/game-mechanics/puchasable.js b/javascripts/core/game-mechanics/puchasable.js
index fb4843bb4..44f24c146 100644
--- a/javascripts/core/game-mechanics/puchasable.js
+++ b/javascripts/core/game-mechanics/puchasable.js
@@ -1,4 +1,4 @@
-import { GameMechanicState } from "./game-mechanic.js";
+import { GameMechanicState } from "./game-mechanic";
 
 /**
  * @abstract
diff --git a/javascripts/core/game-mechanics/rebuyable.js b/javascripts/core/game-mechanics/rebuyable.js
index f6c98eab0..ac3abbb0d 100644
--- a/javascripts/core/game-mechanics/rebuyable.js
+++ b/javascripts/core/game-mechanics/rebuyable.js
@@ -1,4 +1,4 @@
-import { GameMechanicState } from "./game-mechanic.js";
+import { GameMechanicState } from "./game-mechanic";
 
 /**
  * @abstract
diff --git a/javascripts/core/game-mechanics/set-purchasable.js b/javascripts/core/game-mechanics/set-purchasable.js
index 0a763198c..96e48ca6d 100644
--- a/javascripts/core/game-mechanics/set-purchasable.js
+++ b/javascripts/core/game-mechanics/set-purchasable.js
@@ -1,4 +1,4 @@
-import { PurchasableMechanicState } from "./puchasable.js";
+import { PurchasableMechanicState } from "./puchasable";
 
 /**
  * @abstract
diff --git a/javascripts/core/globals.js b/javascripts/core/globals.js
index 7a75923c9..a341628b0 100644
--- a/javascripts/core/globals.js
+++ b/javascripts/core/globals.js
@@ -1,90 +1,90 @@
-export * from "./glyph-effects.js";
-export * from "./player.js";
+export * from "./glyph-effects";
+export * from "./player";
 
-export * from "./automator/automator-backend.js";
-export * from "./performance-stats.js";
-export * from "./currency.js";
-export * from "./cache.js";
-export * from "./intervals.js";
-export * from "./keyboard.js";
-export * from "./hotkeys.js";
-export * from "./galaxy.js";
-export * from "./away-progress.js";
-export * from "./confirmations.js";
+export * from "./automator/automator-backend";
+export * from "./performance-stats";
+export * from "./currency";
+export * from "./cache";
+export * from "./intervals";
+export * from "./keyboard";
+export * from "./hotkeys";
+export * from "./galaxy";
+export * from "./away-progress";
+export * from "./confirmations";
 
-export * from "./autobuyers/index.js";
-export * from "./storage/index.js";
+export * from "./autobuyers/index";
+export * from "./storage/index";
 
-export * from "./notations.js";
-export * from "./tutorial.js";
+export * from "./notations";
+export * from "./tutorial";
 
-export * from "./new-game.js";
+export * from "./new-game";
 
-export * from "./celestials/quotes.js";
-export * from "./celestials/teresa.js";
-export * from "./celestials/effarig.js";
-export * from "./celestials/enslaved.js";
-export * from "./celestials/V.js";
-export * from "./celestials/ra/ra.js";
-export * from "./celestials/ra/alchemy.js";
-export * from "./celestials/laitela/laitela.js";
-export * from "./celestials/laitela/dark-matter-dimension.js";
-export * from "./celestials/laitela/singularity.js";
-export * from "./celestials/pelle/pelle.js";
-export * from "./celestials/pelle/strikes.js";
-export * from "./celestials/pelle/rifts.js";
-export * from "./celestials/pelle/galaxy-generator.js";
-export * from "./celestials/pelle/game-end.js";
-export * from "./celestials/celestials.js";
+export * from "./celestials/quotes";
+export * from "./celestials/teresa";
+export * from "./celestials/effarig";
+export * from "./celestials/enslaved";
+export * from "./celestials/V";
+export * from "./celestials/ra/ra";
+export * from "./celestials/ra/alchemy";
+export * from "./celestials/laitela/laitela";
+export * from "./celestials/laitela/dark-matter-dimension";
+export * from "./celestials/laitela/singularity";
+export * from "./celestials/pelle/pelle";
+export * from "./celestials/pelle/strikes";
+export * from "./celestials/pelle/rifts";
+export * from "./celestials/pelle/galaxy-generator";
+export * from "./celestials/pelle/game-end";
+export * from "./celestials/celestials";
 
-export * from "./automator/index.js";
-export * from "./automator/automator-points.js";
+export * from "./automator/index";
+export * from "./automator/automator-points";
 
-export * from "./app/player-progress.js";
-export * from "./app/modal.js";
-export * from "./app/themes.js";
-export * from "./app/options.js";
-export * from "./app/ui.js";
+export * from "./app/player-progress";
+export * from "./app/modal";
+export * from "./app/themes";
+export * from "./app/options";
+export * from "./app/ui";
 
-export * from "./achievements/normal-achievement.js";
-export * from "./achievements/secret-achievement.js";
-export * from "./achievements/achievement-timer.js";
+export * from "./achievements/normal-achievement";
+export * from "./achievements/secret-achievement";
+export * from "./achievements/achievement-timer";
 
-export * from "./glyphs/glyph-core.js";
-export * from "./glyphs/glyph-effects.js";
-export * from "./glyphs/glyph-generator.js";
-export * from "./glyphs/glyph-purge-handler.js";
-export * from "./glyphs/auto-glyph-processor.js";
+export * from "./glyphs/glyph-core";
+export * from "./glyphs/glyph-effects";
+export * from "./glyphs/glyph-generator";
+export * from "./glyphs/glyph-purge-handler";
+export * from "./glyphs/auto-glyph-processor";
 
-export * from "./time.js";
-export * from "./tickspeed.js";
+export * from "./time";
+export * from "./tickspeed";
 
-export * from "./dimensions/antimatter-dimension.js";
-export * from "./dimensions/infinity-dimension.js";
-export * from "./dimensions/time-dimension.js";
+export * from "./dimensions/antimatter-dimension";
+export * from "./dimensions/infinity-dimension";
+export * from "./dimensions/time-dimension";
 
-export * from "./time-studies/index.js";
+export * from "./time-studies/index";
 
-export * from "./dimboost.js";
-export * from "./sacrifice.js";
-export * from "./big_crunch.js";
-export * from "./challenge.js";
-export * from "./eternity.js";
-export * from "./eternity_challenge.js";
-export * from "./reality.js";
-export * from "./replicanti.js";
-export * from "./time-theorems.js";
-export * from "./reality-upgrades.js";
-export * from "./imaginary-upgrades.js";
-export * from "./perks.js";
-export * from "./dilation.js";
-export * from "./black_hole.js";
-export * from "./machines.js";
-export * from "./devtools.js";
-export * from "./news-ticker.js";
-export * from "./kong.js";
-export * from "./ui/tabs.js";
-export * from "./ui/tab-notifications.js";
-export * from "./speedrun.js";
+export * from "./dimboost";
+export * from "./sacrifice";
+export * from "./big_crunch";
+export * from "./challenge";
+export * from "./eternity";
+export * from "./eternity_challenge";
+export * from "./reality";
+export * from "./replicanti";
+export * from "./time-theorems";
+export * from "./reality-upgrades";
+export * from "./imaginary-upgrades";
+export * from "./perks";
+export * from "./dilation";
+export * from "./black_hole";
+export * from "./machines";
+export * from "./devtools";
+export * from "./news-ticker";
+export * from "./kong";
+export * from "./ui/tabs";
+export * from "./ui/tab-notifications";
+export * from "./speedrun";
 
-export * from "./automator/script-templates.js";
+export * from "./automator/script-templates";
diff --git a/javascripts/core/glyph-effects.js b/javascripts/core/glyph-effects.js
index 717b69d7f..6b0f39010 100644
--- a/javascripts/core/glyph-effects.js
+++ b/javascripts/core/glyph-effects.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "./secret-formula/game-database.js";
-import { DC } from "./constants.js";
+import { DC } from "./constants";
+import { GameDatabase } from "./secret-formula/game-database";
 
 // There is a little too much stuff about glyph effects to put in constants.
 
diff --git a/javascripts/core/glyphs/glyph-core.js b/javascripts/core/glyphs/glyph-core.js
index 9ab3f56c8..131cf7f77 100644
--- a/javascripts/core/glyphs/glyph-core.js
+++ b/javascripts/core/glyphs/glyph-core.js
@@ -1,4 +1,4 @@
-import { GameMechanicState } from "../game-mechanics/index.js";
+import { GameMechanicState } from "../game-mechanics/index";
 
 export const orderedEffectList = ["powerpow", "infinitypow", "replicationpow", "timepow",
   "dilationpow", "timeshardpow", "powermult", "powerdimboost", "powerbuy10",
diff --git a/javascripts/core/hotkeys.js b/javascripts/core/hotkeys.js
index 9151d6d93..592399dba 100644
--- a/javascripts/core/hotkeys.js
+++ b/javascripts/core/hotkeys.js
@@ -1,6 +1,7 @@
-import { GameKeyboard } from "./keyboard.js";
 import Mousetrap from "mousetrap";
 
+import { GameKeyboard } from "./keyboard";
+
 // Add your hotkeys and combinations here
 // GameKeyboard.bind for single press combinations
 // GameKeyboard.bindRepeatable for repeatable combinations
diff --git a/javascripts/core/imaginary-upgrades.js b/javascripts/core/imaginary-upgrades.js
index e5a394323..d1c41dd62 100644
--- a/javascripts/core/imaginary-upgrades.js
+++ b/javascripts/core/imaginary-upgrades.js
@@ -1,5 +1,5 @@
-import { BitPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js";
-import { DC } from "./constants.js";
+import { BitPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index";
+import { DC } from "./constants";
 
 class ImaginaryUpgradeState extends BitPurchasableMechanicState {
   constructor(config) {
diff --git a/javascripts/core/kong.js b/javascripts/core/kong.js
index a2897f39e..f38387381 100644
--- a/javascripts/core/kong.js
+++ b/javascripts/core/kong.js
@@ -1,4 +1,4 @@
-import { RebuyableMechanicState } from "./game-mechanics/index.js";
+import { RebuyableMechanicState } from "./game-mechanics/index";
 
 export const kong = {};
 
diff --git a/javascripts/core/machines.js b/javascripts/core/machines.js
index ec371c829..75bdf5dbe 100644
--- a/javascripts/core/machines.js
+++ b/javascripts/core/machines.js
@@ -1,4 +1,4 @@
-import { DC } from "./constants.js";
+import { DC } from "./constants";
 
 export const MachineHandler = {
   get baseRMCap() { return DC.E1000; },
diff --git a/javascripts/core/math.js b/javascripts/core/math.js
index f127c00e8..1075d6364 100644
--- a/javascripts/core/math.js
+++ b/javascripts/core/math.js
@@ -1,6 +1,7 @@
-import { DC } from "./constants.js";
 import { log as lngamma } from "gamma";
 
+import { DC } from "./constants";
+
 /* eslint-disable no-use-before-define */
 /* eslint-disable max-params */
 
diff --git a/javascripts/core/perks.js b/javascripts/core/perks.js
index 6b5e058f1..2606bb25c 100644
--- a/javascripts/core/perks.js
+++ b/javascripts/core/perks.js
@@ -1,4 +1,4 @@
-import { SetPurchasableMechanicState } from "./game-mechanics/index.js";
+import { SetPurchasableMechanicState } from "./game-mechanics/index";
 
 class PerkState extends SetPurchasableMechanicState {
   constructor(config) {
diff --git a/javascripts/core/player.js b/javascripts/core/player.js
index bd2d58dc6..debb9bf53 100644
--- a/javascripts/core/player.js
+++ b/javascripts/core/player.js
@@ -1,7 +1,7 @@
-import { GlyphTypes } from "./glyph-effects.js";
-import { AUTOMATOR_MODE, AUTOMATOR_TYPE } from "./automator/automator-backend.js";
-import { DC } from "./constants.js";
+import { AUTOMATOR_MODE, AUTOMATOR_TYPE } from "./automator/automator-backend";
+import { DC } from "./constants";
 import { deepmergeAll } from "@/utility/deepmerge";
+import { GlyphTypes } from "./glyph-effects";
 
 // This is actually reassigned when importing saves
 // eslint-disable-next-line prefer-const
diff --git a/javascripts/core/reality-upgrades.js b/javascripts/core/reality-upgrades.js
index 144ad447a..6a95d2404 100644
--- a/javascripts/core/reality-upgrades.js
+++ b/javascripts/core/reality-upgrades.js
@@ -1,4 +1,4 @@
-import { BitPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index.js";
+import { BitPurchasableMechanicState, RebuyableMechanicState } from "./game-mechanics/index";
 
 class RealityUpgradeState extends BitPurchasableMechanicState {
   constructor(config) {
diff --git a/javascripts/core/reality.js b/javascripts/core/reality.js
index 9569d5592..1e8c8efce 100644
--- a/javascripts/core/reality.js
+++ b/javascripts/core/reality.js
@@ -1,4 +1,4 @@
-import { DC } from "./constants.js";
+import { DC } from "./constants";
 
 /**
  * Object that manages the selection of glyphs offered to the player
diff --git a/javascripts/core/replicanti.js b/javascripts/core/replicanti.js
index b9806ef3b..2a644a73a 100644
--- a/javascripts/core/replicanti.js
+++ b/javascripts/core/replicanti.js
@@ -1,4 +1,4 @@
-import { DC } from "./constants.js";
+import { DC } from "./constants";
 
 // Slowdown parameters for replicanti growth, interval will increase by scaleFactor for every scaleLog10
 // OoM past the cap (default is 308.25 (log10 of 1.8e308), 1.2, Number.MAX_VALUE)
diff --git a/javascripts/core/sacrifice.js b/javascripts/core/sacrifice.js
index 80d2e8615..bbacd5829 100644
--- a/javascripts/core/sacrifice.js
+++ b/javascripts/core/sacrifice.js
@@ -1,4 +1,4 @@
-import { DC } from "./constants.js";
+import { DC } from "./constants";
 
 export class Sacrifice {
   // This is tied to the "buying an 8th dimension" achievement in order to hide it from new players before they reach
diff --git a/javascripts/core/secret-formula/achievements/normal-achievements.js b/javascripts/core/secret-formula/achievements/normal-achievements.js
index b0b4df793..be17661e7 100644
--- a/javascripts/core/secret-formula/achievements/normal-achievements.js
+++ b/javascripts/core/secret-formula/achievements/normal-achievements.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.achievements.normal = [
   {
diff --git a/javascripts/core/secret-formula/achievements/secret-achievements.js b/javascripts/core/secret-formula/achievements/secret-achievements.js
index 567a52efd..df4f6a9d9 100644
--- a/javascripts/core/secret-formula/achievements/secret-achievements.js
+++ b/javascripts/core/secret-formula/achievements/secret-achievements.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.achievements.secret = [
   {
diff --git a/javascripts/core/secret-formula/away-progress-types.js b/javascripts/core/secret-formula/away-progress-types.js
index 6b2a7070b..e6d3f0cca 100644
--- a/javascripts/core/secret-formula/away-progress-types.js
+++ b/javascripts/core/secret-formula/away-progress-types.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "./game-database.js";
+import { GameDatabase } from "./game-database";
 
 GameDatabase.awayProgressTypes = [
   {
diff --git a/javascripts/core/secret-formula/celestials/alchemy.js b/javascripts/core/secret-formula/celestials/alchemy.js
index 7ba950abc..938388e91 100644
--- a/javascripts/core/secret-formula/celestials/alchemy.js
+++ b/javascripts/core/secret-formula/celestials/alchemy.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.alchemy = {
   resources: {
diff --git a/javascripts/core/secret-formula/celestials/effarig.js b/javascripts/core/secret-formula/celestials/effarig.js
index a44b35def..9c10719cf 100644
--- a/javascripts/core/secret-formula/celestials/effarig.js
+++ b/javascripts/core/secret-formula/celestials/effarig.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.effarig = {
   unlocks: {
diff --git a/javascripts/core/secret-formula/celestials/enslaved.js b/javascripts/core/secret-formula/celestials/enslaved.js
index 7da0c908a..e3305e9a7 100644
--- a/javascripts/core/secret-formula/celestials/enslaved.js
+++ b/javascripts/core/secret-formula/celestials/enslaved.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.enslaved = {
   // Note that "condition" isn't displayed in-game. These are meant to be indicators here of
diff --git a/javascripts/core/secret-formula/celestials/galaxy-generator.js b/javascripts/core/secret-formula/celestials/galaxy-generator.js
index dda1d0f96..3d6fbe98a 100644
--- a/javascripts/core/secret-formula/celestials/galaxy-generator.js
+++ b/javascripts/core/secret-formula/celestials/galaxy-generator.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.pelle.galaxyGeneratorUpgrades = (function() {
   const formatCost = c => format(c, 2);
diff --git a/javascripts/core/secret-formula/celestials/navigation.js b/javascripts/core/secret-formula/celestials/navigation.js
index 9a5f659e6..69328ee3c 100644
--- a/javascripts/core/secret-formula/celestials/navigation.js
+++ b/javascripts/core/secret-formula/celestials/navigation.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 export function emphasizeEnd(fraction) {
   return Math.pow(fraction, 10);
diff --git a/javascripts/core/secret-formula/celestials/pelle-quotes.js b/javascripts/core/secret-formula/celestials/pelle-quotes.js
index d9a86823c..835fa1faf 100644
--- a/javascripts/core/secret-formula/celestials/pelle-quotes.js
+++ b/javascripts/core/secret-formula/celestials/pelle-quotes.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.pelle.quotes = {};
 
diff --git a/javascripts/core/secret-formula/celestials/pelle-upgrades.js b/javascripts/core/secret-formula/celestials/pelle-upgrades.js
index 1c900d91d..21e8312ac 100644
--- a/javascripts/core/secret-formula/celestials/pelle-upgrades.js
+++ b/javascripts/core/secret-formula/celestials/pelle-upgrades.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.pelle.upgrades = (function() {
   const formatCost = c => format(c, 2);
diff --git a/javascripts/core/secret-formula/celestials/perk-shop.js b/javascripts/core/secret-formula/celestials/perk-shop.js
index 54ed6ccd4..af1c23607 100644
--- a/javascripts/core/secret-formula/celestials/perk-shop.js
+++ b/javascripts/core/secret-formula/celestials/perk-shop.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.perkShop = (function() {
   function rebuyableCost(initialCost, increment, id) {
diff --git a/javascripts/core/secret-formula/celestials/ra.js b/javascripts/core/secret-formula/celestials/ra.js
index ace9fe785..41d86fe8c 100644
--- a/javascripts/core/secret-formula/celestials/ra.js
+++ b/javascripts/core/secret-formula/celestials/ra.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.ra = {
   pets: {
diff --git a/javascripts/core/secret-formula/celestials/rifts.js b/javascripts/core/secret-formula/celestials/rifts.js
index 18af25382..a8c0b4aca 100644
--- a/javascripts/core/secret-formula/celestials/rifts.js
+++ b/javascripts/core/secret-formula/celestials/rifts.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.pelle.rifts = {
   famine: {
diff --git a/javascripts/core/secret-formula/celestials/singularity-milestones.js b/javascripts/core/secret-formula/celestials/singularity-milestones.js
index f0faa7f97..b0e87ac8c 100644
--- a/javascripts/core/secret-formula/celestials/singularity-milestones.js
+++ b/javascripts/core/secret-formula/celestials/singularity-milestones.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 // Used for UI purposes to give different theming for different kinds of upgrades
 export const LAITELA_UPGRADE_DIRECTION = {
diff --git a/javascripts/core/secret-formula/celestials/strikes.js b/javascripts/core/secret-formula/celestials/strikes.js
index 5650118b1..f5e61d8cb 100644
--- a/javascripts/core/secret-formula/celestials/strikes.js
+++ b/javascripts/core/secret-formula/celestials/strikes.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.pelle.strikes = {
   infinity: {
diff --git a/javascripts/core/secret-formula/celestials/teresa.js b/javascripts/core/secret-formula/celestials/teresa.js
index 141d3f160..e3460c442 100644
--- a/javascripts/core/secret-formula/celestials/teresa.js
+++ b/javascripts/core/secret-formula/celestials/teresa.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.celestials.teresa = {
   unlocks: {
@@ -37,4 +37,4 @@ GameDatabase.celestials.teresa = {
       isDisabledInDoomed: true
     }
   }
-};
\ No newline at end of file
+};
diff --git a/javascripts/core/secret-formula/celestials/v.js b/javascripts/core/secret-formula/celestials/v.js
index 4bd457d0d..342144a95 100644
--- a/javascripts/core/secret-formula/celestials/v.js
+++ b/javascripts/core/secret-formula/celestials/v.js
@@ -1,5 +1,6 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
+
 // This is supposed to be in ./navigation.js but importing doesn't work for some stupid reason
 function emphasizeEnd(fraction) {
   return Math.pow(fraction, 10);
diff --git a/javascripts/core/secret-formula/challenges/eternity-challenges.js b/javascripts/core/secret-formula/challenges/eternity-challenges.js
index 79b5dc2cb..e646cda58 100644
--- a/javascripts/core/secret-formula/challenges/eternity-challenges.js
+++ b/javascripts/core/secret-formula/challenges/eternity-challenges.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 const specialInfinityGlyphDisabledEffectText = () => (PelleRifts.chaos.milestones[1].canBeApplied
   ? "The Pelle-Specific effect from Infinity Glyphs is also disabled."
diff --git a/javascripts/core/secret-formula/challenges/infinity-challenges.js b/javascripts/core/secret-formula/challenges/infinity-challenges.js
index d59b8938e..d195e9230 100644
--- a/javascripts/core/secret-formula/challenges/infinity-challenges.js
+++ b/javascripts/core/secret-formula/challenges/infinity-challenges.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.challenges.infinity = [
   {
diff --git a/javascripts/core/secret-formula/challenges/normal-challenges.js b/javascripts/core/secret-formula/challenges/normal-challenges.js
index daafa2ffa..142cf49bc 100644
--- a/javascripts/core/secret-formula/challenges/normal-challenges.js
+++ b/javascripts/core/secret-formula/challenges/normal-challenges.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 // I tried to make it relatively simple to add more locks; the idea is that you give it a value here
 // and then it's all handled in the backend
diff --git a/javascripts/core/secret-formula/confirmation-types.js b/javascripts/core/secret-formula/confirmation-types.js
index 4bd07b2c7..fee535d74 100644
--- a/javascripts/core/secret-formula/confirmation-types.js
+++ b/javascripts/core/secret-formula/confirmation-types.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "./game-database.js";
+import { GameDatabase } from "./game-database";
 
 GameDatabase.confirmationTypes = [
   {
diff --git a/javascripts/core/secret-formula/credits.js b/javascripts/core/secret-formula/credits.js
index a1418224e..2dddbefb9 100644
--- a/javascripts/core/secret-formula/credits.js
+++ b/javascripts/core/secret-formula/credits.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "./game-database.js";
+import { GameDatabase } from "./game-database";
 
 GameDatabase.credits = {
   // Must be placed in the order it is desired they appear in the credits
@@ -359,4 +359,4 @@ GameDatabase.credits = {
   ]
 };
 
-GameDatabase.credits.roles.count = Object.keys(GameDatabase.credits.roles).length;
\ No newline at end of file
+GameDatabase.credits.roles.count = Object.keys(GameDatabase.credits.roles).length;
diff --git a/javascripts/core/secret-formula/eternity/dilation-upgrades.js b/javascripts/core/secret-formula/eternity/dilation-upgrades.js
index b81d97106..44db5a33a 100644
--- a/javascripts/core/secret-formula/eternity/dilation-upgrades.js
+++ b/javascripts/core/secret-formula/eternity/dilation-upgrades.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.eternity.dilation = (function() {
   function rebuyableCost(initialCost, increment, id) {
diff --git a/javascripts/core/secret-formula/eternity/eternity-milestones.js b/javascripts/core/secret-formula/eternity/eternity-milestones.js
index 99c201250..691007ce9 100644
--- a/javascripts/core/secret-formula/eternity/eternity-milestones.js
+++ b/javascripts/core/secret-formula/eternity/eternity-milestones.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.eternity.milestones = {
   autobuyerIPMult: {
diff --git a/javascripts/core/secret-formula/eternity/eternity-upgrades.js b/javascripts/core/secret-formula/eternity/eternity-upgrades.js
index 250d6bdd7..f5d17939d 100644
--- a/javascripts/core/secret-formula/eternity/eternity-upgrades.js
+++ b/javascripts/core/secret-formula/eternity/eternity-upgrades.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.eternity.upgrades = {
   idMultEP: {
diff --git a/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js b/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js
index 2a02794ea..7d7efd129 100644
--- a/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js
+++ b/javascripts/core/secret-formula/eternity/time-studies/dilation-time-studies.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../../game-database.js";
+import { GameDatabase } from "../../game-database";
 
 GameDatabase.eternity.timeStudies.dilation = [
   {
diff --git a/javascripts/core/secret-formula/eternity/time-studies/ec-time-studies.js b/javascripts/core/secret-formula/eternity/time-studies/ec-time-studies.js
index d0913bf5f..adf5bb08a 100644
--- a/javascripts/core/secret-formula/eternity/time-studies/ec-time-studies.js
+++ b/javascripts/core/secret-formula/eternity/time-studies/ec-time-studies.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../../game-database.js";
-import { DC } from "../../../constants.js";
+import { DC } from "../../../constants";
+import { GameDatabase } from "../../game-database";
 
 GameDatabase.eternity.timeStudies.ec = [
   {
diff --git a/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js b/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js
index be3adcfb4..3c42f10f6 100644
--- a/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js
+++ b/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../../game-database.js";
-import { DC } from "../../../constants.js";
+import { DC } from "../../../constants";
+import { GameDatabase } from "../../game-database";
 
 /**
  * List of time study specifications and attributes
diff --git a/javascripts/core/secret-formula/h2p.js b/javascripts/core/secret-formula/h2p.js
index e2eacfcce..3ea6a0612 100644
--- a/javascripts/core/secret-formula/h2p.js
+++ b/javascripts/core/secret-formula/h2p.js
@@ -1,6 +1,7 @@
-import { GameDatabase } from "./game-database.js";
-import { DC } from "../constants.js";
-import { Pelle, PelleStrikes } from "../globals.js";
+import { Pelle, PelleStrikes } from "../globals";
+import { DC } from "../constants";
+
+import { GameDatabase } from "./game-database";
 
 GameDatabase.h2p = {
   /**
diff --git a/javascripts/core/secret-formula/index.js b/javascripts/core/secret-formula/index.js
index d76c8d8e9..a8380d6a8 100644
--- a/javascripts/core/secret-formula/index.js
+++ b/javascripts/core/secret-formula/index.js
@@ -1,45 +1,47 @@
-import "./game-database.js";
+/* eslint-disable import/newline-after-import */
+/* eslint-disable import/first */
+import "./game-database";
 
-import "./tabs.js";
-import "./away-progress-types.js";
-import "./confirmation-types.js";
-import "./tab-notifications.js";
-import "./news.js";
-import "./achievements/normal-achievements.js";
-import "./achievements/secret-achievements.js";
-import "./challenges/normal-challenges.js";
-import "./challenges/infinity-challenges.js";
-import "./challenges/eternity-challenges.js";
-import "./infinity/infinity-upgrades.js";
-import "./infinity/break-infinity-upgrades.js";
-import "./eternity/time-studies/normal-time-studies.js";
-import "./eternity/time-studies/ec-time-studies.js";
-import "./eternity/time-studies/dilation-time-studies.js";
-import "./eternity/eternity-upgrades.js";
-import "./eternity/eternity-milestones.js";
-import "./eternity/dilation-upgrades.js";
-import "./reality/reality-upgrades.js";
-import "./reality/imaginary-upgrades.js";
-export * from "./reality/perks.js";
-import "./reality/automator.js";
-import "./reality/glyph-sacrifices.js";
-import "./celestials/perk-shop.js";
-import "./celestials/teresa.js";
-import "./celestials/effarig.js";
-import "./celestials/pelle-upgrades.js";
-import "./celestials/strikes.js";
-import "./celestials/rifts.js";
-import "./celestials/galaxy-generator.js";
-import "./celestials/ra.js";
-import "./celestials/pelle-quotes.js";
-import "./celestials/enslaved.js";
-export * from "./celestials/v.js";
-import "./celestials/alchemy.js";
-import "./shop-purchases.js";
-export * from "./celestials/singularity-milestones.js";
-import "./script-templates.js";
-import "./speedrun-milestones.js";
+import "./tabs";
+import "./away-progress-types";
+import "./confirmation-types";
+import "./tab-notifications";
+import "./news";
+import "./achievements/normal-achievements";
+import "./achievements/secret-achievements";
+import "./challenges/normal-challenges";
+import "./challenges/infinity-challenges";
+import "./challenges/eternity-challenges";
+import "./infinity/infinity-upgrades";
+import "./infinity/break-infinity-upgrades";
+import "./eternity/time-studies/normal-time-studies";
+import "./eternity/time-studies/ec-time-studies";
+import "./eternity/time-studies/dilation-time-studies";
+import "./eternity/eternity-upgrades";
+import "./eternity/eternity-milestones";
+import "./eternity/dilation-upgrades";
+import "./reality/reality-upgrades";
+import "./reality/imaginary-upgrades";
+export * from "./reality/perks";
+import "./reality/automator";
+import "./reality/glyph-sacrifices";
+import "./celestials/perk-shop";
+import "./celestials/teresa";
+import "./celestials/effarig";
+import "./celestials/pelle-upgrades";
+import "./celestials/strikes";
+import "./celestials/rifts";
+import "./celestials/galaxy-generator";
+import "./celestials/ra";
+import "./celestials/pelle-quotes";
+import "./celestials/enslaved";
+export * from "./celestials/v";
+import "./celestials/alchemy";
+import "./shop-purchases";
+export * from "./celestials/singularity-milestones";
+import "./script-templates";
+import "./speedrun-milestones";
 
-import "./h2p.js";
+import "./h2p";
 
-import "./credits.js";
\ No newline at end of file
+import "./credits";
diff --git a/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js b/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js
index 5119dae59..9c0a606f3 100644
--- a/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js
+++ b/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.infinity.breakUpgrades = (function() {
   function rebuyable(config) {
diff --git a/javascripts/core/secret-formula/infinity/infinity-upgrades.js b/javascripts/core/secret-formula/infinity/infinity-upgrades.js
index 79b740ddb..0d9db2860 100644
--- a/javascripts/core/secret-formula/infinity/infinity-upgrades.js
+++ b/javascripts/core/secret-formula/infinity/infinity-upgrades.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.infinity.upgrades = (function() {
   function dimInfinityMult() {
diff --git a/javascripts/core/secret-formula/news.js b/javascripts/core/secret-formula/news.js
index c9eae6f85..e51d6bb06 100644
--- a/javascripts/core/secret-formula/news.js
+++ b/javascripts/core/secret-formula/news.js
@@ -1,5 +1,6 @@
-import { GameDatabase } from "./game-database.js";
-import { DC } from "../constants.js";
+import { DC } from "../constants";
+
+import { GameDatabase } from "./game-database";
 
 // A = always there
 // L = locked
diff --git a/javascripts/core/secret-formula/reality/automator.js b/javascripts/core/secret-formula/reality/automator.js
index 10a42b5b1..1f88f19f4 100644
--- a/javascripts/core/secret-formula/reality/automator.js
+++ b/javascripts/core/secret-formula/reality/automator.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.reality.automator = {
   commands: [
diff --git a/javascripts/core/secret-formula/reality/glyph-sacrifices.js b/javascripts/core/secret-formula/reality/glyph-sacrifices.js
index edb2aaad9..7f54e1008 100644
--- a/javascripts/core/secret-formula/reality/glyph-sacrifices.js
+++ b/javascripts/core/secret-formula/reality/glyph-sacrifices.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "../game-database.js";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.reality.glyphSacrifice = [
   {
diff --git a/javascripts/core/secret-formula/reality/imaginary-upgrades.js b/javascripts/core/secret-formula/reality/imaginary-upgrades.js
index 8b33e189d..982bc7a9f 100644
--- a/javascripts/core/secret-formula/reality/imaginary-upgrades.js
+++ b/javascripts/core/secret-formula/reality/imaginary-upgrades.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.reality.imaginaryUpgrades = (function() {
   const rebuyable = props => {
@@ -130,7 +130,7 @@ GameDatabase.reality.imaginaryUpgrades = (function() {
       name: "Transience of Information",
       id: 13,
       cost: 5e7,
-      requirement: () => `Reach ${format(Number.MAX_VALUE, 2)} projected Reality Machines within 
+      requirement: () => `Reach ${format(Number.MAX_VALUE, 2)} projected Reality Machines within
       The Enslaved Ones' Reality`,
       hasFailed: () => !Enslaved.isRunning,
       checkRequirement: () => Enslaved.isRunning && MachineHandler.uncappedRM.gte(Number.MAX_VALUE),
diff --git a/javascripts/core/secret-formula/reality/perks.js b/javascripts/core/secret-formula/reality/perks.js
index 831642e83..d402025d0 100644
--- a/javascripts/core/secret-formula/reality/perks.js
+++ b/javascripts/core/secret-formula/reality/perks.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 export const PERK_FAMILY = {
   ANTIMATTER: "ANTIMATTER",
diff --git a/javascripts/core/secret-formula/reality/reality-upgrades.js b/javascripts/core/secret-formula/reality/reality-upgrades.js
index cc63e9ef5..7f35f3233 100644
--- a/javascripts/core/secret-formula/reality/reality-upgrades.js
+++ b/javascripts/core/secret-formula/reality/reality-upgrades.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "../game-database.js";
-import { DC } from "../../constants.js";
+import { DC } from "../../constants";
+import { GameDatabase } from "../game-database";
 
 GameDatabase.reality.upgrades = (function() {
   const rebuyable = props => {
diff --git a/javascripts/core/secret-formula/script-templates.js b/javascripts/core/secret-formula/script-templates.js
index b906951fc..7efc7d2eb 100644
--- a/javascripts/core/secret-formula/script-templates.js
+++ b/javascripts/core/secret-formula/script-templates.js
@@ -1,5 +1,5 @@
-import { GameDatabase } from "./game-database.js";
 import { AutobuyerInputFunctions } from "@/components/tabs/autobuyers/AutobuyerInput";
+import { GameDatabase } from "./game-database";
 
 GameDatabase.reality.automator.templates = {
   /**
diff --git a/javascripts/core/secret-formula/shop-purchases.js b/javascripts/core/secret-formula/shop-purchases.js
index fbc167e51..7e2fb54f2 100644
--- a/javascripts/core/secret-formula/shop-purchases.js
+++ b/javascripts/core/secret-formula/shop-purchases.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "./game-database.js";
+import { GameDatabase } from "./game-database";
 
 GameDatabase.shopPurchases = {
   dimPurchases: {
diff --git a/javascripts/core/secret-formula/speedrun-milestones.js b/javascripts/core/secret-formula/speedrun-milestones.js
index 02e675cac..226453045 100644
--- a/javascripts/core/secret-formula/speedrun-milestones.js
+++ b/javascripts/core/secret-formula/speedrun-milestones.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "./game-database.js";
+import { GameDatabase } from "./game-database";
 
 GameDatabase.speedrunMilestones = [
   {
diff --git a/javascripts/core/secret-formula/tab-notifications.js b/javascripts/core/secret-formula/tab-notifications.js
index 7edf277f6..5957593d9 100644
--- a/javascripts/core/secret-formula/tab-notifications.js
+++ b/javascripts/core/secret-formula/tab-notifications.js
@@ -1,5 +1,6 @@
-import { GameDatabase } from "./game-database.js";
-import { DC } from "../constants.js";
+import { DC } from "../constants";
+
+import { GameDatabase } from "./game-database";
 
 GameDatabase.tabNotifications = {
   firstInfinity: {
diff --git a/javascripts/core/secret-formula/tabs.js b/javascripts/core/secret-formula/tabs.js
index 475fa3874..89db891ea 100644
--- a/javascripts/core/secret-formula/tabs.js
+++ b/javascripts/core/secret-formula/tabs.js
@@ -1,4 +1,4 @@
-import { GameDatabase } from "./game-database.js";
+import { GameDatabase } from "./game-database";
 
 GameDatabase.tabs = [
   {
diff --git a/javascripts/core/speedrun.js b/javascripts/core/speedrun.js
index b9b1cc13a..b8b03f13d 100644
--- a/javascripts/core/speedrun.js
+++ b/javascripts/core/speedrun.js
@@ -1,5 +1,5 @@
 import { GameDatabase } from "./secret-formula/game-database";
-import { GameMechanicState } from "./game-mechanics/index.js";
+import { GameMechanicState } from "./game-mechanics/index";
 
 export const Speedrun = {
   unlock() {
diff --git a/javascripts/core/storage/cloud-saving.js b/javascripts/core/storage/cloud-saving.js
index a682ea1dd..8ae5ab1f1 100644
--- a/javascripts/core/storage/cloud-saving.js
+++ b/javascripts/core/storage/cloud-saving.js
@@ -1,9 +1,13 @@
+/* eslint-disable import/extensions */
 import pako from "pako/dist/pako.esm.mjs";
-import { decodeBase64Binary } from "./base64-binary";
-import { ProgressChecker } from "./progress-checker.js";
+/* eslint-enable import/extensions */
+
+import { get, getDatabase, ref, set } from "firebase/database";
+import { getAuth, GoogleAuthProvider, signInWithPopup, signOut } from "firebase/auth";
 import { initializeApp } from "firebase/app";
-import { getAuth, signInWithPopup, signOut, GoogleAuthProvider } from "firebase/auth";
-import { getDatabase, ref, get, set } from "firebase/database";
+
+import { decodeBase64Binary } from "./base64-binary";
+import { ProgressChecker } from "./progress-checker";
 
 const firebaseConfig = {
   apiKey: "AIzaSyDuRTTluAFufmvw1zxGH6fsyEHmmbu8IHI",
diff --git a/javascripts/core/storage/dev-migrations.js b/javascripts/core/storage/dev-migrations.js
index 2d065654f..58789eab6 100644
--- a/javascripts/core/storage/dev-migrations.js
+++ b/javascripts/core/storage/dev-migrations.js
@@ -1,4 +1,4 @@
-import { GameStorage } from "./storage.js";
+import { GameStorage } from "./storage";
 
 function arrayToBits(array) {
   let bits = 0;
diff --git a/javascripts/core/storage/index.js b/javascripts/core/storage/index.js
index 3c62e61f9..91b0685f1 100644
--- a/javascripts/core/storage/index.js
+++ b/javascripts/core/storage/index.js
@@ -1,6 +1,6 @@
-import "./migrations.js";
-import "./dev-migrations.js";
+import "./migrations";
+import "./dev-migrations";
 
-export * from "./serializer.js";
-export * from "./storage.js";
-export * from "./cloud-saving.js";
+export * from "./serializer";
+export * from "./storage";
+export * from "./cloud-saving";
diff --git a/javascripts/core/storage/migrations.js b/javascripts/core/storage/migrations.js
index e8cc1ccef..0f6ed4188 100644
--- a/javascripts/core/storage/migrations.js
+++ b/javascripts/core/storage/migrations.js
@@ -1,5 +1,5 @@
-import { GameStorage } from "./storage.js";
 import { deepmergeAll } from "@/utility/deepmerge";
+import { GameStorage } from "./storage";
 
 // WARNING: Don't use state accessors and functions from global scope here, that's not safe in long-term
 GameStorage.migrations = {
diff --git a/javascripts/core/storage/serializer.js b/javascripts/core/storage/serializer.js
index d80a0dfd8..cf649f7bd 100644
--- a/javascripts/core/storage/serializer.js
+++ b/javascripts/core/storage/serializer.js
@@ -1,4 +1,6 @@
+/* eslint-disable import/extensions */
 import pako from "pako/dist/pako.esm.mjs";
+/* eslint-enable import/extensions */
 
 export const GameSaveSerializer = {
   serialize(save) {
diff --git a/javascripts/core/storage/storage.js b/javascripts/core/storage/storage.js
index 11932967b..c647fa191 100644
--- a/javascripts/core/storage/storage.js
+++ b/javascripts/core/storage/storage.js
@@ -1,4 +1,5 @@
 import * as ADNotations from "@antimatter-dimensions/notations";
+
 import { deepmergeAll } from "@/utility/deepmerge";
 
 export const GameStorage = {
diff --git a/javascripts/core/tickspeed.js b/javascripts/core/tickspeed.js
index 666ef7e63..3677e94d9 100644
--- a/javascripts/core/tickspeed.js
+++ b/javascripts/core/tickspeed.js
@@ -1,4 +1,4 @@
-import { DC } from "./constants.js";
+import { DC } from "./constants";
 
 export function getTickSpeedMultiplier() {
   if (InfinityChallenge(3).isRunning) return DC.D1;
diff --git a/javascripts/core/time-studies/dilation-time-study.js b/javascripts/core/time-studies/dilation-time-study.js
index 2a3bb9782..701762f81 100644
--- a/javascripts/core/time-studies/dilation-time-study.js
+++ b/javascripts/core/time-studies/dilation-time-study.js
@@ -1,5 +1,5 @@
-import { TimeStudyState } from "./time-studies.js";
-import { TimeStudy } from "./normal-time-study.js";
+import { TimeStudy } from "./normal-time-study";
+import { TimeStudyState } from "./time-studies";
 
 export class DilationTimeStudyState extends TimeStudyState {
   constructor(config) {
diff --git a/javascripts/core/time-studies/ec-time-study.js b/javascripts/core/time-studies/ec-time-study.js
index 2688406f3..50a7cc826 100644
--- a/javascripts/core/time-studies/ec-time-study.js
+++ b/javascripts/core/time-studies/ec-time-study.js
@@ -1,5 +1,5 @@
-import { TimeStudyState } from "./time-studies.js";
-import { TimeStudy } from "./normal-time-study.js";
+import { TimeStudy } from "./normal-time-study";
+import { TimeStudyState } from "./time-studies";
 
 export class ECTimeStudyState extends TimeStudyState {
   constructor(config) {
diff --git a/javascripts/core/time-studies/index.js b/javascripts/core/time-studies/index.js
index acaf2fac4..143bee257 100644
--- a/javascripts/core/time-studies/index.js
+++ b/javascripts/core/time-studies/index.js
@@ -1,6 +1,6 @@
-export * from "./time-studies.js";
-export * from "./time-study-tree.js";
-export * from "./normal-time-study.js";
-export * from "./ec-time-study.js";
-export * from "./dilation-time-study.js";
-export * from "./time-study-connections.js";
+export * from "./time-studies";
+export * from "./time-study-tree";
+export * from "./normal-time-study";
+export * from "./ec-time-study";
+export * from "./dilation-time-study";
+export * from "./time-study-connections";
diff --git a/javascripts/core/time-studies/normal-time-study.js b/javascripts/core/time-studies/normal-time-study.js
index ca60fe697..384b3449d 100644
--- a/javascripts/core/time-studies/normal-time-study.js
+++ b/javascripts/core/time-studies/normal-time-study.js
@@ -1,4 +1,4 @@
-import { TimeStudyState } from "./time-studies.js";
+import { TimeStudyState } from "./time-studies";
 
 export const NormalTimeStudies = {};
 
diff --git a/javascripts/core/time-studies/time-studies.js b/javascripts/core/time-studies/time-studies.js
index b63f0f0ec..e190736fe 100644
--- a/javascripts/core/time-studies/time-studies.js
+++ b/javascripts/core/time-studies/time-studies.js
@@ -1,4 +1,4 @@
-import { GameMechanicState } from "../game-mechanics/index.js";
+import { GameMechanicState } from "../game-mechanics/index";
 
 function showSecondPreferredWarning(currTree) {
   // Show a warning if the player can choose the second preferred dimension path and hasn't yet done so.
diff --git a/javascripts/core/time-studies/time-study-connections.js b/javascripts/core/time-studies/time-study-connections.js
index 15d3712d8..cce890cb2 100644
--- a/javascripts/core/time-studies/time-study-connections.js
+++ b/javascripts/core/time-studies/time-study-connections.js
@@ -1,4 +1,4 @@
-import { TimeStudy } from "./normal-time-study.js";
+import { TimeStudy } from "./normal-time-study";
 
 export class TimeStudyConnection {
   constructor(from, to, override) {
diff --git a/javascripts/core/time-theorems.js b/javascripts/core/time-theorems.js
index 7a1b0c264..3324dd394 100644
--- a/javascripts/core/time-theorems.js
+++ b/javascripts/core/time-theorems.js
@@ -1,4 +1,4 @@
-import { DC } from "./constants.js";
+import { DC } from "./constants";
 
 /**
  * @abstract
diff --git a/javascripts/core/utils.js b/javascripts/core/utils.js
index 4365ea8e3..c0c69d79b 100644
--- a/javascripts/core/utils.js
+++ b/javascripts/core/utils.js
@@ -1,14 +1,14 @@
 // Stuff to be loaded into global before anything else
 
-import "./polyfill.js";
-import "./extensions.js";
+import "./polyfill";
+import "./extensions";
 
-import "./crash.js";
-import "./timespan.js";
-import "./format.js";
-import "./constants.js";
-import "./math.js";
-import "./async-utils.js";
-import "./event-hub.js";
+import "./crash";
+import "./timespan";
+import "./format";
+import "./constants";
+import "./math";
+import "./async-utils";
+import "./event-hub";
 
-export * from "./game-mechanics/index.js";
+export * from "./game-mechanics/index";
diff --git a/javascripts/game.js b/javascripts/game.js
index 04c511526..f56e8d19e 100644
--- a/javascripts/game.js
+++ b/javascripts/game.js
@@ -1,8 +1,9 @@
-import { playFabLogin } from "./core/playfab.js";
-import { DC } from "./core/constants.js";
-import { SpeedrunMilestones } from "./core/speedrun.js";
 import TWEEN from "tween.js";
+
+import { DC } from "./core/constants";
 import { deepmergeAll } from "@/utility/deepmerge";
+import { playFabLogin } from "./core/playfab";
+import { SpeedrunMilestones } from "./core/speedrun";
 import { supportedBrowsers } from "./supported-browsers";
 
 if (GlobalErrorHandler.handled) {
diff --git a/package-lock.json b/package-lock.json
index 9d965c854..ee4ae2e58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,6 +37,8 @@
         "@vue/cli-service": "^5.0.0-rc.0",
         "browserslist-useragent-regexp": "^3.0.2",
         "eslint": "^7.20.0",
+        "eslint-import-resolver-alias": "^1.1.2",
+        "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-vue": "^8.0.3",
         "vue-template-compiler": "^2.6.11",
         "webpack": "^5.64.0"
@@ -2908,6 +2910,12 @@
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
       "dev": true
     },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
+    },
     "node_modules/@types/long": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
@@ -6320,6 +6328,25 @@
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
       "dev": true
     },
+    "node_modules/array-includes": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -6329,6 +6356,24 @@
         "node": ">=8"
       }
     },
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -8194,15 +8239,19 @@
       }
     },
     "node_modules/define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "dependencies": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/del": {
@@ -8686,12 +8735,75 @@
         "stackframe": "^1.1.1"
       }
     },
+    "node_modules/es-abstract": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.4.1",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
       "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
       "dev": true
     },
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -8772,6 +8884,177 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint-import-resolver-alias": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz",
+      "integrity": "sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      },
+      "peerDependencies": {
+        "eslint-plugin-import": ">=1.4.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
+    "node_modules/eslint-module-utils/node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/eslint-plugin-vue": {
       "version": "8.0.3",
       "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.0.3.tgz",
@@ -9784,12 +10067,39 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
+    "node_modules/function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/gamma": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gamma/-/gamma-1.0.0.tgz",
@@ -9838,6 +10148,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -9952,6 +10278,15 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -9961,10 +10296,22 @@
         "node": ">=4"
       }
     },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -10426,6 +10773,20 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -10481,6 +10842,18 @@
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
       "dev": true
     },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -10493,6 +10866,34 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-ci": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
@@ -10506,9 +10907,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -10606,6 +11007,33 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-path-cwd": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -10670,6 +11098,18 @@
       "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -10679,6 +11119,36 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
@@ -10691,6 +11161,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-wsl": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -11490,9 +11972,9 @@
       "dev": true
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -11501,9 +11983,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/minipass": {
@@ -11762,6 +12244,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/object-is": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
@@ -11805,6 +12296,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -13269,13 +13777,14 @@
       "integrity": "sha512-4qf/7IsIKfSNHQXSwial1IFmfM1Cc/whNBQqRwe0V2stPe7KmN1U0tWQiIx6JiirgSrisjE0eECdNf7Tav1Ntw=="
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13386,13 +13895,17 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -13707,6 +14220,20 @@
       "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
       "dev": true
     },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/signal-exit": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
@@ -14019,6 +14546,34 @@
         "node": ">=8"
       }
     },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -14030,6 +14585,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
@@ -14097,6 +14661,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/svg-pan-zoom": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/svg-pan-zoom/-/svg-pan-zoom-3.6.1.tgz",
@@ -14417,6 +14993,30 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
     },
+    "node_modules/tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
@@ -14462,6 +15062,21 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -15507,6 +16122,22 @@
         "which": "bin/which"
       }
     },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/wildcard": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
@@ -17834,6 +18465,12 @@
       "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==",
       "dev": true
     },
+    "@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
+      "dev": true
+    },
     "@types/long": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
@@ -20500,12 +21137,37 @@
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
       "dev": true
     },
+    "array-includes": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz",
+      "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5",
+        "get-intrinsic": "^1.1.1",
+        "is-string": "^1.0.7"
+      }
+    },
     "array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
+    "array.prototype.flat": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz",
+      "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.2",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
     "astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -21901,12 +22563,13 @@
       "dev": true
     },
     "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
+      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
       "dev": true,
       "requires": {
-        "object-keys": "^1.0.12"
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       }
     },
     "del": {
@@ -22290,12 +22953,63 @@
         "stackframe": "^1.1.1"
       }
     },
+    "es-abstract": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz",
+      "integrity": "sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "function.prototype.name": "^1.1.5",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.2",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "is-string": "^1.0.7",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.12.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.4.1",
+        "string.prototype.trimend": "^1.0.5",
+        "string.prototype.trimstart": "^1.0.5",
+        "unbox-primitive": "^1.0.2"
+      }
+    },
     "es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
       "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
       "dev": true
     },
+    "es-shim-unscopables": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -22532,6 +23246,148 @@
         }
       }
     },
+    "eslint-import-resolver-alias": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz",
+      "integrity": "sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==",
+      "dev": true,
+      "requires": {}
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
+      "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "resolve": "^1.20.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        }
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
+      "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.7",
+        "find-up": "^2.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.26.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz",
+      "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==",
+      "dev": true,
+      "requires": {
+        "array-includes": "^3.1.4",
+        "array.prototype.flat": "^1.2.5",
+        "debug": "^2.6.9",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.6",
+        "eslint-module-utils": "^2.7.3",
+        "has": "^1.0.3",
+        "is-core-module": "^2.8.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.values": "^1.1.5",
+        "resolve": "^1.22.0",
+        "tsconfig-paths": "^3.14.1"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2"
+          }
+        }
+      }
+    },
     "eslint-plugin-vue": {
       "version": "8.0.3",
       "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.0.3.tgz",
@@ -23107,12 +23963,30 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
+    "function.prototype.name": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
+      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.0",
+        "functions-have-names": "^1.2.2"
+      }
+    },
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true
+    },
     "gamma": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/gamma/-/gamma-1.0.0.tgz",
@@ -23149,6 +24023,16 @@
         "pump": "^3.0.0"
       }
     },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "glob": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -23235,16 +24119,31 @@
         "function-bind": "^1.1.1"
       }
     },
+    "has-bigints": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "dev": true
+    },
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
+    "has-property-descriptors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "has-symbols": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
-      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true
     },
     "has-tostringtag": {
@@ -23586,6 +24485,17 @@
         }
       }
     },
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
+    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -23626,6 +24536,15 @@
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
       "dev": true
     },
+    "is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
+    },
     "is-binary-path": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -23635,6 +24554,22 @@
         "binary-extensions": "^2.0.0"
       }
     },
+    "is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true
+    },
     "is-ci": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
@@ -23645,9 +24580,9 @@
       }
     },
     "is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+      "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -23712,6 +24647,21 @@
         "ip-regex": "^4.0.0"
       }
     },
+    "is-negative-zero": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
+      "dev": true
+    },
+    "is-number-object": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
     "is-path-cwd": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -23755,18 +24705,54 @@
       "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
+    "is-shared-array-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true
     },
+    "is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
     "is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true
     },
+    "is-weakref": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2"
+      }
+    },
     "is-wsl": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
@@ -24414,17 +25400,17 @@
       "dev": true
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "minipass": {
@@ -24636,6 +25622,12 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "dev": true
     },
+    "object-inspect": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "dev": true
+    },
     "object-is": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
@@ -24664,6 +25656,17 @@
         "object-keys": "^1.1.1"
       }
     },
+    "object.values": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz",
+      "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.19.1"
+      }
+    },
     "obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -25720,13 +26723,14 @@
       "integrity": "sha512-4qf/7IsIKfSNHQXSwial1IFmfM1Cc/whNBQqRwe0V2stPe7KmN1U0tWQiIx6JiirgSrisjE0eECdNf7Tav1Ntw=="
     },
     "regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
       }
     },
     "regexpp": {
@@ -25809,13 +26813,14 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+      "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
       "dev": true,
       "requires": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+        "is-core-module": "^2.8.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
     "resolve-from": {
@@ -26055,6 +27060,17 @@
       "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==",
       "dev": true
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "signal-exit": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
@@ -26315,6 +27331,28 @@
         "strip-ansi": "^6.0.1"
       }
     },
+    "string.prototype.trimend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
+      "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
+      "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.19.5"
+      }
+    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -26323,6 +27361,12 @@
         "ansi-regex": "^5.0.1"
       }
     },
+    "strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
+    },
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
@@ -26366,6 +27410,12 @@
         "has-flag": "^3.0.0"
       }
     },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
     "svg-pan-zoom": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/svg-pan-zoom/-/svg-pan-zoom-3.6.1.tgz",
@@ -26599,6 +27649,29 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
     },
+    "tsconfig-paths": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
+      "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==",
+      "dev": true,
+      "requires": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.1",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        }
+      }
+    },
     "tslib": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
@@ -26634,6 +27707,18 @@
         "mime-types": "~2.1.24"
       }
     },
+    "unbox-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "has-bigints": "^1.0.2",
+        "has-symbols": "^1.0.3",
+        "which-boxed-primitive": "^1.0.2"
+      }
+    },
     "unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -27411,6 +28496,19 @@
         "isexe": "^2.0.0"
       }
     },
+    "which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "requires": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      }
+    },
     "wildcard": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
diff --git a/package.json b/package.json
index 71b2d35b3..5e6a3a173 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,8 @@
     "@vue/cli-service": "^5.0.0-rc.0",
     "browserslist-useragent-regexp": "^3.0.2",
     "eslint": "^7.20.0",
+    "eslint-import-resolver-alias": "^1.1.2",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-vue": "^8.0.3",
     "vue-template-compiler": "^2.6.11",
     "webpack": "^5.64.0"
diff --git a/src/components/BlobSnowflake.vue b/src/components/BlobSnowflake.vue
index f9af5934f..deda011cb 100644
--- a/src/components/BlobSnowflake.vue
+++ b/src/components/BlobSnowflake.vue
@@ -107,4 +107,4 @@ export default {
   user-select: none;
   cursor: default;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/BlobSnowflakes.vue b/src/components/BlobSnowflakes.vue
index c9d9a17b9..e344c4754 100644
--- a/src/components/BlobSnowflakes.vue
+++ b/src/components/BlobSnowflakes.vue
@@ -1,6 +1,6 @@
 <script>
-import BlobSnowflake from "@/components/BlobSnowflake";
 import BlobBackground from "@/components/BlobBackground";
+import BlobSnowflake from "@/components/BlobSnowflake";
 
 export default {
   name: "BlobSnowflakes",
diff --git a/src/components/GameUIComponent.vue b/src/components/GameUIComponent.vue
index 08ab6f25b..57261d78d 100644
--- a/src/components/GameUIComponent.vue
+++ b/src/components/GameUIComponent.vue
@@ -1,18 +1,18 @@
 <script>
-import ClassicUi from "@/components/ui-modes/classic/ClassicUi";
-import ModernUi from "@/components/ui-modes/modern/ModernUi";
-import ModernSidebar from "@/components/ui-modes/modern/ModernSidebar";
-import TabComponents from "@/components/tabs";
-import PopupModal from "@/components/modals/PopupModal";
-import FadeToBlack from "@/components/tabs/celestial-pelle/FadeToBlack";
-import CreditsContainer from "@/components/tabs/celestial-pelle/CreditsContainer";
-import NewGame from "@/components/tabs/celestial-pelle/NewGame";
-import SaveTimer from "@/components/SaveTimer";
-import SpeedrunStatus from "@/components/SpeedrunStatus";
 import BackgroundAnimations from "@/components/BackgroundAnimations";
-import ModalProgressBar from "@/components/modals/ModalProgressBar";
+import ClassicUi from "@/components/ui-modes/classic/ClassicUi";
+import CreditsContainer from "@/components/tabs/celestial-pelle/CreditsContainer";
+import FadeToBlack from "@/components/tabs/celestial-pelle/FadeToBlack";
 import HowToPlay from "@/components/HowToPlay";
 import InfoButton from "@/components/InfoButton";
+import ModalProgressBar from "@/components/modals/ModalProgressBar";
+import ModernSidebar from "@/components/ui-modes/modern/ModernSidebar";
+import ModernUi from "@/components/ui-modes/modern/ModernUi";
+import NewGame from "@/components/tabs/celestial-pelle/NewGame";
+import PopupModal from "@/components/modals/PopupModal";
+import SaveTimer from "@/components/SaveTimer";
+import SpeedrunStatus from "@/components/SpeedrunStatus";
+import TabComponents from "@/components/tabs";
 import TimeTheoremShop from "@/components/tabs/time-studies/tt-shop/TimeTheoremShop";
 
 export default {
@@ -116,4 +116,4 @@ export default {
   display: flex;
   justify-content: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/InfinityUpgradeButton.vue b/src/components/InfinityUpgradeButton.vue
index 242e84a1b..d70861e7c 100644
--- a/src/components/InfinityUpgradeButton.vue
+++ b/src/components/InfinityUpgradeButton.vue
@@ -1,7 +1,7 @@
 <script>
+import CostDisplay from "@/components/CostDisplay";
 import DescriptionDisplay from "@/components/DescriptionDisplay";
 import EffectDisplay from "@/components/EffectDisplay";
-import CostDisplay from "@/components/CostDisplay";
 
 export default {
   name: "InfinityUpgradeButton",
diff --git a/src/components/modals/AwayProgressModal.vue b/src/components/modals/AwayProgressModal.vue
index 978ef5998..7860f3330 100644
--- a/src/components/modals/AwayProgressModal.vue
+++ b/src/components/modals/AwayProgressModal.vue
@@ -1,6 +1,6 @@
 <script>
-import ModalWrapper from "@/components/modals/ModalWrapper";
 import AwayProgressEntry from "@/components/modals/AwayProgressEntry";
+import ModalWrapper from "@/components/modals/ModalWrapper";
 
 export default {
   name: "AwayProgressModal",
diff --git a/src/components/modals/GlyphSetSaveDeleteModal.vue b/src/components/modals/GlyphSetSaveDeleteModal.vue
index 94db36c00..21dad7beb 100644
--- a/src/components/modals/GlyphSetSaveDeleteModal.vue
+++ b/src/components/modals/GlyphSetSaveDeleteModal.vue
@@ -1,6 +1,6 @@
 <script>
-import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
 import GlyphSetPreview from "@/components/GlyphSetPreview";
+import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
 
 export default {
   name: "GlyphSetSaveDeleteModal",
diff --git a/src/components/modals/GlyphShowcasePanelModal.vue b/src/components/modals/GlyphShowcasePanelModal.vue
index cbad2f124..c1f3f845d 100644
--- a/src/components/modals/GlyphShowcasePanelModal.vue
+++ b/src/components/modals/GlyphShowcasePanelModal.vue
@@ -1,7 +1,7 @@
 <script>
 import GlyphSetName from "@/components/GlyphSetName";
-import ModalWrapper from "@/components/modals/ModalWrapper";
 import GlyphShowcasePanelEntry from "@/components/modals/GlyphShowcasePanelEntry";
+import ModalWrapper from "@/components/modals/ModalWrapper";
 
 export default {
   name: "GlyphShowcasePanelModal",
diff --git a/src/components/modals/LoadGameModal.vue b/src/components/modals/LoadGameModal.vue
index aa712234e..74cb429bb 100644
--- a/src/components/modals/LoadGameModal.vue
+++ b/src/components/modals/LoadGameModal.vue
@@ -1,6 +1,6 @@
 <script>
-import ModalWrapperOptions from "@/components/modals/options/ModalWrapperOptions";
 import LoadGameEntry from "@/components/modals/LoadGameEntry";
+import ModalWrapperOptions from "@/components/modals/options/ModalWrapperOptions";
 
 export default {
   name: "LoadGameModal",
diff --git a/src/components/modals/MessageModal.vue b/src/components/modals/MessageModal.vue
index c933386ab..054d43f9f 100644
--- a/src/components/modals/MessageModal.vue
+++ b/src/components/modals/MessageModal.vue
@@ -1,6 +1,6 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import ModalCloseButton from "@/components/modals/ModalCloseButton";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "MessageModal",
diff --git a/src/components/modals/ModalWrapperChoice.vue b/src/components/modals/ModalWrapperChoice.vue
index c8f2e00c9..1ee8b06f1 100644
--- a/src/components/modals/ModalWrapperChoice.vue
+++ b/src/components/modals/ModalWrapperChoice.vue
@@ -1,7 +1,7 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
-import ModalConfirmationCheck from "@/components/modals/ModalConfirmationCheck";
 import ModalCloseButton from "@/components/modals/ModalCloseButton";
+import ModalConfirmationCheck from "@/components/modals/ModalConfirmationCheck";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "ModalWrapperChoice",
@@ -103,4 +103,4 @@ export default {
 .c-modal__header {
   margin-bottom: 0.5rem;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/modals/PelleEffectsModal.vue b/src/components/modals/PelleEffectsModal.vue
index ac311c55a..441824a91 100644
--- a/src/components/modals/PelleEffectsModal.vue
+++ b/src/components/modals/PelleEffectsModal.vue
@@ -1,6 +1,6 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import ModalWrapper from "@/components/modals/ModalWrapper";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "PelleEffectsModal",
diff --git a/src/components/modals/SingularityMilestonesModal.vue b/src/components/modals/SingularityMilestonesModal.vue
index 2812c1adb..543877265 100644
--- a/src/components/modals/SingularityMilestonesModal.vue
+++ b/src/components/modals/SingularityMilestonesModal.vue
@@ -1,6 +1,6 @@
 <script>
-import SingularityMilestoneComponent from "@/components/tabs/celestial-laitela/SingularityMilestoneComponent";
 import ModalWrapper from "@/components/modals/ModalWrapper";
+import SingularityMilestoneComponent from "@/components/tabs/celestial-laitela/SingularityMilestoneComponent";
 
 export default {
   name: "SingularityMilestonesModal",
diff --git a/src/components/modals/SpeedrunModeModal.vue b/src/components/modals/SpeedrunModeModal.vue
index 689568030..c927c4bd5 100644
--- a/src/components/modals/SpeedrunModeModal.vue
+++ b/src/components/modals/SpeedrunModeModal.vue
@@ -1,6 +1,6 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "SpeedrunModeModal",
diff --git a/src/components/modals/StudyStringModal.vue b/src/components/modals/StudyStringModal.vue
index 019df6b01..420b02f72 100644
--- a/src/components/modals/StudyStringModal.vue
+++ b/src/components/modals/StudyStringModal.vue
@@ -1,7 +1,8 @@
 <script>
+import { sha512_256 } from "js-sha512";
+
 import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
 import StudyStringLine from "@/components/modals/StudyStringLine";
-import { sha512_256 } from "js-sha512";
 
 export default {
   name: "StudyStringModal",
diff --git a/src/components/modals/options/ConfirmationOptionsModal.vue b/src/components/modals/options/ConfirmationOptionsModal.vue
index 0b969d1e9..439d30c22 100644
--- a/src/components/modals/options/ConfirmationOptionsModal.vue
+++ b/src/components/modals/options/ConfirmationOptionsModal.vue
@@ -1,6 +1,6 @@
 <script>
-import ModalWrapperOptions from "@/components/modals/options/ModalWrapperOptions";
 import ConfirmationOptionsEntry from "@/components/modals/options/ConfirmationOptionsEntry";
+import ModalWrapperOptions from "@/components/modals/options/ModalWrapperOptions";
 
 export default {
   name: "ConfirmationOptionsModal",
diff --git a/src/components/modals/options/NewsOptionsModal.vue b/src/components/modals/options/NewsOptionsModal.vue
index 7b5a783ee..a81b38025 100644
--- a/src/components/modals/options/NewsOptionsModal.vue
+++ b/src/components/modals/options/NewsOptionsModal.vue
@@ -1,7 +1,7 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import ModalOptionsToggleButton from "@/components/ModalOptionsToggleButton";
 import ModalWrapperOptions from "@/components/modals/options/ModalWrapperOptions";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "NewsOptionsModal",
diff --git a/src/components/modals/prestige/EnterCelestialsModal.vue b/src/components/modals/prestige/EnterCelestialsModal.vue
index ee177aa60..1d248f41b 100644
--- a/src/components/modals/prestige/EnterCelestialsModal.vue
+++ b/src/components/modals/prestige/EnterCelestialsModal.vue
@@ -1,6 +1,6 @@
 <script>
-import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
 import EnterCelestialsRaPet from "@/components/modals/prestige/EnterCelestialsRaPet";
+import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
 
 export default {
   name: "EnterCelestialsModal",
diff --git a/src/components/modals/prestige/RealityModal.vue b/src/components/modals/prestige/RealityModal.vue
index fccb6b446..bf2326944 100644
--- a/src/components/modals/prestige/RealityModal.vue
+++ b/src/components/modals/prestige/RealityModal.vue
@@ -1,7 +1,7 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
-import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
 import GlyphComponent from "@/components/GlyphComponent";
+import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "RealityModal",
diff --git a/src/components/tabs/alchemy/AlchemyCircleNode.vue b/src/components/tabs/alchemy/AlchemyCircleNode.vue
index bd27d0c9f..ddb2ddd18 100644
--- a/src/components/tabs/alchemy/AlchemyCircleNode.vue
+++ b/src/components/tabs/alchemy/AlchemyCircleNode.vue
@@ -1,6 +1,6 @@
 <script>
-import HintText from "@/components/HintText";
 import AlchemyResourceArc from "./AlchemyResourceArc";
+import HintText from "@/components/HintText";
 
 export default {
   name: "AlchemyCircleNode",
diff --git a/src/components/tabs/alchemy/AlchemyTab.vue b/src/components/tabs/alchemy/AlchemyTab.vue
index 6e355cc6f..989f7706d 100644
--- a/src/components/tabs/alchemy/AlchemyTab.vue
+++ b/src/components/tabs/alchemy/AlchemyTab.vue
@@ -1,8 +1,8 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
+import { AlchemyCircleLayout } from "./alchemy-circle-layout";
 import AlchemyCircleNode from "./AlchemyCircleNode";
 import AlchemyResourceInfo from "./AlchemyResourceInfo";
-import { AlchemyCircleLayout } from "./alchemy-circle-layout";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "AlchemyTab",
diff --git a/src/components/tabs/antimatter-dimensions/ClassicAntimatterDimensionsTab.vue b/src/components/tabs/antimatter-dimensions/ClassicAntimatterDimensionsTab.vue
index 695c38951..314e7a97b 100644
--- a/src/components/tabs/antimatter-dimensions/ClassicAntimatterDimensionsTab.vue
+++ b/src/components/tabs/antimatter-dimensions/ClassicAntimatterDimensionsTab.vue
@@ -1,10 +1,10 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
+import AntimatterDimensionProgressBar from "./AntimatterDimensionProgressBar";
 import AntimatterDimensionRow from "./ClassicAntimatterDimensionRow";
 import AntimatterDimensionsTabHeader from "./ClassicAntimatterDimensionsTabHeader";
 import AntimatterGalaxyRow from "./ClassicAntimatterGalaxyRow";
-import AntimatterDimensionProgressBar from "./AntimatterDimensionProgressBar";
 import DimensionBoostRow from "./ClassicDimensionBoostRow";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "ClassicAntimatterDimensionsTab",
@@ -105,4 +105,4 @@ export default {
 .l-flex {
   flex: 1 0;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue b/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue
index 2127210df..4cacbfce4 100644
--- a/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue
+++ b/src/components/tabs/antimatter-dimensions/ModernAntimatterDimensionsTab.vue
@@ -1,9 +1,9 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import AntimatterDimensionProgressBar from "./AntimatterDimensionProgressBar";
 import AntimatterDimensionRow from "@/components/tabs/antimatter-dimensions/ModernAntimatterDimensionRow";
 import AntimatterGalaxyRow from "@/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow";
 import DimensionBoostRow from "@/components/tabs/antimatter-dimensions/ModernDimensionBoostRow";
+import PrimaryButton from "@/components/PrimaryButton";
 import TickspeedRow from "@/components/tabs/antimatter-dimensions/TickspeedRow";
 
 export default {
diff --git a/src/components/tabs/autobuyers/AutobuyersTab.vue b/src/components/tabs/autobuyers/AutobuyersTab.vue
index a207bb0bd..fd8f27dab 100644
--- a/src/components/tabs/autobuyers/AutobuyersTab.vue
+++ b/src/components/tabs/autobuyers/AutobuyersTab.vue
@@ -1,14 +1,14 @@
 <script>
 import AutobuyerToggles from "./AutobuyerToggles";
+import BigCrunchAutobuyerBox from "./BigCrunchAutobuyerBox";
+import DimensionAutobuyerBox from "./DimensionAutobuyerBox";
+import DimensionBoostAutobuyerBox from "./DimensionBoostAutobuyerBox";
+import EternityAutobuyerBox from "./EternityAutobuyerBox";
+import GalaxyAutobuyerBox from "./GalaxyAutobuyerBox";
 import OpenModalHotkeysButton from "@/components/OpenModalHotkeysButton";
 import RealityAutobuyerBox from "./RealityAutobuyerBox";
-import EternityAutobuyerBox from "./EternityAutobuyerBox";
-import BigCrunchAutobuyerBox from "./BigCrunchAutobuyerBox";
-import GalaxyAutobuyerBox from "./GalaxyAutobuyerBox";
-import DimensionBoostAutobuyerBox from "./DimensionBoostAutobuyerBox";
-import TickspeedAutobuyerBox from "./TickspeedAutobuyerBox";
-import DimensionAutobuyerBox from "./DimensionAutobuyerBox";
 import SimpleAutobuyersMultiBox from "./SimpleAutobuyersMultiBox";
+import TickspeedAutobuyerBox from "./TickspeedAutobuyerBox";
 
 export default {
   name: "AutobuyersTab",
diff --git a/src/components/tabs/autobuyers/BigCrunchAutobuyerBox.vue b/src/components/tabs/autobuyers/BigCrunchAutobuyerBox.vue
index 2a14d68bd..010449401 100644
--- a/src/components/tabs/autobuyers/BigCrunchAutobuyerBox.vue
+++ b/src/components/tabs/autobuyers/BigCrunchAutobuyerBox.vue
@@ -1,7 +1,7 @@
 <script>
 import AutobuyerBox from "./AutobuyerBox";
-import AutobuyerIntervalButton from "./AutobuyerIntervalButton";
 import AutobuyerInput from "./AutobuyerInput";
+import AutobuyerIntervalButton from "./AutobuyerIntervalButton";
 
 export default {
   name: "BigCrunchAutobuyerBox",
diff --git a/src/components/tabs/autobuyers/DimensionAutobuyerBox.vue b/src/components/tabs/autobuyers/DimensionAutobuyerBox.vue
index ae9112d7f..efec3dd0d 100644
--- a/src/components/tabs/autobuyers/DimensionAutobuyerBox.vue
+++ b/src/components/tabs/autobuyers/DimensionAutobuyerBox.vue
@@ -1,7 +1,7 @@
 <script>
-import DimensionBulkButton from "./DimensionBulkButton";
 import AutobuyerBox from "./AutobuyerBox";
 import AutobuyerIntervalButton from "./AutobuyerIntervalButton";
+import DimensionBulkButton from "./DimensionBulkButton";
 
 export default {
   name: "DimensionAutobuyerBox",
diff --git a/src/components/tabs/autobuyers/DimensionBoostAutobuyerBox.vue b/src/components/tabs/autobuyers/DimensionBoostAutobuyerBox.vue
index bb3bad095..355d841d9 100644
--- a/src/components/tabs/autobuyers/DimensionBoostAutobuyerBox.vue
+++ b/src/components/tabs/autobuyers/DimensionBoostAutobuyerBox.vue
@@ -1,7 +1,7 @@
 <script>
 import AutobuyerBox from "./AutobuyerBox";
-import AutobuyerIntervalButton from "./AutobuyerIntervalButton";
 import AutobuyerInput from "./AutobuyerInput";
+import AutobuyerIntervalButton from "./AutobuyerIntervalButton";
 
 export default {
   name: "DimensionBoostAutobuyerBox",
diff --git a/src/components/tabs/autobuyers/GalaxyAutobuyerBox.vue b/src/components/tabs/autobuyers/GalaxyAutobuyerBox.vue
index c49a5bff3..97d0b59e4 100644
--- a/src/components/tabs/autobuyers/GalaxyAutobuyerBox.vue
+++ b/src/components/tabs/autobuyers/GalaxyAutobuyerBox.vue
@@ -1,7 +1,7 @@
 <script>
 import AutobuyerBox from "./AutobuyerBox";
-import AutobuyerIntervalButton from "./AutobuyerIntervalButton";
 import AutobuyerInput from "./AutobuyerInput";
+import AutobuyerIntervalButton from "./AutobuyerIntervalButton";
 
 export default {
   name: "GalaxyAutobuyerBox",
diff --git a/src/components/tabs/autobuyers/MultipleAutobuyersBox.vue b/src/components/tabs/autobuyers/MultipleAutobuyersBox.vue
index d3bc0e07d..77917a987 100644
--- a/src/components/tabs/autobuyers/MultipleAutobuyersBox.vue
+++ b/src/components/tabs/autobuyers/MultipleAutobuyersBox.vue
@@ -1,6 +1,6 @@
 <script>
-import SingleAutobuyerInRow from "./SingleAutobuyerInRow";
 import AutobuyerIntervalLabel from "./AutobuyerIntervalLabel";
+import SingleAutobuyerInRow from "./SingleAutobuyerInRow";
 
 export default {
   name: "MultipleAutobuyersBox",
diff --git a/src/components/tabs/autobuyers/SingleAutobuyerBox.vue b/src/components/tabs/autobuyers/SingleAutobuyerBox.vue
index a179a2d9c..1547913b5 100644
--- a/src/components/tabs/autobuyers/SingleAutobuyerBox.vue
+++ b/src/components/tabs/autobuyers/SingleAutobuyerBox.vue
@@ -1,7 +1,7 @@
 <script>
-import AutobuyerToggleLabel from "./AutobuyerToggleLabel";
-import AutobuyerIntervalLabel from "./AutobuyerIntervalLabel";
 import AutobuyerInput from "./AutobuyerInput";
+import AutobuyerIntervalLabel from "./AutobuyerIntervalLabel";
+import AutobuyerToggleLabel from "./AutobuyerToggleLabel";
 
 export default {
   name: "SingleAutobuyerBox",
diff --git a/src/components/tabs/autobuyers/SingleAutobuyerInRow.vue b/src/components/tabs/autobuyers/SingleAutobuyerInRow.vue
index fceca40aa..17153e57a 100644
--- a/src/components/tabs/autobuyers/SingleAutobuyerInRow.vue
+++ b/src/components/tabs/autobuyers/SingleAutobuyerInRow.vue
@@ -1,7 +1,7 @@
 <script>
-import AutobuyerToggleLabel from "./AutobuyerToggleLabel";
 import AutobuyerIntervalLabel from "./AutobuyerIntervalLabel";
 import AutobuyerModeButton from "./AutobuyerModeButton";
+import AutobuyerToggleLabel from "./AutobuyerToggleLabel";
 
 export default {
   name: "SingleAutobuyerInRow",
diff --git a/src/components/tabs/automator/AutomatorBlockEditor.vue b/src/components/tabs/automator/AutomatorBlockEditor.vue
index 48738c6ca..24db4ddf4 100644
--- a/src/components/tabs/automator/AutomatorBlockEditor.vue
+++ b/src/components/tabs/automator/AutomatorBlockEditor.vue
@@ -1,7 +1,8 @@
 <script>
-import AutomatorSingleBlock from "./AutomatorSingleBlock";
 import draggable from "vuedraggable";
 
+import AutomatorSingleBlock from "./AutomatorSingleBlock";
+
 export default {
   name: "AutomatorBlockEditor",
   components: {
diff --git a/src/components/tabs/automator/AutomatorDocs.vue b/src/components/tabs/automator/AutomatorDocs.vue
index 2431646a6..449d78fb3 100644
--- a/src/components/tabs/automator/AutomatorDocs.vue
+++ b/src/components/tabs/automator/AutomatorDocs.vue
@@ -1,10 +1,10 @@
 <script>
+import AutomatorBlocks from "./AutomatorBlocks";
 import AutomatorButton from "./AutomatorButton";
 import AutomatorDocsCommandList from "./AutomatorDocsCommandList";
+import AutomatorDocsTemplateList from "./AutomatorDocsTemplateList";
 import AutomatorErrorPage from "./AutomatorErrorPage";
 import AutomatorEventLog from "./AutomatorEventLog";
-import AutomatorBlocks from "./AutomatorBlocks";
-import AutomatorDocsTemplateList from "./AutomatorDocsTemplateList";
 
 export default {
   name: "AutomatorDocs",
diff --git a/src/components/tabs/automator/AutomatorEditor.vue b/src/components/tabs/automator/AutomatorEditor.vue
index 20866d4dc..71e6d5e56 100644
--- a/src/components/tabs/automator/AutomatorEditor.vue
+++ b/src/components/tabs/automator/AutomatorEditor.vue
@@ -1,7 +1,7 @@
 <script>
 import AutomatorBlockEditor from "./AutomatorBlockEditor";
-import AutomatorTextEditor from "./AutomatorTextEditor";
 import AutomatorControls from "./AutomatorControls";
+import AutomatorTextEditor from "./AutomatorTextEditor";
 
 export default {
   name: "AutomatorEditor",
diff --git a/src/components/tabs/automator/AutomatorTab.vue b/src/components/tabs/automator/AutomatorTab.vue
index 757442761..307581756 100644
--- a/src/components/tabs/automator/AutomatorTab.vue
+++ b/src/components/tabs/automator/AutomatorTab.vue
@@ -1,8 +1,9 @@
 <script>
 import SplitPane from "vue-splitpane";
+
+import AutomatorDocs from "./AutomatorDocs";
 import AutomatorEditor from "./AutomatorEditor";
 import AutomatorPointsList from "./AutomatorPointsList";
-import AutomatorDocs from "./AutomatorDocs";
 
 export default {
   name: "AutomatorTab",
diff --git a/src/components/tabs/black-hole/BlackHoleTab.vue b/src/components/tabs/black-hole/BlackHoleTab.vue
index 85ed613fe..5b5ae1d7e 100644
--- a/src/components/tabs/black-hole/BlackHoleTab.vue
+++ b/src/components/tabs/black-hole/BlackHoleTab.vue
@@ -1,9 +1,9 @@
 <script>
-import { BlackHoleAnimation } from "./black-hole-animation.js";
-import BlackHoleUpgradeRow from "./BlackHoleUpgradeRow";
-import BlackHoleStateRow from "./BlackHoleStateRow";
+import { BlackHoleAnimation } from "./black-hole-animation";
 import BlackHoleChargingSliders from "./BlackHoleChargingSliders";
+import BlackHoleStateRow from "./BlackHoleStateRow";
 import BlackHoleUnlockButton from "./BlackHoleUnlockButton";
+import BlackHoleUpgradeRow from "./BlackHoleUpgradeRow";
 
 export default {
   name: "BlackHoleTab",
diff --git a/src/components/tabs/black-hole/BlackHoleUpgradeButton.vue b/src/components/tabs/black-hole/BlackHoleUpgradeButton.vue
index e67b00ed5..a49df5551 100644
--- a/src/components/tabs/black-hole/BlackHoleUpgradeButton.vue
+++ b/src/components/tabs/black-hole/BlackHoleUpgradeButton.vue
@@ -1,8 +1,8 @@
 <script>
-import PrimaryToggleButton from "@/components/PrimaryToggleButton";
+import CostDisplay from "@/components/CostDisplay";
 import DescriptionDisplay from "@/components/DescriptionDisplay";
 import EffectDisplay from "@/components/EffectDisplay";
-import CostDisplay from "@/components/CostDisplay";
+import PrimaryToggleButton from "@/components/PrimaryToggleButton";
 
 export default {
   name: "BlackHoleUpgradeButton",
diff --git a/src/components/tabs/celestial-effarig/EffarigTab.vue b/src/components/tabs/celestial-effarig/EffarigTab.vue
index bc62ccf9f..8753f669e 100644
--- a/src/components/tabs/celestial-effarig/EffarigTab.vue
+++ b/src/components/tabs/celestial-effarig/EffarigTab.vue
@@ -1,7 +1,7 @@
 <script>
-import EffarigUnlockButton from "./EffarigUnlockButton";
-import EffarigRunUnlockReward from "./EffarigRunUnlockReward";
 import CelestialQuoteHistory from "@/components/CelestialQuoteHistory";
+import EffarigRunUnlockReward from "./EffarigRunUnlockReward";
+import EffarigUnlockButton from "./EffarigUnlockButton";
 
 export default {
   name: "EffarigTab",
diff --git a/src/components/tabs/celestial-enslaved/EnslavedTab.vue b/src/components/tabs/celestial-enslaved/EnslavedTab.vue
index 860fe3a90..ae02bcec1 100644
--- a/src/components/tabs/celestial-enslaved/EnslavedTab.vue
+++ b/src/components/tabs/celestial-enslaved/EnslavedTab.vue
@@ -1,8 +1,8 @@
 <script>
+import BlackHoleChargingSliders from "@/components/tabs/black-hole/BlackHoleChargingSliders";
 import CelestialQuoteHistory from "@/components/CelestialQuoteHistory";
 import PrimaryButton from "@/components/PrimaryButton";
 import PrimaryToggleButton from "@/components/PrimaryToggleButton";
-import BlackHoleChargingSliders from "@/components/tabs/black-hole/BlackHoleChargingSliders";
 
 export default {
   name: "EnslavedTab",
diff --git a/src/components/tabs/celestial-laitela/DarkMatterDimensionGroup.vue b/src/components/tabs/celestial-laitela/DarkMatterDimensionGroup.vue
index 2a61bab5f..d0dffd68d 100644
--- a/src/components/tabs/celestial-laitela/DarkMatterDimensionGroup.vue
+++ b/src/components/tabs/celestial-laitela/DarkMatterDimensionGroup.vue
@@ -1,5 +1,6 @@
 <script>
 import DarkMatterDimensionRow from "./DarkMatterDimensionRow";
+
 export default {
   name: "DarkMatterDimensionGroup",
   components: {
@@ -16,4 +17,4 @@ export default {
       :tier="tier"
     />
   </span>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/components/tabs/celestial-laitela/LaitelaTab.vue b/src/components/tabs/celestial-laitela/LaitelaTab.vue
index 0c98aff52..6afe45b68 100644
--- a/src/components/tabs/celestial-laitela/LaitelaTab.vue
+++ b/src/components/tabs/celestial-laitela/LaitelaTab.vue
@@ -1,12 +1,12 @@
 <script>
-import LaitelaRunButton from "./LaitelaRunButton";
-import SingularityPane from "./SingularityPane";
-import SingularityMilestonePane from "./SingularityMilestonePane";
-import DarkMatterDimensionGroup from "./DarkMatterDimensionGroup";
 import AnnihilationButton from "./AnnihilationButton";
-import LaitelaAutobuyerPane from "./LaitelaAutobuyerPane";
 import CelestialQuoteHistory from "@/components/CelestialQuoteHistory";
+import DarkMatterDimensionGroup from "./DarkMatterDimensionGroup";
+import LaitelaAutobuyerPane from "./LaitelaAutobuyerPane";
+import LaitelaRunButton from "./LaitelaRunButton";
 import PrimaryButton from "@/components/PrimaryButton";
+import SingularityMilestonePane from "./SingularityMilestonePane";
+import SingularityPane from "./SingularityPane";
 
 export default {
   name: "LaitelaTab",
@@ -123,4 +123,4 @@ export default {
     </div>
     <LaitelaAutobuyerPane v-if="autobuyersUnlocked" />
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/components/tabs/celestial-navigation/CelestialNavigationTab.vue b/src/components/tabs/celestial-navigation/CelestialNavigationTab.vue
index e7fbf0741..65187e0b1 100644
--- a/src/components/tabs/celestial-navigation/CelestialNavigationTab.vue
+++ b/src/components/tabs/celestial-navigation/CelestialNavigationTab.vue
@@ -1,10 +1,12 @@
 <script>
+import svgPanZoom from "svg-pan-zoom";
+
 import { CELESTIAL_NAV_DRAW_ORDER } from "../../../../javascripts/core/secret-formula/celestials/navigation";
-import NodeRing from "./NodeRing";
+
 import NodeBackground from "./NodeBackground";
 import NodeOverlay from "./NodeOverlay";
+import NodeRing from "./NodeRing";
 import ProgressConnector from "./ProgressConnector";
-import svgPanZoom from "svg-pan-zoom";
 
 export default {
   name: "CelestialNavigationTab",
diff --git a/src/components/tabs/celestial-pelle/PelleRift.vue b/src/components/tabs/celestial-pelle/PelleRift.vue
index 69708d0fc..786302992 100644
--- a/src/components/tabs/celestial-pelle/PelleRift.vue
+++ b/src/components/tabs/celestial-pelle/PelleRift.vue
@@ -1,6 +1,6 @@
 <script>
-import PelleStrike from "./PelleStrike";
 import PelleRiftBar from "./PelleRiftBar";
+import PelleStrike from "./PelleStrike";
 
 export default {
   name: "PelleRift",
diff --git a/src/components/tabs/celestial-pelle/PelleRiftBar.vue b/src/components/tabs/celestial-pelle/PelleRiftBar.vue
index b2951464c..51678d9e9 100644
--- a/src/components/tabs/celestial-pelle/PelleRiftBar.vue
+++ b/src/components/tabs/celestial-pelle/PelleRiftBar.vue
@@ -1,5 +1,6 @@
 <script>
-import CustomizeableTooltip from "@/components/CustomizeableTooltip.vue";
+import CustomizeableTooltip from "@/components/CustomizeableTooltip";
+
 export default {
   name: "PelleRiftBar",
   components: {
diff --git a/src/components/tabs/celestial-pelle/PelleTab.vue b/src/components/tabs/celestial-pelle/PelleTab.vue
index 760aa1605..6f08ba9cd 100644
--- a/src/components/tabs/celestial-pelle/PelleTab.vue
+++ b/src/components/tabs/celestial-pelle/PelleTab.vue
@@ -1,8 +1,8 @@
 <script>
+import CelestialQuoteHistory from "@/components/CelestialQuoteHistory";
+import GalaxyGeneratorPanel from "./PelleGalaxyGeneratorPanel";
 import PelleBarPanel from "./PelleBarPanel";
 import PelleUpgradePanel from "./PelleUpgradePanel";
-import GalaxyGeneratorPanel from "./PelleGalaxyGeneratorPanel";
-import CelestialQuoteHistory from "@/components/CelestialQuoteHistory";
 
 export default {
   name: "PelleTab",
diff --git a/src/components/tabs/celestial-ra/RaPet.vue b/src/components/tabs/celestial-ra/RaPet.vue
index 66276f914..553f5ef90 100644
--- a/src/components/tabs/celestial-ra/RaPet.vue
+++ b/src/components/tabs/celestial-ra/RaPet.vue
@@ -1,6 +1,6 @@
 <script>
-import RaUpgradeIcon from "./RaUpgradeIcon";
 import RaPetLevelBar from "./RaPetLevelBar";
+import RaUpgradeIcon from "./RaUpgradeIcon";
 
 export default {
   name: "RaPet",
diff --git a/src/components/tabs/celestial-ra/RaTab.vue b/src/components/tabs/celestial-ra/RaTab.vue
index 5c6f39aa4..f028f32ad 100644
--- a/src/components/tabs/celestial-ra/RaTab.vue
+++ b/src/components/tabs/celestial-ra/RaTab.vue
@@ -1,7 +1,7 @@
 <script>
+import CelestialQuoteHistory from "@/components/CelestialQuoteHistory";
 import RaPet from "./RaPet";
 import RaPetRecollectionButton from "./RaPetRecollectionButton";
-import CelestialQuoteHistory from "@/components/CelestialQuoteHistory";
 
 export default {
   name: "RaTab",
diff --git a/src/components/tabs/celestial-teresa/TeresaTab.vue b/src/components/tabs/celestial-teresa/TeresaTab.vue
index 666b30570..bd28e055f 100644
--- a/src/components/tabs/celestial-teresa/TeresaTab.vue
+++ b/src/components/tabs/celestial-teresa/TeresaTab.vue
@@ -1,9 +1,10 @@
 <script>
 import { DC } from "../../../../javascripts/core/constants";
-import PerkShopUpgradeButton from "./PerkShopUpgradeButton";
+
 import CelestialQuoteHistory from "@/components/CelestialQuoteHistory";
-import GlyphSetPreview from "@/components/GlyphSetPreview";
 import CustomizeableTooltip from "@/components/CustomizeableTooltip";
+import GlyphSetPreview from "@/components/GlyphSetPreview";
+import PerkShopUpgradeButton from "./PerkShopUpgradeButton";
 
 export default {
   name: "TeresaTab",
diff --git a/src/components/tabs/celestial-v/VTab.vue b/src/components/tabs/celestial-v/VTab.vue
index b60daa7e6..72ec26c31 100644
--- a/src/components/tabs/celestial-v/VTab.vue
+++ b/src/components/tabs/celestial-v/VTab.vue
@@ -1,7 +1,7 @@
 <script>
 import CelestialQuoteHistory from "@/components/CelestialQuoteHistory";
-import PrimaryButton from "@/components/PrimaryButton";
 import GlyphSetPreview from "@/components/GlyphSetPreview";
+import PrimaryButton from "@/components/PrimaryButton";
 import VUnlockRequirement from "./VUnlockRequirement";
 
 export default {
diff --git a/src/components/tabs/eternity-challenges/EternityChallengesTab.vue b/src/components/tabs/eternity-challenges/EternityChallengesTab.vue
index 2abfe4146..c73ba77d5 100644
--- a/src/components/tabs/eternity-challenges/EternityChallengesTab.vue
+++ b/src/components/tabs/eternity-challenges/EternityChallengesTab.vue
@@ -1,6 +1,6 @@
 <script>
-import ChallengeTabHeader from "@/components/ChallengeTabHeader";
 import ChallengeGrid from "@/components/ChallengeGrid";
+import ChallengeTabHeader from "@/components/ChallengeTabHeader";
 import EternityChallengeBox from "./EternityChallengeBox";
 
 export default {
diff --git a/src/components/tabs/eternity-upgrades/EternityUpgradeButton.vue b/src/components/tabs/eternity-upgrades/EternityUpgradeButton.vue
index 96c1629c0..8358b44a7 100644
--- a/src/components/tabs/eternity-upgrades/EternityUpgradeButton.vue
+++ b/src/components/tabs/eternity-upgrades/EternityUpgradeButton.vue
@@ -1,7 +1,7 @@
 <script>
+import CostDisplay from "@/components/CostDisplay";
 import DescriptionDisplay from "@/components/DescriptionDisplay";
 import EffectDisplay from "@/components/EffectDisplay";
-import CostDisplay from "@/components/CostDisplay";
 
 export default {
   name: "EternityUpgradeButton",
diff --git a/src/components/tabs/eternity-upgrades/EternityUpgradesTab.vue b/src/components/tabs/eternity-upgrades/EternityUpgradesTab.vue
index a094c52ad..3bb793759 100644
--- a/src/components/tabs/eternity-upgrades/EternityUpgradesTab.vue
+++ b/src/components/tabs/eternity-upgrades/EternityUpgradesTab.vue
@@ -1,6 +1,6 @@
 <script>
-import EternityUpgradeButton from "./EternityUpgradeButton";
 import EPMultiplierButton from "./EPMultiplierButton";
+import EternityUpgradeButton from "./EternityUpgradeButton";
 
 export default {
   name: "EternityUpgradesTab",
diff --git a/src/components/tabs/glyphs/CurrentGlyphEffects.vue b/src/components/tabs/glyphs/CurrentGlyphEffects.vue
index 8a0329272..49ccaad7d 100644
--- a/src/components/tabs/glyphs/CurrentGlyphEffects.vue
+++ b/src/components/tabs/glyphs/CurrentGlyphEffects.vue
@@ -1,6 +1,6 @@
 <script>
-import GlyphSetName from "@/components/GlyphSetName";
 import CurrentGlyphEffect from "./CurrentGlyphEffect";
+import GlyphSetName from "@/components/GlyphSetName";
 
 const glyphEffectsOrder =
   ["powerpow", "powermult", "powerdimboost", "powerbuy10",
diff --git a/src/components/tabs/glyphs/GlyphLevelsAndWeights.vue b/src/components/tabs/glyphs/GlyphLevelsAndWeights.vue
index a4b5b23ee..d89f02684 100644
--- a/src/components/tabs/glyphs/GlyphLevelsAndWeights.vue
+++ b/src/components/tabs/glyphs/GlyphLevelsAndWeights.vue
@@ -1,6 +1,6 @@
 <script>
-import ToggleButton from "@/components/ToggleButton";
 import SliderComponent from "@/components/SliderComponent";
+import ToggleButton from "@/components/ToggleButton";
 
 export default {
   name: "GlyphLevelsAndWeights",
diff --git a/src/components/tabs/glyphs/GlyphsTab.vue b/src/components/tabs/glyphs/GlyphsTab.vue
index 37100fa1e..a9973677e 100644
--- a/src/components/tabs/glyphs/GlyphsTab.vue
+++ b/src/components/tabs/glyphs/GlyphsTab.vue
@@ -1,16 +1,16 @@
 <script>
-import ExpandingControlBox from "@/components/ExpandingControlBox";
-import GlyphTabSidebar from "./sidebar/GlyphTabSidebar";
-import GlyphPeek from "./GlyphPeek";
-import RealityAmplifyButton from "./RealityAmplifyButton";
-import GlyphInventory from "./GlyphInventory";
-import SacrificedGlyphs from "./SacrificedGlyphs";
 import CurrentGlyphEffects from "./CurrentGlyphEffects";
 import EquippedGlyphs from "./EquippedGlyphs";
+import ExpandingControlBox from "@/components/ExpandingControlBox";
+import GlyphInventory from "./GlyphInventory";
 import GlyphLevelsAndWeights from "./GlyphLevelsAndWeights";
-import ResetRealityButton from "./ResetRealityButton";
+import GlyphPeek from "./GlyphPeek";
+import GlyphTabSidebar from "./sidebar/GlyphTabSidebar";
+import RealityAmplifyButton from "./RealityAmplifyButton";
 import RealityButton from "./RealityButton";
 import RealityReminder from "./RealityReminder";
+import ResetRealityButton from "./ResetRealityButton";
+import SacrificedGlyphs from "./SacrificedGlyphs";
 
 export default {
   name: "GlyphsTab",
@@ -203,4 +203,4 @@ export default {
 .l-glyph-level-factors {
   margin: 2rem;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/tabs/glyphs/SacrificedGlyphs.vue b/src/components/tabs/glyphs/SacrificedGlyphs.vue
index 661938df7..15f51fba4 100644
--- a/src/components/tabs/glyphs/SacrificedGlyphs.vue
+++ b/src/components/tabs/glyphs/SacrificedGlyphs.vue
@@ -1,5 +1,6 @@
 <script>
 import { DC } from "../../../../javascripts/core/constants";
+
 import TypeSacrifice from "./TypeSacrifice";
 
 export default {
diff --git a/src/components/tabs/glyphs/sidebar/GlyphAutosortButtonGroup.vue b/src/components/tabs/glyphs/sidebar/GlyphAutosortButtonGroup.vue
index ff0538bb4..a8b03b1ca 100644
--- a/src/components/tabs/glyphs/sidebar/GlyphAutosortButtonGroup.vue
+++ b/src/components/tabs/glyphs/sidebar/GlyphAutosortButtonGroup.vue
@@ -1,6 +1,6 @@
 <script>
-import ToggleButton from "@/components/ToggleButton";
 import ButtonCycle from "@/components/ButtonCycle";
+import ToggleButton from "@/components/ToggleButton";
 
 export default {
   name: "GlyphAutosortButtonGroup",
diff --git a/src/components/tabs/glyphs/sidebar/GlyphFilterPanel.vue b/src/components/tabs/glyphs/sidebar/GlyphFilterPanel.vue
index 6ffbaa070..d5a1b998b 100644
--- a/src/components/tabs/glyphs/sidebar/GlyphFilterPanel.vue
+++ b/src/components/tabs/glyphs/sidebar/GlyphFilterPanel.vue
@@ -1,8 +1,8 @@
 <script>
-import SliderComponent from "@/components/SliderComponent";
-import GlyphComponent from "@/components/GlyphComponent";
-import AutoSacrificeEffectTab from "./AutoSacrificeEffectTab";
 import AutoSacrificeAdvancedTab from "./AutoSacrificeAdvancedTab";
+import AutoSacrificeEffectTab from "./AutoSacrificeEffectTab";
+import GlyphComponent from "@/components/GlyphComponent";
+import SliderComponent from "@/components/SliderComponent";
 
 export default {
   name: "GlyphFilterPanel",
diff --git a/src/components/tabs/glyphs/sidebar/GlyphInventoryManagementPanel.vue b/src/components/tabs/glyphs/sidebar/GlyphInventoryManagementPanel.vue
index 292a41e16..4125538f2 100644
--- a/src/components/tabs/glyphs/sidebar/GlyphInventoryManagementPanel.vue
+++ b/src/components/tabs/glyphs/sidebar/GlyphInventoryManagementPanel.vue
@@ -1,8 +1,8 @@
 <script>
-import GlyphSortButtonGroup from "./GlyphSortButtonGroup";
-import GlyphProtectedRowButtonGroup from "./GlyphProtectedRowButtonGroup";
 import GlyphAutosortButtonGroup from "./GlyphAutosortButtonGroup";
 import GlyphCleanButtonGroup from "./GlyphCleanButtonGroup";
+import GlyphProtectedRowButtonGroup from "./GlyphProtectedRowButtonGroup";
+import GlyphSortButtonGroup from "./GlyphSortButtonGroup";
 
 export default {
   name: "GlyphInventoryManagementPanel",
diff --git a/src/components/tabs/glyphs/sidebar/GlyphSetSavePanel.vue b/src/components/tabs/glyphs/sidebar/GlyphSetSavePanel.vue
index 018cabcfd..5a71e8569 100644
--- a/src/components/tabs/glyphs/sidebar/GlyphSetSavePanel.vue
+++ b/src/components/tabs/glyphs/sidebar/GlyphSetSavePanel.vue
@@ -1,6 +1,6 @@
 <script>
-import ToggleButton from "@/components/ToggleButton";
 import GlyphSetPreview from "@/components/GlyphSetPreview";
+import ToggleButton from "@/components/ToggleButton";
 
 export default {
   name: "GlyphSetSavePanel",
@@ -207,4 +207,4 @@ export default {
 .c-glyph-set-preview-area {
   width: 18rem;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/tabs/glyphs/sidebar/GlyphTabSidebar.vue b/src/components/tabs/glyphs/sidebar/GlyphTabSidebar.vue
index d3e418c8c..81f2b5913 100644
--- a/src/components/tabs/glyphs/sidebar/GlyphTabSidebar.vue
+++ b/src/components/tabs/glyphs/sidebar/GlyphTabSidebar.vue
@@ -1,8 +1,8 @@
 <script>
-import GlyphInventoryManagementPanel from "./GlyphInventoryManagementPanel";
 import GlyphFilterPanel from "./GlyphFilterPanel";
-import GlyphSetSavePanel from "./GlyphSetSavePanel";
+import GlyphInventoryManagementPanel from "./GlyphInventoryManagementPanel";
 import GlyphRejectionPanel from "./GlyphRejectionPanel";
+import GlyphSetSavePanel from "./GlyphSetSavePanel";
 
 export default {
   name: "GlyphTabSidebar",
diff --git a/src/components/tabs/imaginary-upgrades/ImaginaryUpgradeButton.vue b/src/components/tabs/imaginary-upgrades/ImaginaryUpgradeButton.vue
index e18c8ddec..cd2283dd9 100644
--- a/src/components/tabs/imaginary-upgrades/ImaginaryUpgradeButton.vue
+++ b/src/components/tabs/imaginary-upgrades/ImaginaryUpgradeButton.vue
@@ -1,9 +1,9 @@
 <script>
-import PrimaryToggleButton from "@/components/PrimaryToggleButton";
+import CostDisplay from "@/components/CostDisplay";
 import DescriptionDisplay from "@/components/DescriptionDisplay";
 import EffectDisplay from "@/components/EffectDisplay";
-import CostDisplay from "@/components/CostDisplay";
 import HintText from "@/components/HintText";
+import PrimaryToggleButton from "@/components/PrimaryToggleButton";
 
 export default {
   name: "ImaginaryUpgradeButton",
diff --git a/src/components/tabs/index.js b/src/components/tabs/index.js
index 645d92c25..9d12b6ab4 100644
--- a/src/components/tabs/index.js
+++ b/src/components/tabs/index.js
@@ -1,44 +1,44 @@
 // Temporarily aggregate tab components here until GameUI is migrated to SFC
+import AlchemyTab from "./alchemy/AlchemyTab";
 import AntimatterDimensionsTab from "./antimatter-dimensions/AntimatterDimensionsTab";
+import AutobuyersTab from "./autobuyers/AutobuyersTab";
+import AutomatorTab from "./automator/AutomatorTab";
+import BlackHoleTab from "./black-hole/BlackHoleTab";
+import BreakInfinityTab from "./break-infinity/BreakInfinityTab";
+import CelestialNavigationTab from "./celestial-navigation/CelestialNavigationTab";
+import ChallengeRecordsTab from "./challenge-records/ChallengeRecordsTab";
+import EffarigTab from "./celestial-effarig/EffarigTab";
+import EnslavedTab from "./celestial-enslaved/EnslavedTab";
+import EternityChallengesTab from "./eternity-challenges/EternityChallengesTab";
+import EternityMilestonesTab from "./eternity-milestones/EternityMilestonesTab";
+import EternityUpgradesTab from "./eternity-upgrades/EternityUpgradesTab";
+import GlyphSetRecordsTab from "./glyph-set-records/GlyphSetRecordsTab";
+import GlyphsTab from "./glyphs/GlyphsTab";
+import ImaginaryUpgradesTab from "./imaginary-upgrades/ImaginaryUpgradesTab";
+import InfinityChallengesTab from "./infinity-challenges/InfinityChallengesTab";
 import InfinityDimensionsTab from "./infinity-dimensions/InfinityDimensionsTab";
-import TimeDimensionsTab from "./time-dimensions/TimeDimensionsTab";
+import InfinityUpgradesTab from "./infinity-upgrades/InfinityUpgradesTab";
+import LaitelaTab from "./celestial-laitela/LaitelaTab";
+import NormalAchievementsTab from "./normal-achievements/NormalAchievementsTab";
+import NormalChallengesTab from "./normal-challenges/NormalChallengesTab";
 import OptionsGameplayTab from "./options-gameplay/OptionsGameplayTab";
 import OptionsSavingTab from "./options-saving/OptionsSavingTab";
 import OptionsVisualTab from "./options-visual/OptionsVisualTab";
-import StatisticsTab from "./statistics/StatisticsTab";
-import ChallengeRecordsTab from "./challenge-records/ChallengeRecordsTab";
 import PastPrestigeRunsTab from "./past-prestige-runs/PastPrestigeRunsTab";
-import GlyphSetRecordsTab from "./glyph-set-records/GlyphSetRecordsTab";
-import SpeedrunMilestonesTab from "./speedrun-milestones/SpeedrunMilestonesTab";
-import NormalAchievementsTab from "./normal-achievements/NormalAchievementsTab";
-import SecretAchievementTab from "./secret-achievements/SecretAchievementTab";
-import TeresaTab from "./celestial-teresa/TeresaTab";
-import EffarigTab from "./celestial-effarig/EffarigTab";
-import EnslavedTab from "./celestial-enslaved/EnslavedTab";
-import VTab from "./celestial-v/VTab";
-import RaTab from "./celestial-ra/RaTab";
-import LaitelaTab from "./celestial-laitela/LaitelaTab";
 import PelleTab from "./celestial-pelle/PelleTab";
-import AutobuyersTab from "./autobuyers/AutobuyersTab";
-import AutomatorTab from "./automator/AutomatorTab";
-import NormalChallengesTab from "./normal-challenges/NormalChallengesTab";
-import InfinityChallengesTab from "./infinity-challenges/InfinityChallengesTab";
-import EternityChallengesTab from "./eternity-challenges/EternityChallengesTab";
-import InfinityUpgradesTab from "./infinity-upgrades/InfinityUpgradesTab";
-import BreakInfinityTab from "./break-infinity/BreakInfinityTab";
-import ReplicantiTab from "./replicanti/ReplicantiTab";
-import TimeStudiesTab from "./time-studies/TimeStudiesTab";
-import EternityUpgradesTab from "./eternity-upgrades/EternityUpgradesTab";
-import EternityMilestonesTab from "./eternity-milestones/EternityMilestonesTab";
-import TimeDilationTab from "./time-dilation/TimeDilationTab";
-import GlyphsTab from "./glyphs/GlyphsTab";
-import RealityUpgradesTab from "./reality-upgrades/RealityUpgradesTab";
-import ImaginaryUpgradesTab from "./imaginary-upgrades/ImaginaryUpgradesTab";
 import PerksTab from "./perks/PerksTab";
-import BlackHoleTab from "./black-hole/BlackHoleTab";
-import AlchemyTab from "./alchemy/AlchemyTab";
-import CelestialNavigationTab from "./celestial-navigation/CelestialNavigationTab";
+import RaTab from "./celestial-ra/RaTab";
+import RealityUpgradesTab from "./reality-upgrades/RealityUpgradesTab";
+import ReplicantiTab from "./replicanti/ReplicantiTab";
+import SecretAchievementTab from "./secret-achievements/SecretAchievementTab";
 import ShopTab from "./shop/ShopTab";
+import SpeedrunMilestonesTab from "./speedrun-milestones/SpeedrunMilestonesTab";
+import StatisticsTab from "./statistics/StatisticsTab";
+import TeresaTab from "./celestial-teresa/TeresaTab";
+import TimeDilationTab from "./time-dilation/TimeDilationTab";
+import TimeDimensionsTab from "./time-dimensions/TimeDimensionsTab";
+import TimeStudiesTab from "./time-studies/TimeStudiesTab";
+import VTab from "./celestial-v/VTab";
 
 const TabComponents = {
   AntimatterDimensionsTab,
diff --git a/src/components/tabs/infinity-dimensions/ClassicInfinityDimensionsTab.vue b/src/components/tabs/infinity-dimensions/ClassicInfinityDimensionsTab.vue
index f3f75b37d..73234168f 100644
--- a/src/components/tabs/infinity-dimensions/ClassicInfinityDimensionsTab.vue
+++ b/src/components/tabs/infinity-dimensions/ClassicInfinityDimensionsTab.vue
@@ -1,6 +1,6 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import InfinityDimensionRow from "./ClassicInfinityDimensionRow";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "ClassicInfinityDimensionsTab",
diff --git a/src/components/tabs/infinity-dimensions/ModernInfinityDimensionsTab.vue b/src/components/tabs/infinity-dimensions/ModernInfinityDimensionsTab.vue
index 217dcf2df..960592212 100644
--- a/src/components/tabs/infinity-dimensions/ModernInfinityDimensionsTab.vue
+++ b/src/components/tabs/infinity-dimensions/ModernInfinityDimensionsTab.vue
@@ -1,6 +1,6 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import InfinityDimensionRow from "./ModernInfinityDimensionRow";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "ModernInfinityDimensionsTab",
diff --git a/src/components/tabs/infinity-upgrades/InfinityUpgradesTab.vue b/src/components/tabs/infinity-upgrades/InfinityUpgradesTab.vue
index c56b12fec..8d291bc8d 100644
--- a/src/components/tabs/infinity-upgrades/InfinityUpgradesTab.vue
+++ b/src/components/tabs/infinity-upgrades/InfinityUpgradesTab.vue
@@ -1,7 +1,7 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import InfinityUpgradeButton from "@/components/InfinityUpgradeButton";
 import IpMultiplierButton from "./IpMultiplierButton";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "InfinityUpgradesTab",
diff --git a/src/components/tabs/infinity-upgrades/IpMultiplierButton.vue b/src/components/tabs/infinity-upgrades/IpMultiplierButton.vue
index 4a545a0e6..ddca3a3b2 100644
--- a/src/components/tabs/infinity-upgrades/IpMultiplierButton.vue
+++ b/src/components/tabs/infinity-upgrades/IpMultiplierButton.vue
@@ -1,7 +1,7 @@
 <script>
+import InfinityUpgradeButton from "@/components/InfinityUpgradeButton";
 import PrimaryButton from "@/components/PrimaryButton";
 import PrimaryToggleButton from "@/components/PrimaryToggleButton";
-import InfinityUpgradeButton from "@/components/InfinityUpgradeButton";
 
 export default {
   name: "IpMultiplierButton",
diff --git a/src/components/tabs/normal-achievements/NormalAchievementsTab.vue b/src/components/tabs/normal-achievements/NormalAchievementsTab.vue
index 9ff34263e..df362ba21 100644
--- a/src/components/tabs/normal-achievements/NormalAchievementsTab.vue
+++ b/src/components/tabs/normal-achievements/NormalAchievementsTab.vue
@@ -1,7 +1,7 @@
 <script>
+import NormalAchievementRow from "./NormalAchievementRow";
 import PrimaryToggleButton from "@/components/PrimaryToggleButton";
 import SwapAchievementImagesButton from "./SwapAchievementImagesButton";
-import NormalAchievementRow from "./NormalAchievementRow";
 
 export default {
   name: "NormalAchievementsTab",
diff --git a/src/components/tabs/options-gameplay/OptionsGameplayTab.vue b/src/components/tabs/options-gameplay/OptionsGameplayTab.vue
index d926816b9..6e939ee14 100644
--- a/src/components/tabs/options-gameplay/OptionsGameplayTab.vue
+++ b/src/components/tabs/options-gameplay/OptionsGameplayTab.vue
@@ -1,7 +1,7 @@
 <script>
-import PrimaryToggleButton from "@/components/PrimaryToggleButton";
 import OpenModalHotkeysButton from "@/components/OpenModalHotkeysButton";
 import OptionsButton from "@/components/OptionsButton";
+import PrimaryToggleButton from "@/components/PrimaryToggleButton";
 
 export default {
   name: "OptionsGameplayTab",
@@ -143,4 +143,4 @@ export default {
 .l-toggle-button {
   font-size: 12px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/tabs/options-saving/OptionsSavingTab.vue b/src/components/tabs/options-saving/OptionsSavingTab.vue
index 2e4cab583..b3f03613c 100644
--- a/src/components/tabs/options-saving/OptionsSavingTab.vue
+++ b/src/components/tabs/options-saving/OptionsSavingTab.vue
@@ -1,8 +1,8 @@
 <script>
-import PrimaryToggleButton from "@/components/PrimaryToggleButton";
+import AutosaveIntervalSlider from "./AutosaveIntervalSlider";
 import OpenModalHotkeysButton from "@/components/OpenModalHotkeysButton";
 import OptionsButton from "@/components/OptionsButton";
-import AutosaveIntervalSlider from "./AutosaveIntervalSlider";
+import PrimaryToggleButton from "@/components/PrimaryToggleButton";
 
 export default {
   name: "OptionsSavingTab",
diff --git a/src/components/tabs/options-visual/OptionsVisualTab.vue b/src/components/tabs/options-visual/OptionsVisualTab.vue
index 8599d618c..540b1ab1d 100644
--- a/src/components/tabs/options-visual/OptionsVisualTab.vue
+++ b/src/components/tabs/options-visual/OptionsVisualTab.vue
@@ -1,13 +1,14 @@
 <script>
-import PrimaryToggleButton from "@/components/PrimaryToggleButton";
-import ExpandingControlBox from "@/components/ExpandingControlBox";
-import OptionsButton from "@/components/OptionsButton";
-import UpdateRateSlider from "./UpdateRateSlider";
-import OpenModalHotkeysButton from "@/components/OpenModalHotkeysButton";
-import SelectThemeDropdown from "@/components/tabs/options-visual/SelectThemeDropdown";
-import SelectNotationDropdown from "@/components/tabs/options-visual/SelectNotationDropdown";
 import * as ADNotations from "@antimatter-dimensions/notations";
 
+import ExpandingControlBox from "@/components/ExpandingControlBox";
+import OpenModalHotkeysButton from "@/components/OpenModalHotkeysButton";
+import OptionsButton from "@/components/OptionsButton";
+import PrimaryToggleButton from "@/components/PrimaryToggleButton";
+import SelectNotationDropdown from "@/components/tabs/options-visual/SelectNotationDropdown";
+import SelectThemeDropdown from "@/components/tabs/options-visual/SelectThemeDropdown";
+import UpdateRateSlider from "./UpdateRateSlider";
+
 export default {
   name: "OptionsVisualTab",
   components: {
diff --git a/src/components/tabs/perks/PerksTab.vue b/src/components/tabs/perks/PerksTab.vue
index 8a97ee593..470403e03 100644
--- a/src/components/tabs/perks/PerksTab.vue
+++ b/src/components/tabs/perks/PerksTab.vue
@@ -1,5 +1,6 @@
 <script>
 import { DataSet, Network } from "vis-network";
+
 import PerkPointLabel from "./PerkPointLabel";
 
 export default {
diff --git a/src/components/tabs/reality-upgrades/RealityUpgradeButton.vue b/src/components/tabs/reality-upgrades/RealityUpgradeButton.vue
index c438ef92c..ab658f3b6 100644
--- a/src/components/tabs/reality-upgrades/RealityUpgradeButton.vue
+++ b/src/components/tabs/reality-upgrades/RealityUpgradeButton.vue
@@ -1,9 +1,9 @@
 <script>
-import PrimaryToggleButton from "@/components/PrimaryToggleButton";
+import CostDisplay from "@/components/CostDisplay";
 import DescriptionDisplay from "@/components/DescriptionDisplay";
 import EffectDisplay from "@/components/EffectDisplay";
-import CostDisplay from "@/components/CostDisplay";
 import HintText from "@/components/HintText";
+import PrimaryToggleButton from "@/components/PrimaryToggleButton";
 
 export default {
   name: "RealityUpgradeButton",
diff --git a/src/components/tabs/replicanti/ReplicantiTab.vue b/src/components/tabs/replicanti/ReplicantiTab.vue
index 572a3d653..9faa30b43 100644
--- a/src/components/tabs/replicanti/ReplicantiTab.vue
+++ b/src/components/tabs/replicanti/ReplicantiTab.vue
@@ -1,9 +1,7 @@
 <script>
+import ReplicantiUpgradeButton, { ReplicantiUpgradeButtonSetup } from "./ReplicantiUpgradeButton";
 import PrimaryButton from "@/components/PrimaryButton";
 import ReplicantiGainText from "./ReplicantiGainText";
-import ReplicantiUpgradeButton, {
-  ReplicantiUpgradeButtonSetup,
-} from "./ReplicantiUpgradeButton";
 import ReplicantiGalaxyButton from "./ReplicantiGalaxyButton";
 
 export default {
diff --git a/src/components/tabs/time-dilation/DilationUpgradeButton.vue b/src/components/tabs/time-dilation/DilationUpgradeButton.vue
index 378ffceef..b158b3ca0 100644
--- a/src/components/tabs/time-dilation/DilationUpgradeButton.vue
+++ b/src/components/tabs/time-dilation/DilationUpgradeButton.vue
@@ -1,8 +1,8 @@
 <script>
-import PrimaryToggleButton from "@/components/PrimaryToggleButton";
+import CostDisplay from "@/components/CostDisplay";
 import DescriptionDisplay from "@/components/DescriptionDisplay";
 import EffectDisplay from "@/components/EffectDisplay";
-import CostDisplay from "@/components/CostDisplay";
+import PrimaryToggleButton from "@/components/PrimaryToggleButton";
 
 export default {
   name: "DilationUpgradeButton",
diff --git a/src/components/tabs/time-dimensions/ModernTimeDimensionsTab.vue b/src/components/tabs/time-dimensions/ModernTimeDimensionsTab.vue
index dd96d5869..be96746ca 100644
--- a/src/components/tabs/time-dimensions/ModernTimeDimensionsTab.vue
+++ b/src/components/tabs/time-dimensions/ModernTimeDimensionsTab.vue
@@ -1,6 +1,6 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import NewTimeDimensionRow from "./ModernTimeDimensionRow";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "NewTimeDimensionsTab",
diff --git a/src/components/tabs/time-studies/DilationTimeStudy.vue b/src/components/tabs/time-studies/DilationTimeStudy.vue
index 90bcca438..0eae9b5f3 100644
--- a/src/components/tabs/time-studies/DilationTimeStudy.vue
+++ b/src/components/tabs/time-studies/DilationTimeStudy.vue
@@ -1,6 +1,6 @@
 <script>
-import TimeStudyButton from "./TimeStudyButton";
 import DescriptionDisplay from "@/components/DescriptionDisplay";
+import TimeStudyButton from "./TimeStudyButton";
 
 export default {
   name: "DilationTimeStudy",
diff --git a/src/components/tabs/time-studies/ECTimeStudy.vue b/src/components/tabs/time-studies/ECTimeStudy.vue
index 55800786f..e7c0592d7 100644
--- a/src/components/tabs/time-studies/ECTimeStudy.vue
+++ b/src/components/tabs/time-studies/ECTimeStudy.vue
@@ -1,6 +1,6 @@
 <script>
-import TimeStudyButton from "./TimeStudyButton";
 import HintText from "@/components/HintText";
+import TimeStudyButton from "./TimeStudyButton";
 
 export default {
   name: "ECTimeStudy",
diff --git a/src/components/tabs/time-studies/TimeStudiesTab.vue b/src/components/tabs/time-studies/TimeStudiesTab.vue
index 9e959b9aa..037bf996c 100644
--- a/src/components/tabs/time-studies/TimeStudiesTab.vue
+++ b/src/components/tabs/time-studies/TimeStudiesTab.vue
@@ -1,13 +1,14 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import { STUDY_TREE_LAYOUT_TYPE, TimeStudyTreeLayout } from "./time-study-tree-layout";
-import NormalTimeStudy from "./NormalTimeStudy";
-import ECTimeStudy from "./ECTimeStudy";
+
 import DilationTimeStudy from "./DilationTimeStudy";
-import TriadTimeStudy from "./TriadTimeStudy";
+import ECTimeStudy from "./ECTimeStudy";
+import NormalTimeStudy from "./NormalTimeStudy";
+import PrimaryButton from "@/components/PrimaryButton";
 import SecretTimeStudy from "./SecretTimeStudy";
-import TimeStudyConnection from "./TimeStudyConnection";
 import SecretTimeStudyConnection from "./SecretTimeStudyConnection";
+import TimeStudyConnection from "./TimeStudyConnection";
+import TriadTimeStudy from "./TriadTimeStudy";
 
 export default {
   name: "TimeStudiesTab",
diff --git a/src/components/tabs/time-studies/time-study-tree-layout.js b/src/components/tabs/time-studies/time-study-tree-layout.js
index adf906426..e0e57893f 100644
--- a/src/components/tabs/time-studies/time-study-tree-layout.js
+++ b/src/components/tabs/time-studies/time-study-tree-layout.js
@@ -1,5 +1,5 @@
-import { TimeStudySetup } from "./TimeStudyButton";
 import { TimeStudyConnectionSetup } from "./TimeStudyConnection";
+import { TimeStudySetup } from "./TimeStudyButton";
 
 class TimeStudyRow {
   constructor(layout, items, isWide) {
diff --git a/src/components/tabs/time-studies/tt-shop/TimeTheoremShop.vue b/src/components/tabs/time-studies/tt-shop/TimeTheoremShop.vue
index eb33e2a7e..f3ea30a5d 100644
--- a/src/components/tabs/time-studies/tt-shop/TimeTheoremShop.vue
+++ b/src/components/tabs/time-studies/tt-shop/TimeTheoremShop.vue
@@ -1,7 +1,7 @@
 <script>
 import PrimaryToggleButton from "@/components/PrimaryToggleButton";
-import TimeTheoremBuyButton from "./TimeTheoremBuyButton";
 import TimeStudySaveLoadButton from "./TimeStudySaveLoadButton";
+import TimeTheoremBuyButton from "./TimeTheoremBuyButton";
 
 export default {
   name: "TimeTheoremShop",
@@ -242,4 +242,4 @@ export default {
 .ttbuttons-bottom-row-hide {
   height: 0rem;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/ui-modes/GameHeader.vue b/src/components/ui-modes/GameHeader.vue
index cfda8d674..9d8e03b2f 100644
--- a/src/components/ui-modes/GameHeader.vue
+++ b/src/components/ui-modes/GameHeader.vue
@@ -1,11 +1,11 @@
 <script>
-import HeaderEternityButton from "./HeaderEternityButton";
-import HeaderUnlockInfinityDimButton from "./HeaderUnlockInfinityDimButton";
-import HeaderBigCrunchButton from "./HeaderBigCrunchButton";
-import HeaderTickspeedRow from "./HeaderTickspeedRow";
 import HeaderAmountsLine from "./HeaderAmountsLine";
-import HeaderChallengeDisplay from "./HeaderChallengeDisplay";
+import HeaderBigCrunchButton from "./HeaderBigCrunchButton";
 import HeaderBlackHole from "./HeaderBlackHole";
+import HeaderChallengeDisplay from "./HeaderChallengeDisplay";
+import HeaderEternityButton from "./HeaderEternityButton";
+import HeaderTickspeedRow from "./HeaderTickspeedRow";
+import HeaderUnlockInfinityDimButton from "./HeaderUnlockInfinityDimButton";
 
 export default {
   name: "GameHeader",
diff --git a/src/components/ui-modes/HeaderBlackHole.vue b/src/components/ui-modes/HeaderBlackHole.vue
index a3e24ce11..1afa06db1 100644
--- a/src/components/ui-modes/HeaderBlackHole.vue
+++ b/src/components/ui-modes/HeaderBlackHole.vue
@@ -1,7 +1,7 @@
 <script>
+import HeaderBlackHoleStatusText from "./HeaderBlackHoleStatusText";
 import PrimaryButton from "@/components/PrimaryButton";
 import PrimaryToggleButton from "@/components/PrimaryToggleButton";
-import HeaderBlackHoleStatusText from "./HeaderBlackHoleStatusText";
 
 export default {
   name: "HeaderBlackHole",
diff --git a/src/components/ui-modes/HeaderTickspeedRow.vue b/src/components/ui-modes/HeaderTickspeedRow.vue
index 5dde0b584..8e5daf6d5 100644
--- a/src/components/ui-modes/HeaderTickspeedRow.vue
+++ b/src/components/ui-modes/HeaderTickspeedRow.vue
@@ -1,6 +1,6 @@
 <script>
-import PrimaryButton from "@/components/PrimaryButton";
 import GameSpeedDisplay from "@/components/GameSpeedDisplay";
+import PrimaryButton from "@/components/PrimaryButton";
 
 export default {
   name: "HeaderTickspeedRow",
diff --git a/src/components/ui-modes/classic/ClassicUi.vue b/src/components/ui-modes/classic/ClassicUi.vue
index 2951c9e2c..c4a5c5131 100644
--- a/src/components/ui-modes/classic/ClassicUi.vue
+++ b/src/components/ui-modes/classic/ClassicUi.vue
@@ -1,11 +1,12 @@
 <script>
 import GameHeader from "../GameHeader";
+import NewsTicker from "../NewsTicker";
+
 import ClassicBigCrunchButton from "./ClassicBigCrunchButton";
 import ClassicSubtabBar from "./ClassicSubtabBar";
 import ClassicTabBar from "./ClassicTabBar";
-import NewsTicker from "../NewsTicker";
-import InfinityPointsHeader from "@/components/InfinityPointsHeader";
 import EternityPointsHeader from "@/components/EternityPointsHeader";
+import InfinityPointsHeader from "@/components/InfinityPointsHeader";
 import RealityMachinesHeader from "@/components/RealityMachinesHeader";
 
 export default {
diff --git a/src/components/ui-modes/modern/ModernUi.vue b/src/components/ui-modes/modern/ModernUi.vue
index 66cc741f6..06c9914cc 100644
--- a/src/components/ui-modes/modern/ModernUi.vue
+++ b/src/components/ui-modes/modern/ModernUi.vue
@@ -1,11 +1,11 @@
 <script>
+import HeaderAmountsLine from "../HeaderAmountsLine";
+import HeaderBigCrunchButton from "../HeaderBigCrunchButton";
+import HeaderBlackHole from "../HeaderBlackHole";
 import HeaderChallengeDisplay from "../HeaderChallengeDisplay";
 import HeaderEternityButton from "../HeaderEternityButton";
-import HeaderBigCrunchButton from "../HeaderBigCrunchButton";
-import HeaderAmountsLine from "../HeaderAmountsLine";
 import HeaderUnlockInfinityDimButton from "../HeaderUnlockInfinityDimButton";
 import NewsTicker from "../NewsTicker";
-import HeaderBlackHole from "../HeaderBlackHole";
 
 export default {
   name: "ModernUi",
diff --git a/src/main.js b/src/main.js
index bbd836f2a..5c98c71e2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,8 @@
 import "drag-drop-touch";
 import "./shims";
 import "./merge-globals";
-import { init, browserCheck } from "../javascripts/game";
+import { browserCheck, init } from "../javascripts/game";
+
 import { watchLatestCommit } from "@/commit-watcher";
 
 if (browserCheck()) init();
diff --git a/src/merge-globals.js b/src/merge-globals.js
index 9b381e187..939271a11 100644
--- a/src/merge-globals.js
+++ b/src/merge-globals.js
@@ -1,3 +1,4 @@
+/* eslint-disable import/newline-after-import, import/first, import/order */
 function mergeIntoGlobal(object) {
   for (const key in object) {
     if (key === "default") {
diff --git a/src/shims.js b/src/shims.js
index e4be87840..fac7ea727 100644
--- a/src/shims.js
+++ b/src/shims.js
@@ -1,13 +1,13 @@
-import Vue from "vue";
-window.Vue = Vue;
-
-import Decimal from "break_infinity.js";
-window.Decimal = Decimal;
-
 import CodeMirror from "codemirror/lib/codemirror";
+import Decimal from "break_infinity.js";
+import Vue from "vue";
+
 import "codemirror/addon/mode/simple";
 import "codemirror/addon/hint/show-hint";
 import "codemirror/addon/lint/lint";
 import "codemirror/addon/selection/active-line";
 import "codemirror/addon/edit/closebrackets";
+
 window.CodeMirror = CodeMirror;
+window.Decimal = Decimal;
+window.Vue = Vue;

From 95e5c2f886f7e43169b6b33e51edd384fa10065a Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Mon, 9 May 2022 09:51:04 -0700
Subject: [PATCH 30/89] add stylelint, configure, and apply changes

---
 .stylelintignore                              |    3 +
 .stylelintrc.json                             |   57 +
 package-lock.json                             | 2741 +++++++++--------
 package.json                                  |    4 +
 public/stylesheets/ad-slider-component.css    |   65 +-
 public/stylesheets/automator.css              |   15 +-
 public/stylesheets/glyphs.css                 |  253 +-
 public/stylesheets/new-ui-styles.css          |  101 +-
 public/stylesheets/old-ui.css                 |    4 +-
 public/stylesheets/styles.css                 | 1845 ++++++-----
 public/stylesheets/theme-Dark Metro.css       |   14 +-
 public/stylesheets/theme-Dark.css             |   18 +-
 public/stylesheets/theme-Inverted Metro.css   |   18 +-
 public/stylesheets/theme-Inverted.css         |    2 +-
 public/stylesheets/theme-Metro.css            |   14 +-
 public/stylesheets/theme-S1.css               |   26 +-
 public/stylesheets/theme-S10.css              |   19 +-
 public/stylesheets/theme-S11.css              |   17 +-
 public/stylesheets/theme-S2.css               |    5 +-
 public/stylesheets/theme-S3.css               |   28 +-
 public/stylesheets/theme-S4.css               |   31 +-
 public/stylesheets/theme-S5.css               |    4 +-
 public/stylesheets/theme-S6.css               |   19 +-
 public/stylesheets/theme-S7.css               |   14 +-
 public/stylesheets/theme-S8.css               |   22 +-
 public/stylesheets/theme-S9.css               |    5 +-
 public/stylesheets/time-studies.css           |   36 +-
 public/stylesheets/tooltips.css               |   15 +-
 public/stylesheets/vue-sfc-classes.css        |    3 +-
 src/components/BlobBackground.vue             |   10 +-
 src/components/BlobSnowflake.vue              |    8 +-
 src/components/BlobSnowflakes.vue             |    2 +
 src/components/CustomizeableTooltip.vue       |   12 +-
 src/components/ExpandingControlBox.vue        |    2 -
 src/components/SaveTimer.vue                  |    5 +-
 src/components/SpeedrunStatus.vue             |    1 +
 src/components/modals/InformationModal.vue    |    7 +-
 src/components/modals/ModalProgressBar.vue    |    4 +-
 .../tabs/automator/AutomatorControls.vue      |    2 +-
 .../tabs/automator/AutomatorEditor.vue        |    6 +-
 .../tabs/black-hole/BlackHoleTab.vue          |    2 +-
 .../celestial-laitela/SingularityPane.vue     |    4 +-
 .../tabs/celestial-pelle/CreditsContainer.vue |   37 +-
 .../tabs/celestial-pelle/FadeToBlack.vue      |   18 +-
 .../tabs/celestial-pelle/PelleBarPanel.vue    |    6 +-
 .../PelleGalaxyGeneratorPanel.vue             |    8 +-
 .../tabs/celestial-pelle/PelleRift.vue        |    3 +-
 .../tabs/celestial-pelle/PelleRiftBar.vue     |   62 +-
 .../tabs/celestial-pelle/PelleTab.vue         |    2 +-
 .../tabs/celestial-pelle/PelleUpgrade.vue     |    7 +-
 .../celestial-pelle/PelleUpgradePanel.vue     |    6 +-
 .../celestial-pelle/RemnantGainFactor.vue     |    2 +-
 src/components/tabs/celestial-ra/RaPet.vue    |    2 +
 src/components/tabs/celestial-v/VTab.vue      |    2 +-
 .../tabs/glyphs/GlyphLevelsAndWeights.vue     |    3 +-
 .../glyphs/sidebar/SelectedEffectToggle.vue   |    1 +
 src/components/tabs/perks/PerkPointLabel.vue  |    6 +-
 .../tabs/replicanti/ReplicantiTab.vue         |    1 +
 src/components/tabs/shop/ShopButton.vue       |    4 +-
 src/components/tabs/shop/ShopTab.vue          |    2 +-
 .../tt-shop/TimeStudySaveLoadButton.vue       |    4 +-
 .../time-studies/tt-shop/TimeTheoremShop.vue  |    6 +-
 src/components/ui-modes/HeaderBlackHole.vue   |    1 +
 .../ui-modes/modern/ModernTabButton.vue       |    2 +-
 64 files changed, 3150 insertions(+), 2498 deletions(-)
 create mode 100644 .stylelintignore
 create mode 100644 .stylelintrc.json

diff --git a/.stylelintignore b/.stylelintignore
new file mode 100644
index 000000000..8a73544d0
--- /dev/null
+++ b/.stylelintignore
@@ -0,0 +1,3 @@
+public/stylesheets/fontawesome/**/*.css
+public/stylesheets/codemirror/*.css
+public/stylesheets/vis-network.css
diff --git a/.stylelintrc.json b/.stylelintrc.json
new file mode 100644
index 000000000..8c5be5876
--- /dev/null
+++ b/.stylelintrc.json
@@ -0,0 +1,57 @@
+{
+    "extends": [
+        "stylelint-config-standard",
+        "stylelint-config-recommended-vue"
+    ],
+    "rules": {
+        "no-descending-specificity": null,
+        "font-family-no-missing-generic-family-keyword": null,
+        "no-empty-source": null,
+
+        "color-hex-length": "long",
+        "custom-property-empty-line-before": null,
+        "color-function-notation": null,
+
+
+        "property-no-vendor-prefix": [
+            true,
+            {
+                "ignoreProperties": ["appearance", "background-clip-text", "backdrop-filter", "clip-path", "user-select"]
+            }
+        ],
+
+        "unit-allowed-list": [
+            "rem",
+            "%",
+            "px",
+            "deg",
+            "s",
+            "ms",
+            "fr"
+        ],
+        "custom-property-pattern": [
+            "^([_a-z][a-z0-9]*)([-_]{1,2}[a-z0-9]+)*$",
+            {
+                "message": "Expected custom property name to be kebab-case"
+            }
+        ],
+        "selector-class-pattern": [
+            "^(CodeMirror.*|([_a-z][a-z0-9]*)([-_]{1,2}[a-z0-9]+)*)$",
+            {
+                "message": "Expected class selector name to be kebab-case"
+            }
+        ],
+        "keyframes-name-pattern": [
+            "^([_a-z][a-z0-9]*)([-_]{1,2}[a-z0-9]+)*$",
+            {
+                "message": "Expected keyframe name to be kebab-case"
+            }
+        ],
+        "selector-id-pattern": [
+            "^([_a-z][a-z0-9]*)([-_]{1,2}[a-z0-9]+)*$",
+            {
+                "message": "Expected id selector name to be kebab-case"
+            }
+        ]
+    }
+}
diff --git a/package-lock.json b/package-lock.json
index ee4ae2e58..07e1e288b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,6 +40,10 @@
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-vue": "^8.0.3",
+        "postcss-html": "^1.4.1",
+        "stylelint": "^14.8.2",
+        "stylelint-config-recommended-vue": "^1.4.0",
+        "stylelint-config-standard": "^25.0.0",
         "vue-template-compiler": "^2.6.11",
         "webpack": "^5.64.0"
       }
@@ -4942,15 +4946,6 @@
         }
       }
     },
-    "node_modules/@vue/cli-service/node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/@vue/cli-service/node_modules/@vue/cli-shared-utils": {
       "version": "5.0.0-rc.0",
       "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.0-rc.0.tgz",
@@ -5127,27 +5122,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@vue/cli-service/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@vue/cli-service/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@vue/cli-service/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -5211,18 +5185,6 @@
         }
       }
     },
-    "node_modules/@vue/cli-service/node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@vue/cli-service/node_modules/enhanced-resolve": {
       "version": "5.8.3",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
@@ -5249,60 +5211,12 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/@vue/cli-service/node_modules/fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@vue/cli-service/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@vue/cli-service/node_modules/glob-to-regexp": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
-    "node_modules/@vue/cli-service/node_modules/globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@vue/cli-service/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -5312,24 +5226,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@vue/cli-service/node_modules/ignore": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-      "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/@vue/cli-service/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/@vue/cli-service/node_modules/loader-runner": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
@@ -5381,19 +5277,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@vue/cli-service/node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/@vue/cli-service/node_modules/mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -5464,15 +5347,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@vue/cli-service/node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@vue/cli-service/node_modules/restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -5528,15 +5402,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/@vue/cli-service/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@vue/cli-service/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -5662,18 +5527,6 @@
         "webpack": "^4.27.0 || ^5.0.0"
       }
     },
-    "node_modules/@vue/cli-service/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/@vue/cli-service/node_modules/watchpack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
@@ -6374,6 +6227,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -6676,6 +6538,18 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/break_infinity.js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/break_infinity.js/-/break_infinity.js-1.3.0.tgz",
@@ -6885,6 +6759,32 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/camelcase-keys/node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/caniuse-api": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
@@ -7007,51 +6907,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/chokidar/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/chokidar/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/chokidar/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/chokidar/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/chrome-trace-event": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
@@ -7259,6 +7114,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/clone-regexp": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
+      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
+      "dev": true,
+      "dependencies": {
+        "is-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/codemirror": {
       "version": "5.65.1",
       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.1.tgz",
@@ -7280,9 +7147,9 @@
       "dev": true
     },
     "node_modules/colord": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.1.tgz",
-      "integrity": "sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
+      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
       "dev": true
     },
     "node_modules/colorette": {
@@ -7433,88 +7300,6 @@
         "webpack": "^5.1.0"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -7527,66 +7312,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/ignore": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-      "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -7614,27 +7339,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/core-js": {
       "version": "3.19.1",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.1.tgz",
@@ -7738,6 +7442,15 @@
         "postcss": "^8.0.9"
       }
     },
+    "node_modules/css-functions-list": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
+      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.22"
+      }
+    },
     "node_modules/css-loader": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz",
@@ -8034,6 +7747,37 @@
         "ms": "2.0.0"
       }
     },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dev": true,
+      "dependencies": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys/node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/deep-equal": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@@ -8276,136 +8020,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/del/node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/del/node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/del/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/del/node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/del/node_modules/fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/del/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/del/node_modules/globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/del/node_modules/ignore": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-      "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/del/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/del/node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/del/node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/del/node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -8430,18 +8044,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/del/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -9194,52 +8796,6 @@
         "webpack": "^5.0.0"
       }
     },
-    "node_modules/eslint-webpack-plugin/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/eslint-webpack-plugin/node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/eslint-webpack-plugin/node_modules/schema-utils": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -9258,18 +8814,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/eslint-webpack-plugin/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/eslint/node_modules/@babel/code-frame": {
       "version": "7.12.11",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -9675,6 +9219,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/execall": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
+      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
+      "dev": true,
+      "dependencies": {
+        "clone-regexp": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/express": {
       "version": "4.17.1",
       "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
@@ -9738,9 +9294,9 @@
       "dev": true
     },
     "node_modules/fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "dev": true,
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -9750,65 +9306,7 @@
         "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-glob/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-glob/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/fast-glob/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/fast-glob/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
+        "node": ">=8.6.0"
       }
     },
     "node_modules/fast-json-stable-stringify": {
@@ -9823,6 +9321,12 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "dev": true
+    },
     "node_modules/fastq": {
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
@@ -9855,6 +9359,18 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -10136,6 +9652,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -10201,6 +9729,32 @@
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
+    "node_modules/global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "dev": true,
+      "dependencies": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -10211,16 +9765,16 @@
       }
     },
     "node_modules/globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -10231,14 +9785,20 @@
       }
     },
     "node_modules/globby/node_modules/ignore": {
-      "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-      "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
       }
     },
+    "node_modules/globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
+      "dev": true
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
@@ -10266,6 +9826,15 @@
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true
     },
+    "node_modules/hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -10446,12 +10015,15 @@
       "dev": true
     },
     "node_modules/html-tags": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
-      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
+      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
       "dev": true,
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/html-webpack-plugin": {
@@ -10568,64 +10140,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/http-proxy-middleware/node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/micromatch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/http-proxy-middleware/node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/human-signals": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
@@ -10714,6 +10228,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -10746,6 +10269,12 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
     "node_modules/internal-ip": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz",
@@ -11019,6 +10548,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/is-number-object": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
@@ -11092,6 +10630,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-regexp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
+      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
@@ -11424,6 +10971,12 @@
         "node": ">= 8"
       }
     },
+    "node_modules/known-css-properties": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.25.0.tgz",
+      "integrity": "sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==",
+      "dev": true
+    },
     "node_modules/launch-editor": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.2.1.tgz",
@@ -11811,6 +11364,28 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/map-obj": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mathml-tag-names": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
+      "dev": true,
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/mdn-data": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
@@ -11838,6 +11413,104 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/meow": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meow/node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/meow/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/meow/node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dev": true,
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/meow/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/meow/node_modules/type-fest": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meow/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -11886,6 +11559,19 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
     "node_modules/mime": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
@@ -11928,6 +11614,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/mini-css-extract-plugin": {
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.4.tgz",
@@ -11988,6 +11683,29 @@
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
+    "node_modules/minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "dev": true,
+      "dependencies": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/minimist-options/node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/minipass": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
@@ -12074,9 +11792,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.1.30",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
-      "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
       "dev": true,
       "bin": {
         "nanoid": "bin/nanoid.cjs"
@@ -12199,6 +11917,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/normalize-selector": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
+      "dev": true
+    },
     "node_modules/normalize-url": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
@@ -12819,9 +12543,9 @@
       "dev": true
     },
     "node_modules/picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
       "engines": {
         "node": ">=8.6"
@@ -12882,21 +12606,27 @@
       "dev": true
     },
     "node_modules/postcss": {
-      "version": "8.3.11",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
-      "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
+      "version": "8.4.13",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz",
+      "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
       "dependencies": {
-        "nanoid": "^3.1.30",
+        "nanoid": "^3.3.3",
         "picocolors": "^1.0.0",
-        "source-map-js": "^0.6.2"
+        "source-map-js": "^1.0.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
       }
     },
     "node_modules/postcss-calc": {
@@ -12993,6 +12723,51 @@
         "postcss": "^8.2.15"
       }
     },
+    "node_modules/postcss-html": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.4.1.tgz",
+      "integrity": "sha512-OKihuWxPuBQrQeLNsavP7ytJ9IYNj/ViAXB2v7Qjh56LnfESKrkahKA9si4VfPN8xtz6oqUE6KdL0bTPrHJr6g==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^7.1.2",
+        "postcss": "^8.4.0",
+        "postcss-safe-parser": "^6.0.0"
+      },
+      "engines": {
+        "node": "^12 || >=14"
+      }
+    },
+    "node_modules/postcss-html/node_modules/entities": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+      "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/postcss-html/node_modules/htmlparser2": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+      "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.2",
+        "domutils": "^2.8.0",
+        "entities": "^3.0.1"
+      }
+    },
     "node_modules/postcss-loader": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.0.tgz",
@@ -13048,6 +12823,12 @@
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
+    "node_modules/postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
+      "dev": true
+    },
     "node_modules/postcss-merge-longhand": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.3.tgz",
@@ -13396,10 +13177,32 @@
         "postcss": "^8.2.15"
       }
     },
+    "node_modules/postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+      "dev": true
+    },
+    "node_modules/postcss-safe-parser": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
+      }
+    },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "version": "6.0.10",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -13443,9 +13246,9 @@
       }
     },
     "node_modules/postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
     "node_modules/prelude-ls": {
@@ -13630,6 +13433,15 @@
         }
       ]
     },
+    "node_modules/quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -13739,6 +13551,31 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "dependencies": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/redent/node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dev": true,
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -14235,9 +14072,9 @@
       }
     },
     "node_modules/signal-exit": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
     "node_modules/sirv": {
@@ -14349,9 +14186,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
-      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -14498,6 +14335,15 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "node_modules/specificity": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
+      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
+      "dev": true,
+      "bin": {
+        "specificity": "bin/specificity"
+      }
+    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -14633,6 +14479,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/style-search": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
+      "dev": true
+    },
     "node_modules/stylehacks": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz",
@@ -14649,6 +14501,209 @@
         "postcss": "^8.2.15"
       }
     },
+    "node_modules/stylelint": {
+      "version": "14.8.2",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.8.2.tgz",
+      "integrity": "sha512-tjDfexCYfoPdl/xcDJ9Fv+Ko9cvzbDnmdiaqEn3ovXHXasi/hbkt5tSjsiReQ+ENqnz0eltaX/AOO+AlzVdcNA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^2.0.0",
+        "colord": "^2.9.2",
+        "cosmiconfig": "^7.0.1",
+        "css-functions-list": "^3.0.1",
+        "debug": "^4.3.4",
+        "execall": "^2.0.0",
+        "fast-glob": "^3.2.11",
+        "fastest-levenshtein": "^1.0.12",
+        "file-entry-cache": "^6.0.1",
+        "get-stdin": "^8.0.0",
+        "global-modules": "^2.0.0",
+        "globby": "^11.1.0",
+        "globjoin": "^0.1.4",
+        "html-tags": "^3.2.0",
+        "ignore": "^5.2.0",
+        "import-lazy": "^4.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.25.0",
+        "mathml-tag-names": "^2.1.3",
+        "meow": "^9.0.0",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "normalize-selector": "^0.2.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.13",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-safe-parser": "^6.0.0",
+        "postcss-selector-parser": "^6.0.10",
+        "postcss-value-parser": "^4.2.0",
+        "resolve-from": "^5.0.0",
+        "specificity": "^0.4.1",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "style-search": "^0.1.0",
+        "supports-hyperlinks": "^2.2.0",
+        "svg-tags": "^1.0.0",
+        "table": "^6.8.0",
+        "v8-compile-cache": "^2.3.0",
+        "write-file-atomic": "^4.0.1"
+      },
+      "bin": {
+        "stylelint": "bin/stylelint.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/stylelint"
+      }
+    },
+    "node_modules/stylelint-config-html": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-html/-/stylelint-config-html-1.0.0.tgz",
+      "integrity": "sha512-rKQUUWDpaYC7ybsS6tLxddjn6DxhjSIXybElSmcTyVQj3ExhmU3q+l41ktrlwHRyY0M5SkTkZiwngvYPYmsgSQ==",
+      "dev": true,
+      "engines": {
+        "node": "^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss-html": "^1.0.0",
+        "stylelint": ">=14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
+      "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
+      "dev": true,
+      "peerDependencies": {
+        "stylelint": "^14.4.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended-vue": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-vue/-/stylelint-config-recommended-vue-1.4.0.tgz",
+      "integrity": "sha512-DVJqyX2KvMCn9U0+keL12r7xlsH26K4Vg8NrIZuq5MoF7g82DpMp326Om4E0Q+Il1o+bTHuUyejf2XAI0iD04Q==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.3.5",
+        "stylelint-config-html": ">=1.0.0",
+        "stylelint-config-recommended": ">=6.0.0"
+      },
+      "engines": {
+        "node": "^12 || >=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ota-meshi"
+      },
+      "peerDependencies": {
+        "postcss-html": "^1.0.0",
+        "stylelint": ">=14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended-vue/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stylelint-config-recommended-vue/node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stylelint-config-recommended-vue/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/stylelint-config-standard": {
+      "version": "25.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-25.0.0.tgz",
+      "integrity": "sha512-21HnP3VSpaT1wFjFvv9VjvOGDtAviv47uTp3uFmzcN+3Lt+RYRv6oAplLaV51Kf792JSxJ6svCJh/G18E9VnCA==",
+      "dev": true,
+      "dependencies": {
+        "stylelint-config-recommended": "^7.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.4.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/balanced-match": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/stylelint/node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/stylelint/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/stylelint/node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -14661,6 +14716,40 @@
         "node": ">=4"
       }
     },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
@@ -14715,9 +14804,9 @@
       }
     },
     "node_modules/table": {
-      "version": "6.7.3",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.3.tgz",
-      "integrity": "sha512-5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
       "dev": true,
       "dependencies": {
         "ajv": "^8.0.1",
@@ -14970,6 +15059,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/toidentifier": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
@@ -14993,6 +15094,15 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
     },
+    "node_modules/trim-newlines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/tsconfig-paths": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
@@ -16204,6 +16314,19 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
+    "node_modules/write-file-atomic": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16"
+      }
+    },
     "node_modules/ws": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
@@ -20053,12 +20176,6 @@
         "whatwg-fetch": "^3.6.2"
       },
       "dependencies": {
-        "@nodelib/fs.stat": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-          "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-          "dev": true
-        },
         "@vue/cli-shared-utils": {
           "version": "5.0.0-rc.0",
           "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.0-rc.0.tgz",
@@ -20223,21 +20340,6 @@
             "color-convert": "^2.0.1"
           }
         },
-        "array-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-          "dev": true
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
         "chalk": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -20281,15 +20383,6 @@
             "ms": "2.1.2"
           }
         },
-        "dir-glob": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-          "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-          "dev": true,
-          "requires": {
-            "path-type": "^4.0.0"
-          }
-        },
         "enhanced-resolve": {
           "version": "5.8.3",
           "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
@@ -20310,66 +20403,18 @@
             "estraverse": "^4.1.1"
           }
         },
-        "fast-glob": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-          "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-          "dev": true,
-          "requires": {
-            "@nodelib/fs.stat": "^2.0.2",
-            "@nodelib/fs.walk": "^1.2.3",
-            "glob-parent": "^5.1.2",
-            "merge2": "^1.3.0",
-            "micromatch": "^4.0.4"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
         "glob-to-regexp": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
           "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
           "dev": true
         },
-        "globby": {
-          "version": "11.0.4",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-          "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-          "dev": true,
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.1.1",
-            "ignore": "^5.1.4",
-            "merge2": "^1.3.0",
-            "slash": "^3.0.0"
-          }
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "ignore": {
-          "version": "5.1.9",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-          "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
-          "dev": true
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
         "loader-runner": {
           "version": "4.2.0",
           "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
@@ -20406,16 +20451,6 @@
             "yallist": "^4.0.0"
           }
         },
-        "micromatch": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.2.3"
-          }
-        },
         "mimic-fn": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -20465,12 +20500,6 @@
             "wcwidth": "^1.0.1"
           }
         },
-        "path-type": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-          "dev": true
-        },
         "restore-cursor": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -20510,12 +20539,6 @@
             "randombytes": "^2.1.0"
           }
         },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -20591,15 +20614,6 @@
             "schema-utils": "^3.0.0"
           }
         },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        },
         "watchpack": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
@@ -21168,6 +21182,12 @@
         "es-shim-unscopables": "^1.0.0"
       }
     },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
     "astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -21392,6 +21412,15 @@
         "concat-map": "0.0.1"
       }
     },
+    "braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dev": true,
+      "requires": {
+        "fill-range": "^7.0.1"
+      }
+    },
     "break_infinity.js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/break_infinity.js/-/break_infinity.js-1.3.0.tgz",
@@ -21550,6 +21579,25 @@
       "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
       "dev": true
     },
+    "camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        }
+      }
+    },
     "caniuse-api": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
@@ -21648,41 +21696,6 @@
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
         "readdirp": "~3.6.0"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
       }
     },
     "chrome-trace-event": {
@@ -21838,6 +21851,15 @@
         "shallow-clone": "^3.0.0"
       }
     },
+    "clone-regexp": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
+      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
+      "dev": true,
+      "requires": {
+        "is-regexp": "^2.0.0"
+      }
+    },
     "codemirror": {
       "version": "5.65.1",
       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.65.1.tgz",
@@ -21859,9 +21881,9 @@
       "dev": true
     },
     "colord": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.1.tgz",
-      "integrity": "sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
+      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==",
       "dev": true
     },
     "colorette": {
@@ -21981,69 +22003,6 @@
         "serialize-javascript": "^6.0.0"
       },
       "dependencies": {
-        "@nodelib/fs.stat": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-          "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-          "dev": true
-        },
-        "array-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-          "dev": true
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "dir-glob": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-          "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-          "dev": true,
-          "requires": {
-            "path-type": "^4.0.0"
-          }
-        },
-        "fast-glob": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-          "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-          "dev": true,
-          "requires": {
-            "@nodelib/fs.stat": "^2.0.2",
-            "@nodelib/fs.walk": "^1.2.3",
-            "glob-parent": "^5.1.2",
-            "merge2": "^1.3.0",
-            "micromatch": "^4.0.4"
-          },
-          "dependencies": {
-            "glob-parent": {
-              "version": "5.1.2",
-              "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-              "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-              "dev": true,
-              "requires": {
-                "is-glob": "^4.0.1"
-              }
-            }
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
         "glob-parent": {
           "version": "6.0.2",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -22053,48 +22012,6 @@
             "is-glob": "^4.0.3"
           }
         },
-        "globby": {
-          "version": "11.0.4",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-          "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-          "dev": true,
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.1.1",
-            "ignore": "^5.1.4",
-            "merge2": "^1.3.0",
-            "slash": "^3.0.0"
-          }
-        },
-        "ignore": {
-          "version": "5.1.9",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-          "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
-          "dev": true
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "path-type": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-          "dev": true
-        },
         "schema-utils": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -22114,21 +22031,6 @@
           "requires": {
             "randombytes": "^2.1.0"
           }
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
         }
       }
     },
@@ -22209,6 +22111,12 @@
         "timsort": "^0.3.0"
       }
     },
+    "css-functions-list": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
+      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
+      "dev": true
+    },
     "css-loader": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz",
@@ -22416,6 +22324,30 @@
         "ms": "2.0.0"
       }
     },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dev": true,
+      "requires": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "map-obj": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+          "dev": true
+        }
+      }
+    },
     "deep-equal": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
@@ -22588,100 +22520,6 @@
         "slash": "^3.0.0"
       },
       "dependencies": {
-        "@nodelib/fs.stat": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-          "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-          "dev": true
-        },
-        "array-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-          "dev": true
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "dir-glob": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-          "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-          "dev": true,
-          "requires": {
-            "path-type": "^4.0.0"
-          }
-        },
-        "fast-glob": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-          "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
-          "dev": true,
-          "requires": {
-            "@nodelib/fs.stat": "^2.0.2",
-            "@nodelib/fs.walk": "^1.2.3",
-            "glob-parent": "^5.1.2",
-            "merge2": "^1.3.0",
-            "micromatch": "^4.0.4"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "globby": {
-          "version": "11.0.4",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-          "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
-          "dev": true,
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.1.1",
-            "ignore": "^5.1.4",
-            "merge2": "^1.3.0",
-            "slash": "^3.0.0"
-          }
-        },
-        "ignore": {
-          "version": "5.1.9",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-          "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
-          "dev": true
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "path-type": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-          "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-          "dev": true
-        },
         "rimraf": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -22696,15 +22534,6 @@
           "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
           "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
           "dev": true
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
         }
       }
     },
@@ -23481,40 +23310,6 @@
         "schema-utils": "^3.1.1"
       },
       "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.2.3"
-          }
-        },
         "schema-utils": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -23525,15 +23320,6 @@
             "ajv": "^6.12.5",
             "ajv-keywords": "^3.5.2"
           }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
         }
       }
     },
@@ -23653,6 +23439,15 @@
         "strip-eof": "^1.0.0"
       }
     },
+    "execall": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
+      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
+      "dev": true,
+      "requires": {
+        "clone-regexp": "^2.1.0"
+      }
+    },
     "express": {
       "version": "4.17.1",
       "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
@@ -23712,9 +23507,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
-      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -23722,51 +23517,6 @@
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
         "micromatch": "^4.0.4"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
       }
     },
     "fast-json-stable-stringify": {
@@ -23781,6 +23531,12 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
+    "fastest-levenshtein": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+      "dev": true
+    },
     "fastq": {
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
@@ -23807,6 +23563,15 @@
         "flat-cache": "^3.0.4"
       }
     },
+    "fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dev": true,
+      "requires": {
+        "to-regex-range": "^5.0.1"
+      }
+    },
     "finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -24014,6 +23779,12 @@
         "has-symbols": "^1.0.1"
       }
     },
+    "get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "dev": true
+    },
     "get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -24061,6 +23832,26 @@
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
+    "global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^3.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "dev": true,
+      "requires": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      }
+    },
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -24068,27 +23859,33 @@
       "dev": true
     },
     "globby": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
-      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "requires": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "ignore": {
-          "version": "5.1.9",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz",
-          "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
           "dev": true
         }
       }
     },
+    "globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
+      "dev": true
+    },
     "graceful-fs": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
@@ -24110,6 +23907,12 @@
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true
     },
+    "hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "dev": true
+    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -24246,9 +24049,9 @@
       }
     },
     "html-tags": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
-      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
+      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
       "dev": true
     },
     "html-webpack-plugin": {
@@ -24338,51 +24141,6 @@
         "is-glob": "^4.0.1",
         "is-plain-obj": "^3.0.0",
         "micromatch": "^4.0.2"
-      },
-      "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "micromatch": {
-          "version": "4.0.4",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-          "dev": true,
-          "requires": {
-            "braces": "^3.0.1",
-            "picomatch": "^2.2.3"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
       }
     },
     "human-signals": {
@@ -24439,6 +24197,12 @@
         "resolve-from": "^4.0.0"
       }
     },
+    "import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "dev": true
+    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -24465,6 +24229,12 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
+    "ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
+    },
     "internal-ip": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz",
@@ -24653,6 +24423,12 @@
       "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "dev": true
     },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
     "is-number-object": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
@@ -24699,6 +24475,12 @@
         "has-tostringtag": "^1.0.0"
       }
     },
+    "is-regexp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
+      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
+      "dev": true
+    },
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
@@ -24963,6 +24745,12 @@
       "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
       "dev": true
     },
+    "known-css-properties": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.25.0.tgz",
+      "integrity": "sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==",
+      "dev": true
+    },
     "launch-editor": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.2.1.tgz",
@@ -25282,6 +25070,18 @@
         }
       }
     },
+    "map-obj": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "dev": true
+    },
+    "mathml-tag-names": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
+      "dev": true
+    },
     "mdn-data": {
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
@@ -25303,6 +25103,79 @@
         "fs-monkey": "1.0.3"
       }
     },
+    "meow": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dev": true,
+      "requires": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+          "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "normalize-package-data": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+          "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^4.0.1",
+            "is-core-module": "^2.5.0",
+            "semver": "^7.3.4",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.18.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+          "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+          "dev": true
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -25344,6 +25217,16 @@
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
       "dev": true
     },
+    "micromatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "dev": true,
+      "requires": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      }
+    },
     "mime": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
@@ -25371,6 +25254,12 @@
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true
     },
+    "min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "dev": true
+    },
     "mini-css-extract-plugin": {
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.4.tgz",
@@ -25413,6 +25302,25 @@
       "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
+    "minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "dev": true,
+      "requires": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      },
+      "dependencies": {
+        "is-plain-obj": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+          "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+          "dev": true
+        }
+      }
+    },
     "minipass": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
@@ -25489,9 +25397,9 @@
       }
     },
     "nanoid": {
-      "version": "3.1.30",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
-      "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
       "dev": true
     },
     "natural-compare": {
@@ -25592,6 +25500,12 @@
       "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "dev": true
     },
+    "normalize-selector": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
+      "dev": true
+    },
     "normalize-url": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
@@ -26057,9 +25971,9 @@
       "dev": true
     },
     "picomatch": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
     "pkg-dir": {
@@ -26105,14 +26019,14 @@
       }
     },
     "postcss": {
-      "version": "8.3.11",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
-      "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
+      "version": "8.4.13",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz",
+      "integrity": "sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.1.30",
+        "nanoid": "^3.3.3",
         "picocolors": "^1.0.0",
-        "source-map-js": "^0.6.2"
+        "source-map-js": "^1.0.2"
       }
     },
     "postcss-calc": {
@@ -26174,6 +26088,37 @@
       "dev": true,
       "requires": {}
     },
+    "postcss-html": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-1.4.1.tgz",
+      "integrity": "sha512-OKihuWxPuBQrQeLNsavP7ytJ9IYNj/ViAXB2v7Qjh56LnfESKrkahKA9si4VfPN8xtz6oqUE6KdL0bTPrHJr6g==",
+      "dev": true,
+      "requires": {
+        "htmlparser2": "^7.1.2",
+        "postcss": "^8.4.0",
+        "postcss-safe-parser": "^6.0.0"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
+          "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
+          "dev": true
+        },
+        "htmlparser2": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz",
+          "integrity": "sha512-H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.0.1",
+            "domhandler": "^4.2.2",
+            "domutils": "^2.8.0",
+            "entities": "^3.0.1"
+          }
+        }
+      }
+    },
     "postcss-loader": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.0.tgz",
@@ -26211,6 +26156,12 @@
         }
       }
     },
+    "postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
+      "dev": true
+    },
     "postcss-merge-longhand": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.3.tgz",
@@ -26429,10 +26380,23 @@
         "postcss-value-parser": "^4.1.0"
       }
     },
+    "postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
+      "dev": true
+    },
+    "postcss-safe-parser": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
+      "dev": true,
+      "requires": {}
+    },
     "postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "version": "6.0.10",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
@@ -26461,9 +26425,9 @@
       }
     },
     "postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
     "prelude-ls": {
@@ -26599,6 +26563,12 @@
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
+    "quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "dev": true
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -26688,6 +26658,27 @@
         "picomatch": "^2.2.1"
       }
     },
+    "redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dev": true,
+      "requires": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "dependencies": {
+        "strip-indent": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+          "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+          "dev": true,
+          "requires": {
+            "min-indent": "^1.0.0"
+          }
+        }
+      }
+    },
     "regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -27072,9 +27063,9 @@
       }
     },
     "signal-exit": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-      "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
       "dev": true
     },
     "sirv": {
@@ -27162,9 +27153,9 @@
       "dev": true
     },
     "source-map-js": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
-      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
       "dev": true
     },
     "source-map-support": {
@@ -27289,6 +27280,12 @@
         }
       }
     },
+    "specificity": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
+      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
+      "dev": true
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -27391,6 +27388,12 @@
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
+    "style-search": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
+      "dev": true
+    },
     "stylehacks": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz",
@@ -27401,6 +27404,156 @@
         "postcss-selector-parser": "^6.0.4"
       }
     },
+    "stylelint": {
+      "version": "14.8.2",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.8.2.tgz",
+      "integrity": "sha512-tjDfexCYfoPdl/xcDJ9Fv+Ko9cvzbDnmdiaqEn3ovXHXasi/hbkt5tSjsiReQ+ENqnz0eltaX/AOO+AlzVdcNA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^2.0.0",
+        "colord": "^2.9.2",
+        "cosmiconfig": "^7.0.1",
+        "css-functions-list": "^3.0.1",
+        "debug": "^4.3.4",
+        "execall": "^2.0.0",
+        "fast-glob": "^3.2.11",
+        "fastest-levenshtein": "^1.0.12",
+        "file-entry-cache": "^6.0.1",
+        "get-stdin": "^8.0.0",
+        "global-modules": "^2.0.0",
+        "globby": "^11.1.0",
+        "globjoin": "^0.1.4",
+        "html-tags": "^3.2.0",
+        "ignore": "^5.2.0",
+        "import-lazy": "^4.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.25.0",
+        "mathml-tag-names": "^2.1.3",
+        "meow": "^9.0.0",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "normalize-selector": "^0.2.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.13",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-safe-parser": "^6.0.0",
+        "postcss-selector-parser": "^6.0.10",
+        "postcss-value-parser": "^4.2.0",
+        "resolve-from": "^5.0.0",
+        "specificity": "^0.4.1",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "style-search": "^0.1.0",
+        "supports-hyperlinks": "^2.2.0",
+        "svg-tags": "^1.0.0",
+        "table": "^6.8.0",
+        "v8-compile-cache": "^2.3.0",
+        "write-file-atomic": "^4.0.1"
+      },
+      "dependencies": {
+        "balanced-match": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+          "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "dev": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "ignore": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+          "dev": true
+        },
+        "is-plain-object": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+          "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "resolve-from": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+          "dev": true
+        }
+      }
+    },
+    "stylelint-config-html": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-html/-/stylelint-config-html-1.0.0.tgz",
+      "integrity": "sha512-rKQUUWDpaYC7ybsS6tLxddjn6DxhjSIXybElSmcTyVQj3ExhmU3q+l41ktrlwHRyY0M5SkTkZiwngvYPYmsgSQ==",
+      "dev": true,
+      "requires": {}
+    },
+    "stylelint-config-recommended": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-7.0.0.tgz",
+      "integrity": "sha512-yGn84Bf/q41J4luis1AZ95gj0EQwRX8lWmGmBwkwBNSkpGSpl66XcPTulxGa/Z91aPoNGuIGBmFkcM1MejMo9Q==",
+      "dev": true,
+      "requires": {}
+    },
+    "stylelint-config-recommended-vue": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-vue/-/stylelint-config-recommended-vue-1.4.0.tgz",
+      "integrity": "sha512-DVJqyX2KvMCn9U0+keL12r7xlsH26K4Vg8NrIZuq5MoF7g82DpMp326Om4E0Q+Il1o+bTHuUyejf2XAI0iD04Q==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.3.5",
+        "stylelint-config-html": ">=1.0.0",
+        "stylelint-config-recommended": ">=6.0.0"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
+      }
+    },
+    "stylelint-config-standard": {
+      "version": "25.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-25.0.0.tgz",
+      "integrity": "sha512-21HnP3VSpaT1wFjFvv9VjvOGDtAviv47uTp3uFmzcN+3Lt+RYRv6oAplLaV51Kf792JSxJ6svCJh/G18E9VnCA==",
+      "dev": true,
+      "requires": {
+        "stylelint-config-recommended": "^7.0.0"
+      }
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -27410,6 +27563,33 @@
         "has-flag": "^3.0.0"
       }
     },
+    "supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "supports-preserve-symlinks-flag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
@@ -27451,9 +27631,9 @@
       }
     },
     "table": {
-      "version": "6.7.3",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.7.3.tgz",
-      "integrity": "sha512-5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
       "dev": true,
       "requires": {
         "ajv": "^8.0.1",
@@ -27632,6 +27812,15 @@
       "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
       "dev": true
     },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
     "toidentifier": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
@@ -27649,6 +27838,12 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
     },
+    "trim-newlines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "dev": true
+    },
     "tsconfig-paths": {
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz",
@@ -28559,6 +28754,16 @@
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
+    "write-file-atomic": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      }
+    },
     "ws": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
diff --git a/package.json b/package.json
index 5e6a3a173..178e79c86 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,10 @@
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-vue": "^8.0.3",
+    "postcss-html": "^1.4.1",
+    "stylelint": "^14.8.2",
+    "stylelint-config-recommended-vue": "^1.4.0",
+    "stylelint-config-standard": "^25.0.0",
     "vue-template-compiler": "^2.6.11",
     "webpack": "^5.64.0"
   }
diff --git a/public/stylesheets/ad-slider-component.css b/public/stylesheets/ad-slider-component.css
index 538665b20..8badc231b 100644
--- a/public/stylesheets/ad-slider-component.css
+++ b/public/stylesheets/ad-slider-component.css
@@ -46,23 +46,21 @@ SOFTWARE.
 .l-ad-slider__wrap {
   position: relative;
   box-sizing: border-box;
-  user-select: none;
   -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  -o-user-select: none;
+  user-select: none;
 }
 
 .l-ad-slider--disabled .l-ad-slider__wrap {
-  opacity: .5;
+  opacity: 0.5;
   cursor: not-allowed;
 }
 
-.l-ad-slider--has-label .l-ad-slider__bg{
+.l-ad-slider--has-label .l-ad-slider__bg {
   margin-bottom: 1.5rem;
 }
 
-.l-ad-slider--has-label.l-ad-slider--horizontal .l-ad-slider__bg, .l-ad-slider--has-label.l-ad-slider--horizontal-reverse .l-ad-slider__bg {
+.l-ad-slider--has-label.l-ad-slider--horizontal .l-ad-slider__bg,
+.l-ad-slider--has-label.l-ad-slider--horizontal-reverse .l-ad-slider__bg {
   top: 0.75rem;
 }
 
@@ -77,11 +75,11 @@ SOFTWARE.
 
 .c-ad-slider__bg {
   border-radius: var(--var-border-radius, 1.5rem);
-  background-color: #ccc;
+  background-color: #cccccc;
 }
 
 .l-ad-slider__bg::after {
-  content: '';
+  content: "";
   position: absolute;
   left: 0;
   top: 0;
@@ -156,19 +154,19 @@ SOFTWARE.
 
 .c-ad-slider__dot-handle {
   border-radius: var(--var-border-radius, 50%) !important;
-  background-color: #fff;
-  box-shadow: 0.5px 0.5px 2px 1px rgba(0, 0, 0, 0.32);
+  background-color: #ffffff;
+  box-shadow: 0.5px 0.5px 2px 1px rgba(0, 0, 0, 32%);
 }
 
 .l-ad-slider__dot--focus .c-ad-slider__dot-handle {
   box-shadow: 0 0 2px 1px #3498db;
 }
 
-.l-ad-slider__dot---dragging {
+.l-ad-slider__dot--dragging {
   z-index: 5;
 }
 
-.l-ad-slider__dot---disabled {
+.l-ad-slider__dot--disabled {
   z-index: 4;
 }
 
@@ -219,7 +217,7 @@ SOFTWARE.
   padding: 2px 5px;
   min-width: 20px;
   text-align: center;
-  color: #fff;
+  color: #ffffff;
   border-radius: var(--var-border-radius, 5px);
   border: 0.1rem solid #3498db;
   background-color: #3498db;
@@ -249,8 +247,9 @@ SOFTWARE.
   transform: translate(100%, -50%);
 }
 
-.l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-top .ad-slider-tooltip::before, .l-ad-slider__wrap .ad-slider-tooltip-top .vue-merged-tooltip .ad-slider-tooltip::before {
-  content: '';
+.l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-top .ad-slider-tooltip::before,
+.l-ad-slider__wrap .ad-slider-tooltip-top .vue-merged-tooltip .ad-slider-tooltip::before {
+  content: "";
   position: absolute;
   bottom: -10px;
   left: 50%;
@@ -267,8 +266,9 @@ SOFTWARE.
   visibility: hidden;
 }
 
-.l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-bottom .ad-slider-tooltip::before, .l-ad-slider__wrap .ad-slider-tooltip-bottom .vue-merged-tooltip .ad-slider-tooltip::before {
-  content: '';
+.l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-bottom .ad-slider-tooltip::before,
+.l-ad-slider__wrap .ad-slider-tooltip-bottom .vue-merged-tooltip .ad-slider-tooltip::before {
+  content: "";
   position: absolute;
   top: -10px;
   left: 50%;
@@ -280,8 +280,9 @@ SOFTWARE.
   transform: translate(-50%, 0);
 }
 
-.l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-left .ad-slider-tooltip::before, .l-ad-slider__wrap .ad-slider-tooltip-left .vue-merged-tooltip .ad-slider-tooltip::before {
-  content: '';
+.l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-left .ad-slider-tooltip::before,
+.l-ad-slider__wrap .ad-slider-tooltip-left .vue-merged-tooltip .ad-slider-tooltip::before {
+  content: "";
   position: absolute;
   top: 50%;
   right: -10px;
@@ -293,8 +294,9 @@ SOFTWARE.
   transform: translate(0, -50%);
 }
 
-.l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-right .ad-slider-tooltip::before, .l-ad-slider__wrap .ad-slider-tooltip-right .vue-merged-tooltip .ad-slider-tooltip::before {
-  content: '';
+.l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-right .ad-slider-tooltip::before,
+.l-ad-slider__wrap .ad-slider-tooltip-right .vue-merged-tooltip .ad-slider-tooltip::before {
+  content: "";
   position: absolute;
   top: 50%;
   left: -10px;
@@ -311,7 +313,7 @@ SOFTWARE.
 }
 
 .l-ad-slider__wrap .l-ad-slider__dot.ad-slider-always .ad-slider-tooltip-wrap {
-  display: block!important;
+  display: block !important;
 }
 
 .l-ad-slider__wrap .ad-slider-piecewise {
@@ -338,37 +340,40 @@ SOFTWARE.
   width: 100%;
   height: 100%;
   display: inline-block;
-  background-color: rgba(0, 0, 0, 0.16);
+  background-color: rgba(0, 0, 0, 16%);
   border-radius: var(--var-border-radius, 50%);
   transform: translate(-50%, -50%);
   z-index: 2;
-  transition: all .3s;
+  transition: all 0.3s;
 }
 
-.l-ad-slider__wrap .ad-slider-piecewise-item:first-child .ad-slider-piecewise-dot, .l-ad-slider__wrap .ad-slider-piecewise-item:last-child .ad-slider-piecewise-dot {
+.l-ad-slider__wrap .ad-slider-piecewise-item:first-child .ad-slider-piecewise-dot,
+.l-ad-slider__wrap .ad-slider-piecewise-item:last-child .ad-slider-piecewise-dot {
   visibility: hidden;
 }
 
-.l-ad-slider--horizontal .ad-slider-piecewise-label, .l-ad-slider--horizontal-reverse .ad-slider-piecewise-label {
+.l-ad-slider--horizontal .ad-slider-piecewise-label,
+.l-ad-slider--horizontal-reverse .ad-slider-piecewise-label {
   position: absolute;
   display: inline-block;
   top: 100%;
   left: 50%;
   white-space: nowrap;
   font-size: 12px;
-  color: #333;
+  color: #333333;
   transform: translate(-50%, 8px);
   visibility: visible;
 }
 
-.l-ad-slider--vertical .ad-slider-piecewise-label, .l-ad-slider--vertical-reverse .ad-slider-piecewise-label {
+.l-ad-slider--vertical .ad-slider-piecewise-label,
+.l-ad-slider--vertical-reverse .ad-slider-piecewise-label {
   position: absolute;
   display: inline-block;
   top: 50%;
   left: 100%;
   white-space: nowrap;
   font-size: 12px;
-  color: #333;
+  color: #333333;
   transform: translate(8px, -50%);
   visibility: visible;
 }
diff --git a/public/stylesheets/automator.css b/public/stylesheets/automator.css
index bc61cb6a5..18339b889 100644
--- a/public/stylesheets/automator.css
+++ b/public/stylesheets/automator.css
@@ -29,6 +29,7 @@
   flex-direction: row;
   justify-content: space-between;
   margin-top: 1rem;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -144,6 +145,7 @@
   flex-direction: row;
   align-items: center;
   justify-content: flex-start;
+
   /* for corner buttons */
   position: relative;
 }
@@ -152,13 +154,13 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: 0.3rem 0.8rem 0.3rem 0.8rem;
+  padding: 0.3rem 0.8rem;
 }
 
 .l-automator__button--corner {
   position: absolute;
   right: 0;
-  top: 0
+  top: 0;
 }
 
 .l-automator__script-names {
@@ -172,7 +174,7 @@
 .l-automator__scripts-dropdown {
   width: 90%;
   height: 90%;
-  padding: 0.2rem 0 0.3rem 0;
+  padding: 0.2rem 0 0.3rem;
   border-width: 0.1rem;
   border-radius: 0;
   margin: 0.4rem;
@@ -253,6 +255,7 @@
   font-size: 1.4rem;
   font-family: Typewriter, serif;
   line-height: 1.6rem;
+
   /* required for expanding into pane */
   flex: 1 1 auto;
 }
@@ -297,11 +300,11 @@
   position: relative;
 }
 
-.o-automator-error-underline:before {
+.o-automator-error-underline::before {
   content: "~~~~~~~~~~~~";
-  font-size: 0.6em;
+  font-size: 0.6rem;
   font-weight: 700;
-  font-family: Times New Roman, Serif;
+  font-family: "Times New Roman", serif;
   color: red;
   width: 100%;
   position: absolute;
diff --git a/public/stylesheets/glyphs.css b/public/stylesheets/glyphs.css
index 8f73e143d..dd065dc82 100644
--- a/public/stylesheets/glyphs.css
+++ b/public/stylesheets/glyphs.css
@@ -135,7 +135,7 @@
   top: 100%;
 }
 
-.c-glyph-sacrifice-options__option__tooltip:after {
+.c-glyph-sacrifice-options__option__tooltip::after {
   position: absolute;
   top: 0;
   left: 50%;
@@ -161,12 +161,12 @@
   top: calc(100% + 0.8rem);
 }
 
-.c-glyph-sacrifice-options__option:hover .c-glyph-sacrifice-options__option__tooltip:after {
+.c-glyph-sacrifice-options__option:hover .c-glyph-sacrifice-options__option__tooltip::after {
   border-bottom-width: 0.7rem;
   margin-top: -0.9rem;
 }
 
-.s-base--metro .c-glyph-sacrifice-options__option:hover .c-glyph-sacrifice-options__option__tooltip:after {
+.s-base--metro .c-glyph-sacrifice-options__option:hover .c-glyph-sacrifice-options__option__tooltip::after {
   margin-top: -0.8rem;
 }
 
@@ -204,8 +204,7 @@
 
 .l-glyph-inventory-management {
   display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
+  flex-flow: row wrap;
   justify-content: center;
 }
 
@@ -215,56 +214,52 @@
 }
 
 .c-auto-sac-type-tab__input {
-  width: 2.5em;
-  height: 1.5em;
+  width: 2.5rem;
+  height: 1.5rem;
   font-size: 1.2rem;
-  background-color: #333;
+  background-color: #333333;
   color: var(--color-reality-light);
   border-radius: var(--var-border-radius, 0.2rem);
   border: solid 0.1rem;
   text-align: center;
-  -webkit-appearance: none;
-  -moz-appearance: textfield;
+  appearance: textfield;
 }
 
 .c-auto-sac-effect-tab__input::-webkit-inner-spin-button,
 .c-auto-sac-effect-tab__input::-webkit-outer-spin-button {
-  -webkit-appearance: none;
-  -moz-appearance: textfield;
+  appearance: textfield;
   margin: 0;
 }
 
 .c-auto-sac-effect-tab__input {
-  width: 1.5em;
-  height: 1.5em;
+  width: 1.5rem;
+  height: 1.5rem;
   font-size: 1.2rem;
   text-align: center;
-  background-color: #333;
+  background-color: #333333;
   color: var(--color-reality-light);
   border-radius: var(--var-border-radius, 0.2rem);
   border: solid 0.1rem;
-  -webkit-appearance: none;
-  -moz-appearance: textfield;
+  appearance: textfield;
   margin: 0;
 }
 
 .c-auto-sac-effect-tab__checkbox {
-  width: 1.5em;
-  height: 1.5em;
+  width: 1.5rem;
+  height: 1.5rem;
   border-radius: var(--var-border-radius, 0.2rem);
   border: solid 0.1rem;
 }
 
 .c-auto-sac-type-tab__input:focus {
   font-weight: bold;
-  background-color: #555;
+  background-color: #555555;
   box-shadow: 0 0 0.4rem 0.1rem var(--color-reality-light);
 }
 
 .c-auto-sac-type-tab__input::-webkit-outer-spin-button,
 .c-auto-sac-type-tab__input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-  -moz-appearance: textfield;
+  appearance: textfield;
   margin: 0;
 }
 
@@ -278,7 +273,7 @@
   border-radius: var(--var-border-radius, 0.2rem);
   border: solid 0.1rem;
   font-size: 1.2rem;
-  font-family: Typewriter, serif
+  font-family: Typewriter, serif;
 }
 
 .l-advanced-sac-options-for-glyph-type {
@@ -301,10 +296,10 @@
 }
 
 .c-auto-sac-type-tab__effect-desc {
-  border-radius: var(--var-border-radius, 0.5em);
+  border-radius: var(--var-border-radius, 0.5rem);
   border: 0.1rem solid;
-  padding: 0.25em 1.5em;
-  min-height: 3em;
+  padding: 0.25rem 1.5rem;
+  min-height: 3rem;
   position: relative;
 }
 
@@ -341,9 +336,9 @@
 }
 
 .l-glyph-sacrifice-options__advanced-type-select {
-  font-size: 2em;
-  width: 3em;
-  height: 3em;
+  font-size: 2rem;
+  width: 3rem;
+  height: 3rem;
   display: inline-flex;
   align-items: center;
   justify-content: center;
@@ -352,7 +347,7 @@
 }
 
 .c-glyph-sacrifice-options__advanced-type-select {
-  color: #888;
+  color: #888888;
   font-size: 2rem;
   width: 2.5rem;
   height: 2.5rem;
@@ -364,8 +359,8 @@
 }
 
 .c-glyph-sacrifice-options__advanced-type-select:hover {
-  background: #131;
-  box-shadow: 0 0 0.8rem 0.4rem #131;
+  background: #113311;
+  box-shadow: 0 0 0.8rem 0.4rem #113311;
 }
 
 .c-glyph-auto-pick-options {
@@ -385,6 +380,7 @@
   font-weight: bold;
   font-size: 1rem;
   cursor: pointer;
+  -webkit-user-select: none;
   user-select: none;
   width: 12rem;
   height: 5rem;
@@ -415,7 +411,7 @@
 .c-glyph-tooltip__effect {
   font-weight: normal;
   text-shadow: none;
-  margin-bottom: 1em;
+  margin-bottom: 1rem;
 }
 
 .l-glyph-tooltip {
@@ -445,7 +441,7 @@
 
 .c-glyph-tooltip {
   background-color: black;
-  color: #fff;
+  color: #ffffff;
   font-size: 1.2rem;
   font-weight: normal;
   text-align: center;
@@ -492,7 +488,7 @@
   color: #d4d4ff;
   border: 0.1rem solid #d4d4ff;
   border-radius: var(--var-border-radius, 0.5rem);
-  padding: 0.25em 1em;
+  padding: 0.25rem 1rem;
 }
 
 .l-modal-glyph-selection__row {
@@ -505,7 +501,7 @@
 }
 
 .l-modal-glyph-selection__glyph--selected {
-  box-shadow: #B4B420 0 0 1rem 0.5rem !important;
+  box-shadow: #b4b420 0 0 1rem 0.5rem !important;
 }
 
 .l-equipped-glyphs {
@@ -521,7 +517,7 @@
   width: 18rem;
   height: 18rem;
   position: relative;
-  background-color: rgba(0, 0, 0, 0);
+  background-color: rgba(0, 0, 0, 0%);
 }
 
 .l-equipped-glyphs__dropzone {
@@ -532,7 +528,7 @@
   left: 50%;
   top: 50%;
   transform: translate(-50%, -50%);
-  background-color: rgba(0, 0, 0, 0);
+  background-color: rgba(0, 0, 0, 0%);
 }
 
 .l-equipped-glyphs__empty {
@@ -546,11 +542,11 @@
 }
 
 .t-dark-metro .c-equipped-glyphs__empty {
-  background-color: #333;
+  background-color: #333333;
 }
 
 .t-dark .c-equipped-glyphs__empty {
-  background-color: #333;
+  background-color: #333333;
 }
 
 .t-s6 .c-equipped-glyphs__empty,
@@ -559,7 +555,7 @@
 }
 
 .c-equipped-glyphs__empty--dragover {
-  box-shadow: 0 0 0.5rem 0.25rem #444;
+  box-shadow: 0 0 0.5rem 0.25rem #444444;
 }
 
 .l-equipped-glyphs__buttons {
@@ -609,7 +605,7 @@
 
 .c-glyph-sets-save-name__input {
   width: 16rem;
-  height: 1.5em;
+  height: 1.5rem;
   font-size: 1.35rem;
   background-color: black;
   color: var(--color-reality-light);
@@ -618,8 +614,7 @@
   border-bottom: 0.1rem solid;
   text-align: center;
   margin-bottom: 0.5rem;
-  -webkit-appearance: none;
-  -moz-appearance: textfield;
+  appearance: textfield;
 }
 
 .c-glyph-set-save-setting-button {
@@ -693,7 +688,7 @@
 }
 
 .l-current-glyph-effects__capped-header {
-  margin-bottom: 1em;
+  margin-bottom: 1rem;
 }
 
 .l-current-glyph-effects {
@@ -726,7 +721,7 @@
   overflow: auto;
   color: var(--color-reality-light);
   background: black;
-  border:var(--var-border-width, 0.2rem) solid var(--color-reality);
+  border: var(--var-border-width, 0.2rem) solid var(--color-reality);
   border-radius: var(--var-border-radius, 0.5rem);
   border-top-left-radius: 0;
   border-top-right-radius: 0;
@@ -848,8 +843,7 @@
 
 .c-glyph-choice-container {
   display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
+  flex-flow: row wrap;
   width: 74rem;
 }
 
@@ -869,22 +863,22 @@
   flex-direction: column;
   justify-content: space-evenly;
   align-items: center;
-  background-color: rgba(0, 0, 0, 0.1);
-  border: var(--var-border-width, 0.2rem) solid rgba(0, 0, 0, 0.15);
+  background-color: rgba(0, 0, 0, 10%);
+  border: var(--var-border-width, 0.2rem) solid rgba(0, 0, 0, 15%);
   border-radius: var(--var-border-radius, 0.5rem);
   font-size: 1.2rem;
   height: 10rem;
   width: 10rem;
   text-shadow: 0.1rem 0.1rem 0.1rem black, 0.1rem 0.1rem 0 black;
-  box-shadow: 0.3rem 0.3rem 0.3rem rgba(0, 0, 0, 0.5);
+  box-shadow: 0.3rem 0.3rem 0.3rem rgba(0, 0, 0, 50%);
 }
 
 .c-glyph-choice-effect-list {
   display: flex;
   flex-direction: column;
   justify-content: space-evenly;
-  background-color: rgba(0, 0, 0, 0.1);
-  border: var(--var-border-width, 0.2rem) solid rgba(0, 0, 0, 0.15);
+  background-color: rgba(0, 0, 0, 10%);
+  border: var(--var-border-width, 0.2rem) solid rgba(0, 0, 0, 15%);
   border-radius: var(--var-border-radius, 0.5rem);
   height: 11rem;
   width: 25rem;
@@ -945,6 +939,7 @@
 
 .c-sacrificed-glyphs__confirm {
   cursor: pointer;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -981,7 +976,7 @@
 }
 
 .s-base--dark .c-glyph-inventory__slot {
-  background-color: #333;
+  background-color: #333333;
 }
 
 .c-glyph-inventory-option {
@@ -1031,7 +1026,7 @@
   bottom: 100%;
 }
 
-.c-glyph-inventory-option__tooltip:after {
+.c-glyph-inventory-option__tooltip::after {
   position: absolute;
   bottom: 0;
   left: 50%;
@@ -1060,12 +1055,12 @@
   color: var(--color-reality-light);
 }
 
-.c-glyph-inventory-option:hover .c-glyph-inventory-option__tooltip:after {
+.c-glyph-inventory-option:hover .c-glyph-inventory-option__tooltip::after {
   border-top-width: 0.7rem;
   margin-bottom: -0.9rem;
 }
 
-.s-base--metro .c-glyph-inventory-option:hover .c-glyph-inventory-option__tooltip:after {
+.s-base--metro .c-glyph-inventory-option:hover .c-glyph-inventory-option__tooltip::after {
   margin-bottom: -0.8rem;
 }
 
@@ -1159,9 +1154,9 @@
 }
 
 @keyframes a-glyph-side-box-button-glow {
-  0% { box-shadow: inset 0 0 2rem var(--color-ra-pet--effarig) }
-  50% { box-shadow: inset 0 0 0 }
-  100% { box-shadow: inset 0 0 2rem var(--color-ra-pet--effarig) }
+  0% { box-shadow: inset 0 0 2rem var(--color-ra-pet--effarig); }
+  50% { box-shadow: inset 0 0 0; }
+  100% { box-shadow: inset 0 0 2rem var(--color-ra-pet--effarig); }
 }
 
 .o-glyph-color-checkbox {
@@ -1177,6 +1172,7 @@
   color: black;
   font-weight: bold;
   cursor: pointer;
+  -webkit-user-select: none;
   user-select: none;
   transition-duration: 0.2s;
 }
@@ -1185,7 +1181,6 @@
   border-color: black;
 }
 
-
 .o-glyph-color-checkbox:hover {
   transform: scale(1.1) translate(0.1rem, -0.1rem);
 }
@@ -1207,22 +1202,27 @@
     background-color: #b67f33;
     box-shadow: #b67f33 0 0 1rem 0.2rem;
   }
+
   20% {
     background-color: #64dd17;
     box-shadow: #64dd17 0 0 1rem 0.2rem;
   }
+
   40% {
     background-color: #22aa48;
     box-shadow: #22aa48 0 0 1rem 0.2rem;
   }
+
   60% {
     background-color: #03a9f4;
     box-shadow: #03a9f4 0 0 1rem 0.2rem;
   }
+
   80% {
     background-color: #b241e3;
     box-shadow: #b241e3 0 0 1rem 0.2rem;
   }
+
   100% {
     background-color: #b67f33;
     box-shadow: #b67f33 0 0 1rem 0.2rem;
@@ -1233,18 +1233,23 @@
   0% {
     box-shadow: #b67f33 0 0 1rem calc(0.3rem) inset;
   }
+
   20% {
     box-shadow: #64dd17 0 0 1rem calc(0.3rem) inset;
   }
+
   40% {
     box-shadow: #22aa48 0 0 1rem calc(0.3rem) inset;
   }
+
   60% {
     box-shadow: #03a9f4 0 0 1rem calc(0.3rem) inset;
   }
+
   80% {
     box-shadow: #b241e3 0 0 1rem calc(0.3rem) inset;
   }
+
   100% {
     box-shadow: #b67f33 0 0 1rem calc(0.3rem) inset;
   }
@@ -1253,87 +1258,126 @@
 @keyframes a-reality-glyph-icon-cycle {
   0% {
     color: #b67f33;
-    text-shadow: #b67f33 -0.04em 0.04em 0.08em;
+    text-shadow: #b67f33 -0.04rem 0.04rem 0.08rem;
   }
+
   20% {
     color: #64dd17;
-    text-shadow: #64dd17 -0.04em 0.04em 0.08em;
+    text-shadow: #64dd17 -0.04rem 0.04rem 0.08rem;
   }
+
   40% {
     color: #22aa48;
-    text-shadow: #22aa48 -0.04em 0.04em 0.08em;
+    text-shadow: #22aa48 -0.04rem 0.04rem 0.08rem;
   }
+
   60% {
     color: #03a9f4;
-    text-shadow: #03a9f4 -0.04em 0.04em 0.08em;
+    text-shadow: #03a9f4 -0.04rem 0.04rem 0.08rem;
   }
+
   80% {
     color: #b241e3;
-    text-shadow: #b241e3 -0.04em 0.04em 0.08em;
+    text-shadow: #b241e3 -0.04rem 0.04rem 0.08rem;
   }
+
   100% {
     color: #b67f33;
-    text-shadow: #b67f33 -0.04em 0.04em 0.08em;
+    text-shadow: #b67f33 -0.04rem 0.04rem 0.08rem;
   }
 }
 
 @keyframes a-reality-glyph-name-cycle {
   0% {
     color: #b67f33;
-    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #b67f33 0 0 3px
+    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #b67f33 0 0 3px;
   }
+
   20% {
     color: #64dd17;
-    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #64dd17 0 0 3px
+    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #64dd17 0 0 3px;
   }
+
   40% {
     color: #22aa48;
-    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #22aa48 0 0 3px
+    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #22aa48 0 0 3px;
   }
+
   60% {
     color: #03a9f4;
-    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #03a9f4 0 0 3px
+    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #03a9f4 0 0 3px;
   }
+
   80% {
     color: #b241e3;
-    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #b241e3 0 0 3px
+    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #b241e3 0 0 3px;
   }
+
   100% {
     color: #b67f33;
-    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #b67f33 0 0 3px
+    text-shadow: black -1px 1px 1px, black 1px 1px 1px, black -1px -1px 1px, black 1px -1px 1px, #b67f33 0 0 3px;
   }
 }
 
 @keyframes a-reality-glyph-description-cycle {
   0% {
     color: #b67f33;
-    text-shadow: var(--color-text-base) -1px 1px 1px, var(--color-text-base)
-    1px 1px 1px, var(--color-text-base) -1px -1px 1px, var(--color-text-base) 1px -1px 1px, #b67f33 0 0 3px
+    text-shadow:
+      var(--color-text-base) -1px 1px 1px,
+      var(--color-text-base) 1px 1px 1px,
+      var(--color-text-base) -1px -1px 1px,
+      var(--color-text-base) 1px -1px 1px,
+      #b67f33 0 0 3px;
   }
+
   20% {
     color: #64dd17;
-    text-shadow: var(--color-text-base) -1px 1px 1px, var(--color-text-base)
-    1px 1px 1px, var(--color-text-base) -1px -1px 1px, var(--color-text-base) 1px -1px 1px, #64dd17 0 0 3px
+    text-shadow:
+      var(--color-text-base) -1px 1px 1px,
+      var(--color-text-base) 1px 1px 1px,
+      var(--color-text-base) -1px -1px 1px,
+      var(--color-text-base) 1px -1px 1px,
+      #64dd17 0 0 3px;
   }
+
   40% {
     color: #22aa48;
-    text-shadow: var(--color-text-base) -1px 1px 1px, var(--color-text-base)
-    1px 1px 1px, var(--color-text-base) -1px -1px 1px, var(--color-text-base) 1px -1px 1px, #22aa48 0 0 3px
+    text-shadow:
+      var(--color-text-base) -1px 1px 1px,
+      var(--color-text-base) 1px 1px 1px,
+      var(--color-text-base) -1px -1px 1px,
+      var(--color-text-base) 1px -1px 1px,
+      #22aa48 0 0 3px;
   }
+
   60% {
     color: #03a9f4;
-    text-shadow: var(--color-text-base) -1px 1px 1px, var(--color-text-base)
-    1px 1px 1px, var(--color-text-base) -1px -1px 1px, var(--color-text-base) 1px -1px 1px, #03a9f4 0 0 3px
+    text-shadow:
+      var(--color-text-base) -1px 1px 1px,
+      var(--color-text-base) 1px 1px 1px,
+      var(--color-text-base) -1px -1px 1px,
+      var(--color-text-base) 1px -1px 1px,
+      #03a9f4 0 0 3px;
   }
+
   80% {
     color: #b241e3;
-    text-shadow: var(--color-text-base) -1px 1px 1px, var(--color-text-base)
-    1px 1px 1px, var(--color-text-base) -1px -1px 1px, var(--color-text-base) 1px -1px 1px, #b241e3 0 0 3px
+    text-shadow:
+      var(--color-text-base) -1px 1px 1px,
+      var(--color-text-base) 1px 1px 1px,
+      var(--color-text-base) -1px -1px 1px,
+      var(--color-text-base) 1px -1px 1px,
+      #b241e3 0 0 3px;
   }
+
   100% {
     color: #b67f33;
-    text-shadow: var(--color-text-base) -1px 1px 1px, var(--color-text-base)
-    1px 1px 1px, var(--color-text-base) -1px -1px 1px, var(--color-text-base) 1px -1px 1px, #b67f33 0 0 3px
+    text-shadow:
+      var(--color-text-base) -1px 1px 1px,
+      var(--color-text-base) 1px 1px 1px,
+      var(--color-text-base) -1px -1px 1px,
+      var(--color-text-base) 1px -1px 1px,
+      #b67f33 0 0 3px;
   }
 }
 
@@ -1341,18 +1385,23 @@
   0% {
     background: #b67f33;
   }
+
   20% {
     background: #64dd17;
   }
+
   40% {
     background: #22aa48;
   }
+
   60% {
     background: #03a9f4;
   }
+
   80% {
     background: #b241e3;
   }
+
   100% {
     background: #b67f33;
   }
@@ -1361,53 +1410,63 @@
 @keyframes a-reality-glyph-tooltip-cycle {
   0% {
     border-color: #b67f33;
-    box-shadow: 0 0 0.5rem #b67f33, 0 0 0.5rem #b67f33 inset
+    box-shadow: 0 0 0.5rem #b67f33, 0 0 0.5rem #b67f33 inset;
   }
+
   20% {
     border-color: #64dd17;
-    box-shadow: 0 0 0.5rem #64dd17, 0 0 0.5rem #64dd17 inset
+    box-shadow: 0 0 0.5rem #64dd17, 0 0 0.5rem #64dd17 inset;
   }
+
   40% {
     border-color: #22aa48;
-    box-shadow: 0 0 0.5rem #22aa48, 0 0 0.5rem #22aa48 inset
+    box-shadow: 0 0 0.5rem #22aa48, 0 0 0.5rem #22aa48 inset;
   }
+
   60% {
     border-color: #03a9f4;
-    box-shadow: 0 0 0.5rem #03a9f4, 0 0 0.5rem #03a9f4 inset
+    box-shadow: 0 0 0.5rem #03a9f4, 0 0 0.5rem #03a9f4 inset;
   }
+
   80% {
     border-color: #b241e3;
-    box-shadow: 0 0 0.5rem #b241e3, 0 0 0.5rem #b241e3 inset
+    box-shadow: 0 0 0.5rem #b241e3, 0 0 0.5rem #b241e3 inset;
   }
+
   100% {
     border-color: #b67f33;
-    box-shadow: 0 0 0.5rem #b67f33, 0 0 0.5rem #b67f33 inset
+    box-shadow: 0 0 0.5rem #b67f33, 0 0 0.5rem #b67f33 inset;
   }
 }
 
 @keyframes a-reality-glyph-tooltip-header-cycle {
   0% {
     border-color: #b67f33;
-    box-shadow: 0 0 0.5rem 0.1rem #b67f33, 0 0 0.8rem #b67f33 inset
+    box-shadow: 0 0 0.5rem 0.1rem #b67f33, 0 0 0.8rem #b67f33 inset;
   }
+
   20% {
     border-color: #64dd17;
-    box-shadow: 0 0 0.5rem 0.1rem #64dd17, 0 0 0.8rem #64dd17 inset
+    box-shadow: 0 0 0.5rem 0.1rem #64dd17, 0 0 0.8rem #64dd17 inset;
   }
+
   40% {
     border-color: #22aa48;
-    box-shadow: 0 0 0.5rem 0.1rem #22aa48, 0 0 0.8rem #22aa48 inset
+    box-shadow: 0 0 0.5rem 0.1rem #22aa48, 0 0 0.8rem #22aa48 inset;
   }
+
   60% {
     border-color: #03a9f4;
-    box-shadow: 0 0 0.5rem 0.1rem #03a9f4, 0 0 0.8rem #03a9f4 inset
+    box-shadow: 0 0 0.5rem 0.1rem #03a9f4, 0 0 0.8rem #03a9f4 inset;
   }
+
   80% {
     border-color: #b241e3;
-    box-shadow: 0 0 0.5rem 0.1rem #b241e3, 0 0 0.8rem #b241e3 inset
+    box-shadow: 0 0 0.5rem 0.1rem #b241e3, 0 0 0.8rem #b241e3 inset;
   }
+
   100% {
     border-color: #b67f33;
-    box-shadow: 0 0 0.5rem 0.1rem #b67f33, 0 0 0.8rem #b67f33 inset
+    box-shadow: 0 0 0.5rem 0.1rem #b67f33, 0 0 0.8rem #b67f33 inset;
   }
 }
diff --git a/public/stylesheets/new-ui-styles.css b/public/stylesheets/new-ui-styles.css
index b4173f0b4..ab113963b 100644
--- a/public/stylesheets/new-ui-styles.css
+++ b/public/stylesheets/new-ui-styles.css
@@ -1,6 +1,6 @@
 @font-face {
   font-family: Typewriter;
-  src: url('MonospaceTypewriter.ttf');
+  src: url("MonospaceTypewriter.ttf");
 }
 
 *:focus {
@@ -74,13 +74,13 @@ body.t-s9 {
 
 .resource h2 {
   margin: 0;
-  font-size: 1.7em;
+  font-size: 1.7rem;
   z-index: 1;
 }
 
 .t-dark .resource h2,
 .t-dark-metro .resource h2 {
-  text-shadow: 0 0 0.1rem rgba(0, 0, 0, 0.5), -0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 0.8);
+  text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 80%);
 }
 
 .resource-information {
@@ -89,16 +89,16 @@ body.t-s9 {
   align-items: flex-start;
   color: var(--color-text);
   justify-content: space-between;
-  font-size: 1.5em;
+  font-size: 1.5rem;
 }
 
 .resource-gain {
-  font-size: 0.7em;
+  font-size: 0.7rem;
   color: var(--color-text);
 }
 
 .resource-name {
-  font-size: 0.8em;
+  font-size: 0.8rem;
 }
 
 .o-sidebar-currency--antimatter {
@@ -123,25 +123,25 @@ body.t-s9 {
   color: #e0e0e0;
 }
 
-.o-sidebar-currency--infinity  {
-  color: var(--color-infinity)
+.o-sidebar-currency--infinity {
+  color: var(--color-infinity);
 }
 
-.o-sidebar-currency--eternity  {
-  color: var(--color-eternity)
+.o-sidebar-currency--eternity {
+  color: var(--color-eternity);
 }
 
 .o-sidebar-currency--reality {
-  color: var(--color-reality)
+  color: var(--color-reality);
 }
 
 .t-dark .o-sidebar-currency--reality,
 .t-dark-metro .o-sidebar-currency--reality {
-  color: var(--color-reality)
+  color: var(--color-reality);
 }
 
 .o-sidebar-currency--pelle {
-  color: var(--color-pelle--base)
+  color: var(--color-pelle--base);
 }
 
 .resource-infinity-canreset,
@@ -153,7 +153,7 @@ body.t-s9 {
 
 .resource-infinity-canreset:hover,
 .resource-eternity-canreset:hover {
-  background-color: rgb(49, 49, 49)
+  background-color: rgb(49, 49, 49);
 }
 
 .t-normal .c-modal {
@@ -166,7 +166,7 @@ body.t-s9 {
   border-width: 0.1rem;
   border-radius: 0;
   margin-top: -0.1rem;
-  font-size: 1.3em;
+  font-size: 1.3rem;
   position: relative;
   transition-duration: 0.15s;
   transition-delay: 0.2s;
@@ -197,7 +197,7 @@ body.t-s9 {
 }
 
 .o-tab-btn::after {
-  content: '';
+  content: "";
   position: absolute;
   left: calc(100% + 0.1rem);
   top: calc(0% + -0.1rem);
@@ -291,12 +291,13 @@ body.t-s9 {
   line-height: 4.5rem;
   cursor: pointer;
   transition-duration: 0.15s;
+  -webkit-user-select: none;
   user-select: none;
 }
 
 .o-tab-btn--subtab .o-tab-btn--cel3 {
   font-weight: normal;
-  transform: rotate(45deg)
+  transform: rotate(45deg);
 }
 
 .o-subtab__tooltip {
@@ -317,7 +318,7 @@ body.t-s9 {
   bottom: 100%;
 }
 
-.o-subtab__tooltip:after {
+.o-subtab__tooltip::after {
   position: absolute;
   bottom: 0;
   left: 50%;
@@ -334,10 +335,10 @@ body.t-s9 {
 
 .o-tab-btn--subtab:hover .o-subtab__tooltip {
   opacity: 1;
-  bottom: calc(100% + 0.7rem)
+  bottom: calc(100% + 0.7rem);
 }
 
-.o-tab-btn--subtab:hover .o-subtab__tooltip:after {
+.o-tab-btn--subtab:hover .o-subtab__tooltip::after {
   border-top-width: 0.7rem;
   margin-bottom: -0.7rem;
 }
@@ -348,7 +349,7 @@ body.t-s9 {
   border-color: var(--color-infinity);
 }
 
-.o-tab-btn--infinity .o-subtab__tooltip:after {
+.o-tab-btn--infinity .o-subtab__tooltip::after {
   border-top-color: var(--color-infinity);
 }
 
@@ -358,7 +359,7 @@ body.t-s9 {
   border-color: var(--color-eternity);
 }
 
-.o-tab-btn--eternity .o-subtab__tooltip:after {
+.o-tab-btn--eternity .o-subtab__tooltip::after {
   border-top-color: var(--color-eternity);
 }
 
@@ -368,7 +369,7 @@ body.t-s9 {
   border-color: var(--color-reality);
 }
 
-.o-tab-btn--reality .o-subtab__tooltip:after {
+.o-tab-btn--reality .o-subtab__tooltip::after {
   border-top-color: var(--color-reality);
 }
 
@@ -378,7 +379,7 @@ body.t-s9 {
   border-color: var(--color-celestials);
 }
 
-.o-tab-btn--celestial .o-subtab__tooltip:after {
+.o-tab-btn--celestial .o-subtab__tooltip::after {
   border-top-color: var(--color-celestials);
 }
 
@@ -503,14 +504,14 @@ body.t-s9 {
 }
 
 .tickspeed-labels span {
-  color: var(--color-text);;
+  color: var(--color-text);
   height: 3rem;
   padding: 0.5rem 1rem;
 }
 
 .particle {
   position: absolute;
-  color: var(--color-text);;
+  color: var(--color-text);
   height: 1rem;
   width: 1rem;
   background-image: url("../icon.png");
@@ -552,11 +553,10 @@ body.t-s9 {
 }
 
 .t-normal .c-game-header__tesseract-available {
-  background: #EEEEEE;
+  background: #eeeeee;
   animation: a-tesseract-shift-dark 5s infinite;
 }
 
-
 .l-new-ui-big-crunch__container {
   margin-top: 2rem;
 }
@@ -566,7 +566,7 @@ body.t-s9 {
   margin-top: 1rem;
   margin-bottom: 0.5rem;
   font-weight: bold;
-  font-size: 1.1em;
+  font-size: 1.1rem;
   border-bottom: 0.1rem solid var(--color-good);
   padding-bottom: 0.6rem;
 }
@@ -582,7 +582,7 @@ body.t-s9 {
   background: var(--color-base);
 }
 
-.t-normal .o-achievement__tooltip:after {
+.t-normal .o-achievement__tooltip::after {
   border-top-color: var(--color-accent);
 }
 
@@ -598,7 +598,10 @@ body.t-s9 {
   color: var(--color-text-inverted);
 }
 
-.o-primary-btn--option, .o-primary-btn--option-wide, .c-select-theme__item, .c-select-notation__item {
+.o-primary-btn--option,
+.o-primary-btn--option-wide,
+.c-select-theme__item,
+.c-select-notation__item {
   background: var(--color-base);
   color: var(--color-text);
   border: 0.1rem solid var(--color-good);
@@ -650,7 +653,7 @@ body.t-s9 {
 .t-metro .o-autobuyer-input,
 .t-metro .c-autobuyer-box__mode-select {
   color: black;
-  border: 0.1rem solid #A9A9A9;
+  border: 0.1rem solid #a9a9a9;
   background: white;
 }
 
@@ -659,7 +662,7 @@ body.t-s9 {
 .t-dark .c-autobuyer-box__mode-select,
 .t-dark-metro .c-autobuyer-box__mode-select {
   color: black;
-  background-color: #455A64;
+  background-color: #455a64;
   border: 0.1rem solid black;
 }
 
@@ -675,7 +678,7 @@ body.t-s9 {
 .t-s10 .c-autobuyer-box__mode-select {
   color: white;
   background-color: black;
-  border: 0.1rem solid #888;
+  border: 0.1rem solid #888888;
 }
 
 .o-autobuyer-btn {
@@ -697,17 +700,17 @@ body.t-s9 {
 }
 
 .c-antimatter-dim-row:nth-child(even) {
-  background-color: rgba(223, 80, 80, 0.3);
+  background-color: rgba(223, 80, 80, 30%);
 }
 
 .t-metro .c-antimatter-dim-row:nth-child(even),
 .t-inverted-metro .c-antimatter-dim-row:nth-child(even),
 .t-s8 .c-antimatter-dim-row:nth-child(even) {
-  background-color: rgba(33, 150, 243, 0.3);
+  background-color: rgba(33, 150, 243, 30%);
 }
 
 .c-antimatter-dim-row__multiplier {
-  font-size: 1.4rem
+  font-size: 1.4rem;
 }
 
 .c-infinity-dim-description__accent {
@@ -715,15 +718,15 @@ body.t-s9 {
 }
 
 .c-infinity-dim-row:nth-child(even) {
-  background: rgba(182, 127, 51, 0.3);
+  background: rgba(182, 127, 51, 30%);
 }
 
 .s-base--metro .c-infinity-dim-row:nth-child(even) {
-  background: rgba(255, 152, 0, 0.3);
+  background: rgba(255, 152, 0, 30%);
 }
 
 .c-infinity-dim-row__multiplier {
-  font-size: 1.4rem
+  font-size: 1.4rem;
 }
 
 .o-primary-btn--buy-id-max,
@@ -736,15 +739,15 @@ body.t-s9 {
 }
 
 .c-time-dim-row:nth-child(even) {
-  background: rgba(179, 65, 224, 0.3);
+  background: rgba(179, 65, 224, 30%);
 }
 
 .s-base--metro .c-time-dim-row:nth-child(even) {
-  background: rgba(103, 58, 183, 0.3);
+  background: rgba(103, 58, 183, 30%);
 }
 
 .c-time-dim-row__multiplier {
-  font-size: 1.4rem
+  font-size: 1.4rem;
 }
 
 .o-primary-btn--buy-td-max,
@@ -752,7 +755,7 @@ body.t-s9 {
   height: 4.4rem;
 }
 
- .l-reality-upgrade-btn {
+.l-reality-upgrade-btn {
   width: 18rem;
   margin: 0.6rem 0.4rem;
 }
@@ -789,6 +792,7 @@ body.t-s9 {
   top: 15%;
   left: 72%;
 }
+
 .l-game-header__eternity-btn {
   top: 15%;
   right: 72%;
@@ -809,7 +813,6 @@ body.t-s9 {
   top: 8.5rem;
 }
 
-
 .l-reset-buttons-container__reality-button {
   margin-top: 1.7rem;
   margin-bottom: 0;
@@ -878,13 +881,13 @@ body.t-s9 {
 }
 
 .t-normal .c-glyph-choice-icon {
-  background-color: rgba(0, 0, 0, 0.3);
-  border: var(--var-border-width, 0.2rem) solid rgba(0, 0, 0, 0.4);
+  background-color: rgba(0, 0, 0, 30%);
+  border: var(--var-border-width, 0.2rem) solid rgba(0, 0, 0, 40%);
 }
 
 .t-normal .c-glyph-choice-effect-list {
-  background-color: rgba(0, 0, 0, 0.3);
-  border: var(--var-border-width, 0.2rem) solid rgba(0, 0, 0, 0.4);
+  background-color: rgba(0, 0, 0, 30%);
+  border: var(--var-border-width, 0.2rem) solid rgba(0, 0, 0, 40%);
 }
 
 .l-help-me {
diff --git a/public/stylesheets/old-ui.css b/public/stylesheets/old-ui.css
index c0b886055..6a3ab32f5 100644
--- a/public/stylesheets/old-ui.css
+++ b/public/stylesheets/old-ui.css
@@ -61,7 +61,7 @@
 }
 
 .s-base--metro .o-tab-btn {
-  box-shadow: 0.1rem 0.1rem 0.1rem 0 #9E9E9E;
+  box-shadow: 0.1rem 0.1rem 0.1rem 0 #9e9e9e;
 }
 
 .t-dark-metro .o-tab-btn {
@@ -69,7 +69,7 @@
 }
 
 .t-s4 .o-tab-btn {
-  cursor: url(cursor2.cur), auto;
+  cursor: url("cursor2.cur"), auto;
 }
 
 .t-s8 .o-tab-btn {
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index 443824b37..bf3486c49 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -26,7 +26,7 @@ html {
   background: white;
 }
 
-* { /* csslint allow: universal-selector */
+* {
   box-sizing: border-box;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -43,17 +43,17 @@ html {
 :root {
   --color-text: black;
   --color-text-inverted: white;
-  --color-base: #F2F2F2;
-  --color-disabled: #A3A3A3;
-  --color-accent: #4980CC;
-  --color-good: #5AC467;
-  --color-good-dark: #127A20;
+  --color-base: #f2f2f2;
+  --color-disabled: #a3a3a3;
+  --color-accent: #4980cc;
+  --color-good: #5ac467;
+  --color-good-dark: #127a20;
   --color-good-paused: #e3e638;
-  --color-bad: #B84B5F;
-  --color-gh-purple: #8957E5;
+  --color-bad: #b84b5f;
+  --color-gh-purple: #8957e5;
 
   --color-antimatter: #2196f3;
-  --color-infinity: #B67F33;
+  --color-infinity: #b67f33;
   --color-eternity: #b341e0;
   --color-dilation: #64dd17;
   --color-reality: #0ba00e;
@@ -83,32 +83,32 @@ html {
   --color-pelle--secondary: #00bcd4;
 }
 
-:root .t-metro, /* csslint allow: empty-rules */
+:root .t-metro,
 :root .t-inverted-metro,
 :root .t-s8 {
   --color-text: black;
   --color-text-inverted: white;
   --color-base: #eeeeee;
   --color-disabled: #9e9e9e;
-  --color-accent: #2196F3;
+  --color-accent: #2196f3;
   --color-good: #66bb6a;
   --color-good-dark: #388e3c;
   --color-bad: #ef5350;
 
-  --color-infinity: #FF9800;
-  --color-eternity: #673AB7;
+  --color-infinity: #ff9800;
+  --color-eternity: #673ab7;
   --color-reality: #4caf50;
   --color-celestials: #00bcd4;
 }
 
-:root .t-dark { /* csslint allow: empty-rules */
+:root .t-dark {
   --color-text: #e0e0e0;
   --color-text-inverted: black;
   --color-base: #455a64;
   --color-disabled: #37474f;
-  --color-accent: #1565C0;
+  --color-accent: #1565c0;
 
-  --color-infinity: #FF9800;
+  --color-infinity: #ff9800;
   --color-prestige--accent: black;
 
   --color-teresa--accent: black;
@@ -117,18 +117,18 @@ html {
   --color-laitela--accent: white;
 }
 
-:root .t-dark-metro { /* csslint allow: empty-rules */
+:root .t-dark-metro {
   --color-text: #e0e0e0;
   --color-text-inverted: black;
   --color-base: #455a64;
   --color-disabled: #37474f;
-  --color-accent: #2196F3;
+  --color-accent: #2196f3;
   --color-good: #43a047;
   --color-good-dark: #2e7d32;
   --color-bad: #e53935;
 
-  --color-infinity: #FF9800;
-  --color-eternity: #673AB7;
+  --color-infinity: #ff9800;
+  --color-eternity: #673ab7;
   --color-reality: #4caf50;
   --color-celestials: #00bcd4;
   --color-prestige--accent: black;
@@ -139,7 +139,7 @@ html {
   --color-laitela--accent: white;
 }
 
-:root .t-s1 { /* csslint allow: empty-rules */
+:root .t-s1 {
   --color-text: black;
   --color-text-inverted: #dbd242;
   --color-base: #dbd242;
@@ -151,15 +151,15 @@ html {
 
   --color-infinity: #7d3c1b;
   --color-eternity: #639565;
-  --color-reality: #AFA3A5;
+  --color-reality: #afa3a5;
   --color-reality-light: #e8e3e4;
-  --color-celestials: #F2D6C1;
+  --color-celestials: #f2d6c1;
   --color-prestige--accent: black;
 
   --color-pelle--base: #7cb727;
 }
 
-:root .t-s4 { /* csslint allow: empty-rules */
+:root .t-s4 {
   --color-text: black;
   --color-text-inverted: white;
   --color-base: #1b00ff;
@@ -168,12 +168,12 @@ html {
   --color-bad: #ff0000;
 }
 
-:root .t-s6, /* csslint allow: empty-rules */
+:root .t-s6,
 :root .t-s10 {
-  --color-text: #E0E0E0;
+  --color-text: #e0e0e0;
   --color-text-inverted: black;
   --color-base: black;
-  --color-accent: #1565C0;
+  --color-accent: #1565c0;
 
   --color-prestige--accent: black;
 
@@ -183,8 +183,8 @@ html {
   --color-laitela--accent: white;
 }
 
-:root .t-s11 { /* csslint allow: empty-rules */
-  --color-text: #E0E0E0;
+:root .t-s11 {
+  --color-text: #e0e0e0;
   --color-text-inverted: black;
   --color-base: black;
   --color-accent: #fbc21b;
@@ -197,8 +197,7 @@ html {
   --color-laitela--accent: white;
 }
 
-
-:root .s-base--metro { /* csslint allow: empty-rules */
+:root .s-base--metro {
   --var-border-width: 0.1rem;
   --var-border-radius: 0;
 }
@@ -210,13 +209,13 @@ body {
   width: 100%;
   margin: 0;
   padding: 0;
-  color:#4F5957;
+  color: #4f5957;
   font-size: 1.1rem;
   font-family: Typewriter, serif;
   line-height: 1.5;
   font-weight: 300;
-  text-align:center;
-  background-color: #fff;
+  text-align: center;
+  background-color: #ffffff;
   overflow: hidden;
 }
 
@@ -229,42 +228,59 @@ body {
 }
 
 @font-face {
-  font-family: 'Open Sans Condensed';
+  font-family: "Open Sans Condensed";
   font-style: normal;
   font-weight: 300;
-  src: local('Open Sans Cond Light'), local('OpenSans-CondensedLight'), url(https://fonts.gstatic.com/s/opensanscondensed/v10/gk5FxslNkTTHtojXrkp-xBEur64QvLD-0IbiAdTUNXE.woff2) format('woff2');
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000;
+  src:
+    local("Open Sans Cond Light"),
+    local("OpenSans-CondensedLight"),
+    url("https://fonts.gstatic.com/s/opensanscondensed/v10/gk5FxslNkTTHtojXrkp-xBEur64QvLD-0IbiAdTUNXE.woff2") format("woff2");
+  unicode-range:
+    U+0000-00FF,
+    U+0131,
+    U+0152-0153,
+    U+02C6,
+    U+02DA,
+    U+02DC,
+    U+2000-206F,
+    U+2074,
+    U+20AC,
+    U+2212,
+    U+2215,
+    U+E0FF,
+    U+EFFD,
+    U+F000;
 }
 
 @font-face {
   font-family: Typewriter;
-  src: url('MonospaceTypewriter.ttf');
+  src: url("MonospaceTypewriter.ttf");
 }
 
 @font-face {
-	font-family: Noto Sans;
-	src: url('MonospaceTypewriter.ttf');
-	unicode-range: U+F420-F430, U+2BC5-2BC6;
+  font-family: "Noto Sans";
+  src: url("MonospaceTypewriter.ttf");
+  unicode-range: U+F420-F430, U+2BC5-2BC6;
 }
 
 @font-face {
   font-family: Runescape;
-  src: url('Runescape.ttf');
+  src: url("Runescape.ttf");
 }
 
 @font-face {
   font-family: Barrio;
-  src: url('Barrio-Regular.ttf');
+  src: url("Barrio-Regular.ttf");
 }
 
 @font-face {
-  font-family: Font Awesome;
-  src: url('fa-solid-900.ttf');
+  font-family: "Font Awesome";
+  src: url("fa-solid-900.ttf");
 }
 
 @font-face {
   font-family: Typewriter;
-  src: url('BlobEmoji-Bold.ttf'), url('MonospaceTypewriter.ttf');
+  src: url("BlobEmoji-Bold.ttf"), url("MonospaceTypewriter.ttf");
 }
 
 /* Background for s6 and s10 is not displayed by default */
@@ -276,9 +292,9 @@ button:focus {
   outline: none;
 }
 
-/*#region TT shop*/
+/* #region TT shop */
 
-.TTbuttons {
+.time-theorem-buttons {
   color: var(--color-text);
   position: fixed;
   bottom: 0;
@@ -305,23 +321,23 @@ button:focus {
 }
 
 .c-tt-buy-button--unlocked {
-  color: #3AACD6;
+  color: #3aacd6;
   background: #232028;
   cursor: pointer;
 }
 
 .c-tt-buy-button--unlocked:hover {
   color: #232028;
-  background: #3AACD6;
+  background: #3aacd6;
 }
 
 .c-tt-buy-button--locked {
   color: black;
-  background: #4A4A4A;
+  background: #4a4a4a;
 }
 
 .c-tt-buy-button--locked:hover {
-  background: #652F2F;
+  background: #652f2f;
 }
 
 .timetheorems {
@@ -366,12 +382,12 @@ button:focus {
 }
 
 .l-tt-save-load-btn__wrapper {
-  margin: 0.3em;
+  margin: 0.3rem;
   position: relative;
 }
 
 .l-tt-save-load-btn {
-  min-width: 2em;
+  min-width: 2rem;
 }
 
 .l-tt-save-load-btn__menu {
@@ -448,7 +464,7 @@ button:focus {
 
 .t-s6 .ttshop-background,
 .t-s10 .ttshop-background {
-  border: 0.1rem solid #3AACD6;
+  border: 0.1rem solid #3aacd6;
 }
 
 .ttshop-container {
@@ -475,19 +491,19 @@ button:focus {
 .t-s6 .ttshop-minimize-btn,
 .t-s10 .ttshop-minimize-btn,
 .s-base--metro .ttshop-minimize-btn {
-  margin-left: -0.1rem
+  margin-left: -0.1rem;
 }
 
 .t-s6 .ttshop-minimize-btn,
 .t-s10 .ttshop-minimize-btn {
-  color: #3AACD6;
+  color: #3aacd6;
 }
 
 .c-ttshop__save-load-text {
   font-size: 10px;
 }
 
-/*#endregion TT shop*/
+/* #endregion TT shop */
 
 .l-dim-path-priority {
   position: absolute;
@@ -510,7 +526,7 @@ button:focus {
   position: relative;
 }
 
-/*#region tab buttons*/
+/* #region tab buttons */
 
 .o-tab-btn {
   color: var(--color-text);
@@ -523,6 +539,7 @@ button:focus {
   cursor: pointer;
   font-family: Typewriter;
   font-size: 1.8rem;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -580,7 +597,7 @@ button:focus {
   background: var(--color-celestials);
 }
 
-/*#endregion tab buttons*/
+/* #endregion tab buttons */
 
 #loading {
   height: 100%;
@@ -651,9 +668,9 @@ button:focus {
 }
 
 @keyframes a-celstial-reward-glow {
-  0%   { box-shadow: inset 0 0 4rem var(--color-celestials) }
-  50%  { box-shadow: inset 0 0 0 }
-  100%  { box-shadow: inset 0 0 4rem var(--color-celestials) }
+  0% { box-shadow: inset 0 0 4rem var(--color-celestials); }
+  50% { box-shadow: inset 0 0 0; }
+  100% { box-shadow: inset 0 0 4rem var(--color-celestials); }
 }
 
 .t-s6 .c-reality-button,
@@ -678,7 +695,8 @@ button:focus {
   color: grey;
 }
 
-.c-reality-button--unlocked:hover, .c-reality-button--unlocked.force-hover {
+.c-reality-button--unlocked:hover,
+.c-reality-button--unlocked.force-hover {
   color: black;
   background: var(--color-reality);
 }
@@ -708,9 +726,12 @@ button:focus {
   border-style: solid;
 }
 
-.c-reset-reality-button:hover, .c-reset-reality-button.force-hover,
-.t-s6 .c-reset-reality-button:hover, .t-s6 .c-reset-reality-button.force-hover,
-.t-s10 .c-reset-reality-button:hover, .t-s10 .c-reset-reality-button.force-hover {
+.c-reset-reality-button:hover,
+.c-reset-reality-button.force-hover,
+.t-s6 .c-reset-reality-button:hover,
+.t-s6 .c-reset-reality-button.force-hover,
+.t-s10 .c-reset-reality-button:hover,
+.t-s10 .c-reset-reality-button.force-hover {
   color: white;
   background: var(--color-bad);
 }
@@ -725,9 +746,12 @@ button:focus {
   border-color: var(--color-celestials);
 }
 
-.c-reset-reality-button-celestial:hover, .c-reset-reality-button-celestial.force-hover,
-.t-s6 .c-reset-reality-button-celestial:hover, .t-s6 .c-reset-reality-button-celestial.force-hover,
-.t-s10 .c-reset-reality-button-celestial:hover, .t-s10 .c-reset-reality-button-celestial.force-hover {
+.c-reset-reality-button-celestial:hover,
+.c-reset-reality-button-celestial.force-hover,
+.t-s6 .c-reset-reality-button-celestial:hover,
+.t-s6 .c-reset-reality-button-celestial.force-hover,
+.t-s10 .c-reset-reality-button-celestial:hover,
+.t-s10 .c-reset-reality-button-celestial.force-hover {
   color: white;
   background: var(--color-celestials);
 }
@@ -740,7 +764,7 @@ button:focus {
 .l-reality-amplify-button {
   border-radius: var(--var-border-radius, 0.5rem);
   border: var(--var-border-width, 0.2rem) solid sandybrown;
-  box-shadow: 0 0 2rem inset rgba(244, 164, 96, 0.5);
+  box-shadow: 0 0 2rem inset rgba(244, 164, 96, 50%);
   background-color: #fdd3b0;
   cursor: pointer;
   font-family: Typewriter;
@@ -748,34 +772,43 @@ button:focus {
 }
 
 [draggable] {
-  -moz-user-select: none;
-  -khtml-user-select: none;
   -webkit-user-select: none;
-  -ms-user-select: none;
   user-select: none;
+
   /* Required to make elements draggable in old WebKit */
   -khtml-user-drag: element;
   -webkit-user-drag: element;
 }
 
 @keyframes a-existence-glow {
-  0% { color: var(--color-text-inverted); text-shadow: 0.1rem 0.1rem 0.2rem var(--color-text); }
-  50% { color: var(--color-text-inverted); text-shadow: 0.1rem 0.1rem 0.8rem var(--color-text); }
-  100% { color: var(--color-text-inverted); text-shadow: 0.1rem 0.1rem 0.2rem var(--color-text); }
+  0% {
+    color: var(--color-text-inverted);
+    text-shadow: 0.1rem 0.1rem 0.2rem var(--color-text);
+  }
+
+  50% {
+    color: var(--color-text-inverted);
+    text-shadow: 0.1rem 0.1rem 0.8rem var(--color-text);
+  }
+
+  100% {
+    color: var(--color-text-inverted);
+    text-shadow: 0.1rem 0.1rem 0.2rem var(--color-text);
+  }
 }
 
 [ach-tooltip] {
   position: relative;
 }
 
-[ach-tooltip]:before,
-[ach-tooltip]:after {
+[ach-tooltip]::before,
+[ach-tooltip]::after {
   visibility: hidden;
   opacity: 0;
   pointer-events: none;
 }
 
-[ach-tooltip]:before {
+[ach-tooltip]::before {
   position: absolute;
   bottom: 100%;
   left: 50%;
@@ -784,8 +817,8 @@ button:focus {
   padding: 0.7rem;
   width: 16rem;
   border-radius: var(--var-border-radius, 0.3rem);
-  background-color: hsla(0, 0%, 5%, 0.9);
-  color: #fff;
+  background-color: hsla(0deg, 0%, 5%, 90%);
+  color: #ffffff;
   content: attr(ach-tooltip);
   text-align: center;
   font-size: 1.4rem;
@@ -794,13 +827,13 @@ button:focus {
   z-index: 3;
 }
 
-[ach-tooltip]:after {
+[ach-tooltip]::after {
   position: absolute;
   bottom: 100%;
   left: 50%;
   margin-left: -0.5rem;
   width: 0;
-  border-top: var(--var-border-width, 0.5rem) solid hsla(0, 0%, 5%, 0.9);
+  border-top: var(--var-border-width, 0.5rem) solid hsla(0deg, 0%, 5%, 90%);
   border-right: var(--var-border-width, 0.5rem) solid transparent;
   border-left: var(--var-border-width, 0.5rem) solid transparent;
   content: " ";
@@ -809,13 +842,18 @@ button:focus {
   transition-duration: 0.4s;
 }
 
-[ach-tooltip]:hover:before,
-[ach-tooltip]:hover:after {
+[ach-tooltip]:hover::before,
+[ach-tooltip]:hover::after {
   visibility: visible;
   opacity: 1;
 }
 
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   margin: 0 0 1rem;
 }
 
@@ -827,7 +865,9 @@ dl {
   margin: 0 0 3px;
 }
 
-h1, h2, h3 {
+h1,
+h2,
+h3 {
   line-height: 1.1;
 }
 
@@ -836,23 +876,23 @@ h1 {
 }
 
 a {
-  color: #39c;
+  color: #3399cc;
   text-decoration: none;
 }
 
 a:hover {
-  color: #069;
+  color: #006699;
 }
 
 a small {
   font-size: 11px;
-  color: #777;
-  margin-top: -0.3em;
+  color: #777777;
+  margin-top: -0.3rem;
   display: block;
 }
 
 a:hover small {
-  color: #777;
+  color: #777777;
 }
 
 .wrapper {
@@ -868,7 +908,7 @@ blockquote {
 }
 
 table {
-  border-spacing: 0
+  border-spacing: 0;
 }
 
 th,
@@ -878,12 +918,12 @@ td {
 }
 
 dt {
-  color: #444;
+  color: #444444;
   font-weight: 700;
 }
 
 th {
-  color: #444;
+  color: #444444;
 }
 
 img {
@@ -925,7 +965,7 @@ header li:last-child a {
 header ul a {
   line-height: 1;
   font-size: 11px;
-  color: #999;
+  color: #999999;
   display: block;
   text-align: center;
   padding-top: 6px;
@@ -933,7 +973,7 @@ header ul a {
 }
 
 header ul a:hover {
-  color: #999;
+  color: #999999;
 }
 
 header ul a:active {
@@ -941,10 +981,10 @@ header ul a:active {
 }
 
 strong {
-font-weight: 700;
+  font-weight: 700;
 }
 
-header ul li+li+li {
+header ul li + li + li {
   border-right: none;
   width: 89px;
 }
@@ -952,7 +992,7 @@ header ul li+li+li {
 header ul a strong {
   font-size: 14px;
   display: block;
-  color: #222;
+  color: #222222;
 }
 
 section {
@@ -982,7 +1022,7 @@ footer {
 
 br {
   margin: 0;
-  pointer-events:none;
+  pointer-events: none;
 }
 
 .videocontainer {
@@ -1009,7 +1049,7 @@ br {
   pointer-events: all;
   top: 50%;
   left: 50%;
-  transform: translate(-50%,-50%);
+  transform: translate(-50%, -50%);
 }
 
 @media print, screen and (max-width: 960px) {
@@ -1017,6 +1057,7 @@ br {
     width: auto;
     margin: 0;
   }
+
   header,
   section,
   footer {
@@ -1024,18 +1065,22 @@ br {
     position: static;
     width: auto;
   }
+
   header {
     padding-right: 320px;
   }
+
   section {
     border: 0.1rem solid #e5e5e5;
     border-width: var(--var-border-width, 1px) var(--var-border-width, 0);
     padding: 20px 0;
     margin: 0 0 20px;
   }
+
   header a small {
     display: inline;
   }
+
   header ul {
     position: absolute;
     right: 50px;
@@ -1044,13 +1089,15 @@ br {
 }
 
 @media print,
-screen and (max-width: 720px) {
+  screen and (max-width: 720px) {
   body {
     word-wrap: break-word;
   }
+
   header {
     padding: 0;
   }
+
   header ul,
   header p.view {
     position: static;
@@ -1058,134 +1105,218 @@ screen and (max-width: 720px) {
 }
 
 @media print,
-screen and (max-width: 480px) {
+  screen and (max-width: 480px) {
   body {
     padding: 15px;
   }
+
   header ul {
     width: 99%;
   }
+
   header li,
-  header ul li+li+li {
+  header ul li + li + li {
     width: 33%;
   }
 }
 
 @media print {
   body {
+    /* stylelint-disable-next-line unit-allowed-list */
     padding: 0.4in;
+    /* stylelint-disable-next-line unit-allowed-list */
     font-size: 12pt;
-    color: #444;
+    color: #444444;
   }
 }
 
+/* stylelint-disable-next-line keyframes-name-pattern */
 @keyframes barrelRoll {
-  0%  {transform: rotateZ(0deg);}
+  0% { transform: rotateZ(0deg); }
+
   50%,
-  100% {transform: rotateZ(360deg);}
+  100% { transform: rotateZ(360deg); }
 }
 
 @keyframes spin3d {
-  0% {transform: rotate3d(5.2, -2.8, 1.4, 0deg);}
-  100% {transform: rotate3d(5.2, -2.8, 1.4, 360deg);}
+  0% { transform: rotate3d(5.2, -2.8, 1.4, 0deg); }
+  100% { transform: rotate3d(5.2, -2.8, 1.4, 360deg); }
 }
 
 @keyframes spin4d {
   0%,
-  100% {transform: scale(1) rotate3d(5.2, -2.8, 1.4, 0deg);}
-  50% {transform: scale(0) rotate3d(5.2, -2.8, 1.4, 360deg);}
+  100% { transform: scale(1) rotate3d(5.2, -2.8, 1.4, 0deg); }
+  50% { transform: scale(0) rotate3d(5.2, -2.8, 1.4, 360deg); }
 }
 
 @keyframes float {
-  0% { bottom: 0; opacity: 0;}
-  50% {opacity: 1; }
-  100% { bottom: 50px; opacity: 0;}
+  0% {
+    bottom: 0;
+    opacity: 0;
+  }
+
+  50% {
+    opacity: 1;
+  }
+
+  100% {
+    bottom: 50px;
+    opacity: 0;
+  }
 }
 
 @keyframes implode {
   0%,
-  100% {transform:scale(1); filter:blur(0)}
-  50% {transform:scale(0); filter:blur(5px)}
+  100% {
+    transform: scale(1);
+    filter: blur(0);
+  }
+
+  50% {
+    transform: scale(0);
+    filter: blur(5px);
+  }
 }
 
 @keyframes eternify {
-  0% {opacity: 1; filter: blur(0);}
-  15% {opacity: 0.5; filter: blur(1px);}
-  30% {opacity: 0.75; filter: blur(0.5px);}
-  45% {opacity: 0.25; filter: blur(1.5px);}
-  60% {opacity: 0.5; filter: blur(1px);}
-  75% {opacity: 0; filter: blur(3px);}
-  85% {opacity: 0; filter: blur(3px);}
-  100% {opacity: 1; filter: blur(0);}
+  0% {
+    opacity: 1;
+    filter: blur(0);
+  }
+
+  15% {
+    opacity: 0.5;
+    filter: blur(1px);
+  }
+
+  30% {
+    opacity: 0.75;
+    filter: blur(0.5px);
+  }
+
+  45% {
+    opacity: 0.25;
+    filter: blur(1.5px);
+  }
+
+  60% {
+    opacity: 0.5;
+    filter: blur(1px);
+  }
+
+  75% {
+    opacity: 0;
+    filter: blur(3px);
+  }
+
+  85% {
+    opacity: 0;
+    filter: blur(3px);
+  }
+
+  100% {
+    opacity: 1;
+    filter: blur(0);
+  }
 }
 
 @keyframes dilate {
-  0% {transform: scaleX(1); opacity: 1}
-  50% {transform: scaleX(3); opacity: 0}
-  60% {transform: scaleX(1); opacity: 0}
-  100% {transform: scaleX(1); opacity: 1}
+  0% {
+    transform: scaleX(1);
+    opacity: 1;
+  }
+
+  50% {
+    transform: scaleX(3);
+    opacity: 0;
+  }
+
+  60% {
+    transform: scaleX(1);
+    opacity: 0;
+  }
+
+  100% {
+    transform: scaleX(1);
+    opacity: 1;
+  }
 }
 
 @keyframes undilate {
-  0% {transform: scaleX(1); opacity: 1}
-  50% {transform: scaleX(0.5); opacity: 0}
-  60% {transform: scaleX(1); opacity: 0}
-  100% {transform: scaleX(1); opacity: 1}
+  0% {
+    transform: scaleX(1);
+    opacity: 1;
+  }
+
+  50% {
+    transform: scaleX(0.5);
+    opacity: 0;
+  }
+
+  60% {
+    transform: scaleX(1);
+    opacity: 0;
+  }
+
+  100% {
+    transform: scaleX(1);
+    opacity: 1;
+  }
 }
 
 @keyframes realize {
-  0% {opacity: 1;}
-  20% {opacity: 0;}
-  80% {opacity: 0;}
-  100% {opacity: 1;}
+  0% { opacity: 1; }
+  20% { opacity: 0; }
+  80% { opacity: 0; }
+  100% { opacity: 1; }
 }
 
 @keyframes realizebg {
-  0% {opacity: 0;}
-  20% {opacity: 0;}
-  30% {opacity: 1;}
-  70% {opacity: 1;}
-  80% {opacity: 0;}
-  100% {opacity: 0;}
+  0% { opacity: 0; }
+  20% { opacity: 0; }
+  30% { opacity: 1; }
+  70% { opacity: 1; }
+  80% { opacity: 0; }
+  100% { opacity: 0; }
 }
 
 @keyframes text-grow {
-  0% {font-size: 1.3rem;}
-  50% {font-size: 1.8rem;}
-  100% {font-size: 1.3rem;}
+  0% { font-size: 1.3rem; }
+  50% { font-size: 1.8rem; }
+  100% { font-size: 1.3rem; }
 }
 
 @keyframes text-shrink {
-  0% {font-size: 1.8rem;}
-  50% {font-size: 1.3rem;}
-  100% {font-size: 1.8rem;}
+  0% { font-size: 1.8rem; }
+  50% { font-size: 1.3rem; }
+  100% { font-size: 1.8rem; }
 }
 
 @keyframes text-crunch {
-  0% {font-size: 1.5rem;}
-  90% {font-size: 1.5rem;}
-  100% {font-size: 0;}
+  0% { font-size: 1.5rem; }
+  90% { font-size: 1.5rem; }
+  100% { font-size: 0; }
 }
 
 @keyframes text-flash {
-  0% {color: yellow;}
-  50% {color: red;}
+  0% { color: yellow; }
+  50% { color: red; }
 }
 
 @keyframes fade-out {
-  0% {opacity: 1;}
-  50% {opacity: 0;}
-  100% {opacity: 1;}
+  0% { opacity: 1; }
+  50% { opacity: 0; }
+  100% { opacity: 1; }
 }
 
 @keyframes disappear {
-  0% {opacity: 1;}
-  100% {opacity: 0;}
+  0% { opacity: 1; }
+  100% { opacity: 0; }
 }
 
 @keyframes text-stretch {
-  0% {letter-spacing: 0;}
-  100% {letter-spacing: 30rem;}
+  0% { letter-spacing: 0; }
+  100% { letter-spacing: 30rem; }
 }
 
 .infotooltip {
@@ -1196,14 +1327,14 @@ screen and (max-width: 480px) {
 .infotooltip .infotooltiptext {
   visibility: hidden;
   background-color: black;
-  color: #fff;
+  color: #ffffff;
   text-align: left;
   padding: 0.5rem;
   border-radius: var(--var-border-radius, 0.5rem);
   position: absolute;
   z-index: 2;
   white-space: nowrap;
-  left: 105%
+  left: 105%;
 }
 
 .infotooltip:hover .infotooltiptext {
@@ -1223,7 +1354,7 @@ screen and (max-width: 480px) {
   max-height: 100%;
 }
 
-/*#region o-primary-btn*/
+/* #region o-primary-btn */
 
 .o-primary-btn {
   height: 2.5rem;
@@ -1245,7 +1376,7 @@ screen and (max-width: 480px) {
 }
 
 .o-primary-btn--disabled {
-  background-color: #A3A3A3;
+  background-color: #a3a3a3;
   border-color: var(--color-bad);
   cursor: default;
 }
@@ -1254,7 +1385,7 @@ screen and (max-width: 480px) {
   background-color: var(--color-bad);
 }
 
-/*#region modifiers*/
+/* #region modifiers */
 
 .o-primary-btn--width-medium {
   width: 12rem;
@@ -1464,11 +1595,11 @@ screen and (max-width: 480px) {
   font-size: 1rem;
 }
 
-/*#endregion modifiers*/
+/* #endregion modifiers */
 
-/*#region themes*/
+/* #region themes */
 
-/*#region t-dark*/
+/* #region t-dark */
 
 .t-dark .o-primary-btn {
   box-shadow: 0 0 0.7rem 0.2rem #111111;
@@ -1495,9 +1626,9 @@ screen and (max-width: 480px) {
   background-color: #1b5e20;
 }
 
-/*#endregion t-dark*/
+/* #endregion t-dark */
 
-/*#region t-dark-metro*/
+/* #region t-dark-metro */
 
 .t-dark-metro .o-primary-btn {
   box-shadow: 0.1rem 0.1rem 0.1rem 0 black;
@@ -1511,9 +1642,9 @@ screen and (max-width: 480px) {
   background-color: var(--color-bad);
 }
 
-/*#endregion t-dark-metro*/
+/* #endregion t-dark-metro */
 
-/*#region t-metro t-dark-metro t-inverted-metro t-s8*/
+/* #region t-metro t-dark-metro t-inverted-metro t-s8 */
 
 .t-metro .o-primary-btn,
 .t-inverted-metro .o-primary-btn {
@@ -1530,9 +1661,9 @@ screen and (max-width: 480px) {
   background-color: var(--color-bad);
 }
 
-/*#endregion t-metro t-inverted-metro t-s8*/
+/* #endregion t-metro t-inverted-metro t-s8 */
 
-/*#region t-s1*/
+/* #region t-s1 */
 
 .t-s1 .o-primary-btn {
   border-color: black;
@@ -1546,22 +1677,22 @@ screen and (max-width: 480px) {
   background-color: var(--color-bad);
 }
 
-/*#endregion t-s1*/
+/* #endregion t-s1 */
 
-/*#region t-s4*/
+/* #region t-s4 */
 
 .t-s4 .o-primary-btn {
   background-color: #ff0000;
-  cursor: url(cursor2.cur), auto;
+  cursor: url("cursor2.cur"), auto;
 }
 
 .t-s4 .o-primary-btn--disabled {
-  cursor: url(cursor.cur), auto;
+  cursor: url("cursor.cur"), auto;
 }
 
-/*#endregion t-s4*/
+/* #endregion t-s4 */
 
-/*#region t-s6 t-s10*/
+/* #region t-s6 t-s10 */
 
 .t-s6 .o-primary-btn,
 .t-s10 .o-primary-btn {
@@ -1621,29 +1752,28 @@ screen and (max-width: 480px) {
   color: black;
 }
 
-/*#endregion t-s6 t-s10*/
+/* #endregion t-s6 t-s10 */
 
-/*#endregion themes*/
+/* #endregion themes */
 
-/*#endregion o-primary-btn*/
+/* #endregion o-primary-btn */
 
-/*#region c-subtab-option-container*/
+/* #region c-subtab-option-container */
 
 .c-subtab-option-container {
   display: flex;
-  flex-direction: row;
+  flex-flow: row wrap;
   padding-bottom: 0.8rem;
-  flex-wrap: wrap;
   justify-content: center;
 }
 
-/*#endregion c-subtab-option-container*/
+/* #endregion c-subtab-option-container */
 
-/*#region o-prestige-button*/
+/* #region o-prestige-button */
 
 .o-prestige-button {
   border: var(--var-border-width, 0.2rem) solid;
-  border-radius:  var(--var-border-radius, 0.4rem);
+  border-radius: var(--var-border-radius, 0.4rem);
   transition-duration: 0.2s;
   cursor: pointer;
   width: 22rem;
@@ -1660,7 +1790,7 @@ screen and (max-width: 480px) {
   pointer-events: none;
 }
 
-/*#region Big Crunch*/
+/* #region Big Crunch */
 
 .o-infinity-button {
   color: var(--color-infinity);
@@ -1695,7 +1825,7 @@ screen and (max-width: 480px) {
   opacity: 0.5;
 }
 
-/*#region Eternity*/
+/* #region Eternity */
 
 .o-eternity-button {
   color: var(--color-eternity);
@@ -1762,13 +1892,13 @@ screen and (max-width: 480px) {
   opacity: 0.5;
 }
 
-/*#endregion Eternity*/
+/* #endregion Eternity */
 
-/*#endregion Big Crunch*/
+/* #endregion Big Crunch */
 
-/*#endregion o-prestige-btn*/
+/* #endregion o-prestige-btn */
 
-/*#region l-spoon-btn-group*/
+/* #region l-spoon-btn-group */
 
 .l-spoon-btn-group {
   display: flex;
@@ -1787,14 +1917,14 @@ screen and (max-width: 480px) {
   margin-bottom: 1.2rem;
 }
 
-/*#endregion l-spoon-btn-group*/
+/* #endregion l-spoon-btn-group */
 
 .o-big-checkbox {
   width: 2rem;
   height: 1.8rem;
 }
 
-/*#region hint-text*/
+/* #region hint-text */
 
 .o-dim-path-priority {
   font-size: 1.55rem;
@@ -1852,16 +1982,16 @@ screen and (max-width: 480px) {
   transform: translate(-50%);
 }
 
-/*#endregion hint-text*/
+/* #endregion hint-text */
 
-/*#region Header*/
+/* #region Header */
 
 .l-game-header__amounts-line {
   position: relative;
   font-size: 1.2rem;
 }
 
-/*#region IP Amount*/
+/* #region IP Amount */
 
 .l-game-header__infinity-points {
   position: absolute;
@@ -1886,7 +2016,7 @@ screen and (max-width: 480px) {
 }
 
 .s-base--dark .c-game-header__tesseract-available {
-  background: #EEEEEE;
+  background: #eeeeee;
   animation: a-tesseract-shift-dark 5s infinite;
 }
 
@@ -1899,7 +2029,6 @@ screen and (max-width: 480px) {
   background: white;
 }
 
-
 .c-game-header__ip-amount {
   font-weight: bold;
 }
@@ -1920,9 +2049,9 @@ screen and (max-width: 480px) {
   text-shadow: 0.1rem 0.1rem 0 black;
 }
 
-/*#endregion IP Amount*/
+/* #endregion IP Amount */
 
-/*#region EP Amount*/
+/* #region EP Amount */
 
 .l-game-header__eternity-points {
   position: absolute;
@@ -1954,9 +2083,9 @@ screen and (max-width: 480px) {
   text-shadow: 0.1rem 0.1rem 0 black;
 }
 
-/*#endregion EP Amount*/
+/* #endregion EP Amount */
 
-/*#region c-game-header__antimatter*/
+/* #region c-game-header__antimatter */
 
 .c-game-header__antimatter {
   font-size: 2.5rem;
@@ -1970,10 +2099,10 @@ screen and (max-width: 480px) {
 }
 
 @keyframes a-game-header__antimatter--glow {
-  0%   {color: #2196f3;}
-  33%  {color: #673ab7;}
-  66%  {color: #00bcd4;}
-  100% {color: #2196f3;}
+  0% { color: #2196f3; }
+  33% { color: #673ab7; }
+  66% { color: #00bcd4; }
+  100% { color: #2196f3; }
 }
 
 .t-s11 .c-game-header__antimatter {
@@ -1981,17 +2110,17 @@ screen and (max-width: 480px) {
 }
 
 @keyframes a-game-header__antimatter--glow-blob {
-  0%   { color: #fbc21b }
-  33%  { color: #caa32c }
-  66%  { color: #fba11b }
-  100% { color: #fbc21b }
+  0% { color: #fbc21b; }
+  33% { color: #caa32c; }
+  66% { color: #fba11b; }
+  100% { color: #fbc21b; }
 }
 
 .t-dark-metro .c-game-header__antimatter {
   color: #e0e0e0;
 }
 
-/*#endregion c-game-header__antimatter*/
+/* #endregion c-game-header__antimatter */
 
 .l-game-header__challenge-text {
   display: flex;
@@ -2035,14 +2164,14 @@ screen and (max-width: 480px) {
   width: 1rem;
 }
 
-/*#endregion Header*/
+/* #endregion Header */
 
 .t-s2 .c-dim-tab {
   color: black;
-  text-shadow: .05rem .05rem 0 white, -.05rem -.05rem 0 white;
+  text-shadow: 0.05rem 0.05rem 0 white, -0.05rem -0.05rem 0 white;
 }
 
-/*#region Dimensions*/
+/* #region Dimensions */
 
 .l-dimensions-container {
   width: 100%;
@@ -2078,11 +2207,11 @@ screen and (max-width: 480px) {
   margin-right: 10rem;
 }
 
-/*#endregion Dimensions*/
+/* #endregion Dimensions */
 
-/*#region Antimatter Dimensions*/
+/* #region Antimatter Dimensions */
 
-/*#region l-antimatter-dim-tab*/
+/* #region l-antimatter-dim-tab */
 
 .l-antimatter-dim-tab > * {
   flex-shrink: 0;
@@ -2092,9 +2221,9 @@ screen and (max-width: 480px) {
   margin: 1rem 0;
 }
 
-/*#endregion l-antimatter-dim-tab*/
+/* #endregion l-antimatter-dim-tab */
 
-/*#region l-antimatter-dim-tab-header*/
+/* #region l-antimatter-dim-tab-header */
 
 .l-antimatter-dim-tab__header {
   display: flex;
@@ -2104,9 +2233,9 @@ screen and (max-width: 480px) {
   padding-top: 0.5rem;
 }
 
-/*#endregion l-antimatter-dim-tab-header*/
+/* #endregion l-antimatter-dim-tab-header */
 
-/*#region c-antimatter-dim-row*/
+/* #region c-antimatter-dim-row */
 
 .c-antimatter-dim-row {
   /* relative because floating text is 'position: absolute' */
@@ -2118,28 +2247,30 @@ screen and (max-width: 480px) {
   margin-top: 1rem;
 }
 
-/*#endregion c-dimension-row*/
+/* #endregion c-dimension-row */
 
-/*#region c-progress-bar*/
+/* #region c-progress-bar */
 
 .c-progress-bar {
   width: 100%;
-  background-color: #A3A3A3;
+  background-color: #a3a3a3;
   border-radius: var(--var-border-radius, 0.5rem);
   pointer-events: none;
   margin-right: auto;
   margin-left: auto;
-  /* Start fill from left corner*/
+
+  /* Start fill from left corner */
   text-align: left;
 }
 
 .c-progress-bar__fill {
   width: 0;
-  background-color: #127A20;
+  background-color: #127a20;
   border-radius: inherit;
   transition-duration: 0.1s;
   pointer-events: none;
-  /* Align percents on center*/
+
+  /* Align percents on center */
   text-align: center;
 }
 
@@ -2147,13 +2278,14 @@ screen and (max-width: 480px) {
   font-size: 1.6rem;
   color: black;
   pointer-events: all;
+  -webkit-user-select: none;
   user-select: none;
   overflow-wrap: normal;
 }
 
-/*#region themes*/
+/* #region themes */
 
-/*#region t-dark t-s6 t-s10*/
+/* #region t-dark t-s6 t-s10 */
 
 .t-dark .c-progress-bar__fill,
 .t-s6 .c-progress-bar__fill,
@@ -2161,9 +2293,9 @@ screen and (max-width: 480px) {
   background-color: #1b5e20;
 }
 
-/*#endregion t-dark t-s6 t-s10*/
+/* #endregion t-dark t-s6 t-s10 */
 
-/*#region t-inverted t-inverted-metro*/
+/* #region t-inverted t-inverted-metro */
 
 .t-inverted .c-progress-bar__fill,
 .t-inverted-metro .c-progress-bar__fill {
@@ -2171,25 +2303,25 @@ screen and (max-width: 480px) {
   background-color: #ed85df;
 }
 
-/*#endregion t-inverted t-inverted-metro*/
+/* #endregion t-inverted t-inverted-metro */
 
-/*#region t-s1*/
+/* #region t-s1 */
 
 .t-s1 .c-progress-bar__fill {
   background-color: #4baf4e;
 }
 
-/*#endregion t-s1*/
+/* #endregion t-s1 */
 
-/*#endregion themes*/
+/* #endregion themes */
 
-/*#endregion c-progress-bar*/
+/* #endregion c-progress-bar */
 
-/*#endregion Antimatter Dimensions*/
+/* #endregion Antimatter Dimensions */
 
-/*#region Infinity Dimensions*/
+/* #region Infinity Dimensions */
 
-/*#region l-infinity-dim-tab*/
+/* #region l-infinity-dim-tab */
 
 .l-infinity-dim-tab {
   display: flex;
@@ -2220,7 +2352,7 @@ screen and (max-width: 480px) {
 }
 
 .s-base--dark .c-infinity-dim-tab__tesseract-button {
-  background: #EEEEEE;
+  background: #eeeeee;
   animation: a-tesseract-shift-dark 5s infinite;
 }
 
@@ -2258,20 +2390,20 @@ screen and (max-width: 480px) {
 }
 
 @keyframes a-tesseract-shift {
-  0% {box-shadow: 1.5rem 1.5rem 0.5rem black, -1.5rem -1.5rem 0.5rem black;}
-  50% {box-shadow: 1.5rem -1.5rem 0.5rem black, -1.5rem 1.5rem 0.5rem black;}
-  100% {box-shadow: -1.5rem -1.5rem 0.5rem black, 1.5rem 1.5rem 0.5rem black;}
+  0% { box-shadow: 1.5rem 1.5rem 0.5rem black, -1.5rem -1.5rem 0.5rem black; }
+  50% { box-shadow: 1.5rem -1.5rem 0.5rem black, -1.5rem 1.5rem 0.5rem black; }
+  100% { box-shadow: -1.5rem -1.5rem 0.5rem black, 1.5rem 1.5rem 0.5rem black; }
 }
 
 @keyframes a-tesseract-shift-dark {
-  0% {box-shadow: 1.5rem 1.5rem 0.5rem white, -1.5rem -1.5rem 0.5rem white;}
-  50% {box-shadow: 1.5rem -1.5rem 0.5rem white, -1.5rem 1.5rem 0.5rem white;}
-  100% {box-shadow: -1.5rem -1.5rem 0.5rem white, 1.5rem 1.5rem 0.5rem white;}
+  0% { box-shadow: 1.5rem 1.5rem 0.5rem white, -1.5rem -1.5rem 0.5rem white; }
+  50% { box-shadow: 1.5rem -1.5rem 0.5rem white, -1.5rem 1.5rem 0.5rem white; }
+  100% { box-shadow: -1.5rem -1.5rem 0.5rem white, 1.5rem 1.5rem 0.5rem white; }
 }
 
-/*#endregion l-infinity-dim-tab*/
+/* #endregion l-infinity-dim-tab */
 
-/*#region c-infinity-dim-description__accent*/
+/* #region c-infinity-dim-description__accent */
 
 .c-infinity-dim-description__accent {
   font-size: 3.5rem;
@@ -2280,7 +2412,7 @@ screen and (max-width: 480px) {
 
 .t-metro .c-infinity-dim-description__accent,
 .t-s8 .c-infinity-dim-description__accent {
-  text-shadow: 0 0 0.1rem rgba(0, 0, 0, 0.5), -0.1rem 0.1rem 0.1rem black;
+  text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;
 }
 
 .t-dark .c-infinity-dim-description__accent,
@@ -2288,7 +2420,7 @@ screen and (max-width: 480px) {
 .t-s10 .c-infinity-dim-description__accent,
 .t-s11 .c-infinity-dim-description__accent {
   color: white;
-  text-shadow: 0 0 0.7rem #fff;
+  text-shadow: 0 0 0.7rem #ffffff;
 }
 
 .t-metro .c-infinity-dim-description__accent,
@@ -2297,9 +2429,9 @@ screen and (max-width: 480px) {
   color: #ff9800;
 }
 
-/*#endregion c-infinity-dim-description__accent*/
+/* #endregion c-infinity-dim-description__accent */
 
-/*#region c-infinity-dim-row*/
+/* #region c-infinity-dim-row */
 
 .c-infinity-dim-row {
   margin-top: 1rem;
@@ -2309,13 +2441,13 @@ screen and (max-width: 480px) {
   font-size: 1.6rem;
 }
 
-/*#endregion c-infinity-dim-row*/
+/* #endregion c-infinity-dim-row */
 
-/*#endregion Infinity Dimensions*/
+/* #endregion Infinity Dimensions */
 
-/*#region Time Dimensions*/
+/* #region Time Dimensions */
 
-/*#region l-time-dim-tab*/
+/* #region l-time-dim-tab */
 
 .l-time-dim-tab {
   display: flex;
@@ -2323,9 +2455,9 @@ screen and (max-width: 480px) {
   align-items: center;
 }
 
-/*#endregion l-time-dim-tab*/
+/* #endregion l-time-dim-tab */
 
-/*#region c-time-dim-description__accent*/
+/* #region c-time-dim-description__accent */
 
 .c-time-dim-description__accent {
   font-size: 3.5rem;
@@ -2334,7 +2466,7 @@ screen and (max-width: 480px) {
 
 .t-metro .c-time-dim-description__accent,
 .t-s8 .c-time-dim-description__accent {
-  text-shadow: 0 0 0.1rem rgba(0, 0, 0, 0.5), -0.1rem 0.1rem 0.1rem black;
+  text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;
 }
 
 .t-dark .c-time-dim-description__accent,
@@ -2351,9 +2483,9 @@ screen and (max-width: 480px) {
   color: #673ab7;
 }
 
-/*#endregion c-time-dim-description__accent*/
+/* #endregion c-time-dim-description__accent */
 
-/*#region c-time-dim-row*/
+/* #region c-time-dim-row */
 
 .c-time-dim-row {
   margin-top: 1rem;
@@ -2363,11 +2495,11 @@ screen and (max-width: 480px) {
   font-size: 1.6rem;
 }
 
-/*#endregion c-time-dim-row*/
+/* #endregion c-time-dim-row */
 
-/*#endregion Time Dimensions*/
+/* #endregion Time Dimensions */
 
-/*#region Options*/
+/* #region Options */
 
 .l-options-tab {
   display: flex;
@@ -2398,10 +2530,10 @@ screen and (max-width: 480px) {
   cursor: pointer;
   font-size: 100rem;
   padding: 10rem 20rem;
-  content: ' ';
+  content: " ";
 }
 
-/*#region l-options-grid*/
+/* #region l-options-grid */
 
 .l-options-grid {
   display: flex;
@@ -2431,6 +2563,7 @@ screen and (max-width: 480px) {
 }
 
 .c-options-grid__notations {
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -2457,7 +2590,7 @@ screen and (max-width: 480px) {
   box-shadow: 0 0 0.7rem 0.2rem #111111;
 }
 
-/*#endregion l-options-grid*/
+/* #endregion l-options-grid */
 
 .l-select-notation,
 .l-select-theme {
@@ -2479,11 +2612,11 @@ screen and (max-width: 480px) {
   border-top: none;
 }
 
+/* #endregion Options */
 
-/*#endregion Options*/
+/* #region c-stats-tab */
 
-/*#region c-stats-tab*/
-/* This the top-level Statistics tab (with all subtabs)*/
+/* This the top-level Statistics tab (with all subtabs) */
 
 .c-stats-tab {
   display: flex;
@@ -2532,14 +2665,14 @@ screen and (max-width: 480px) {
   color: var(--color-reality);
 }
 
-/*#endregion c-stats-tab*/
+/* #endregion c-stats-tab */
 
-/*#region Past Prestige Runs*/
+/* #region Past Prestige Runs */
 
 .c-past-runs-header {
   cursor: pointer;
+  -webkit-user-select: none;
   user-select: none;
-
   display: flex;
   flex-direction: row;
   justify-content: center;
@@ -2549,14 +2682,14 @@ screen and (max-width: 480px) {
 }
 
 .o-run-drop-down-icon {
-  font-size: 1.5em;
+  font-size: 1.5rem;
   margin-left: 2rem;
   margin-right: 2rem;
 }
 
-/*#endregion Past Prestige Runs*/
+/* #endregion Past Prestige Runs */
 
-/*#region Challenge Records*/
+/* #region Challenge Records */
 
 .l-challenge-records-tab {
   display: flex;
@@ -2570,16 +2703,15 @@ screen and (max-width: 480px) {
   margin-left: 2rem;
 }
 
-/*#endregion Challenge Records*/
+/* #endregion Challenge Records */
 
-/*#region Speedrun Stats*/
+/* #region Speedrun Stats */
 
 .l-speedrun-milestone-tab {
   display: flex;
   margin: auto;
   width: 100%;
-  flex-direction: row;
-  flex-wrap: wrap;
+  flex-flow: row wrap;
   justify-content: center;
   align-items: center;
 }
@@ -2600,11 +2732,11 @@ screen and (max-width: 480px) {
   background-color: var(--color-good);
 }
 
-/*#endregion Speedrun Stats*/
+/* #endregion Speedrun Stats */
 
-/*#region Achievements*/
+/* #region Achievements */
 
-/*#region o-achievement*/
+/* #region o-achievement */
 
 .o-achievement {
   position: relative;
@@ -2616,6 +2748,7 @@ screen and (max-width: 480px) {
   font-family: Typewriter, serif;
   color: black;
   font-size: 0.8rem;
+  -webkit-user-select: none;
   user-select: none;
   border: var(--var-border-width, 0.2rem) solid;
 }
@@ -2654,7 +2787,7 @@ screen and (max-width: 480px) {
 
 .o-achievement--hidden {
   background-image: url("../images/achhidden.png");
-  background-color: #555;
+  background-color: #555555;
   border-color: black;
 }
 
@@ -2673,7 +2806,7 @@ screen and (max-width: 480px) {
   bottom: 11rem;
 }
 
-.o-achievement:hover .o-achievement__tooltip:after {
+.o-achievement:hover .o-achievement__tooltip::after {
   border-top-width: 0.7rem;
   margin-bottom: -0.7rem;
 }
@@ -2692,10 +2825,10 @@ screen and (max-width: 480px) {
   z-index: 2;
   pointer-events: none;
   position: absolute;
-  bottom: 10.2rem
+  bottom: 10.2rem;
 }
 
-.o-achievement__tooltip:after {
+.o-achievement__tooltip::after {
   position: absolute;
   bottom: 0;
   left: 50%;
@@ -2715,7 +2848,7 @@ screen and (max-width: 480px) {
   background: #111111;
 }
 
-.s-base--dark .o-achievement__tooltip:after {
+.s-base--dark .o-achievement__tooltip::after {
   border-top-color: var(--color-text);
 }
 
@@ -2733,8 +2866,8 @@ screen and (max-width: 480px) {
   background: black;
 }
 
-.t-s6 .o-achievement__tooltip:after,
-.t-s10 .o-achievement__tooltip:after {
+.t-s6 .o-achievement__tooltip::after,
+.t-s10 .o-achievement__tooltip::after {
   border-top-color: white;
 }
 
@@ -2788,7 +2921,7 @@ screen and (max-width: 480px) {
   border-color: var(--color-bad);
 }
 
-.s-base--metro .o-achievement__indicator--locked  {
+.s-base--metro .o-achievement__indicator--locked {
   background: #a3a3a3;
   border-color: var(--color-bad);
 }
@@ -2813,21 +2946,21 @@ screen and (max-width: 480px) {
 }
 
 .o-achievement__indicator--secret {
-  background: #555;
+  background: #555555;
   border-color: black;
 }
 
-/*#region themes*/
+/* #region themes */
 
-/*#region t-dark*/
+/* #region t-dark */
 
 .t-dark .o-achievement--unlocked {
   background-color: #43a047;
 }
 
-/*#endregion t-dark*/
+/* #endregion t-dark */
 
-/*#region t-dark-metro*/
+/* #region t-dark-metro */
 
 .t-dark-metro .o-achievement--unlocked {
   background-color: #4caf50;
@@ -2843,91 +2976,91 @@ screen and (max-width: 480px) {
   border-color: #7d7d36;
 }
 
-/*#endregion t-dark-metro*/
+/* #endregion t-dark-metro */
 
-/*#region t-metro t-inverted-metro t-s8*/
+/* #region t-metro t-inverted-metro t-s8 */
 
 .t-metro .o-achievement--unlocked,
 .t-inverted-metro .o-achievement--unlocked,
-.t-s8 .o-achievement--unlocked  {
+.t-s8 .o-achievement--unlocked {
   background-color: #66bb6a;
   border-color: #43a047;
 }
 
 .t-metro .o-achievement--locked,
 .t-inverted-metro .o-achievement--locked,
-.t-s8 .o-achievement--locked  {
+.t-s8 .o-achievement--locked {
   background-color: #9e9e9e;
   border-color: var(--color-bad);
 }
 
 .t-metro .o-achievement--waiting,
 .t-inverted-metro .o-achievement--waiting,
-.t-s8 .o-achievement--waiting  {
+.t-s8 .o-achievement--waiting {
   background-color: #ffee58;
   border-color: #757575;
 }
 
-/*#endregion t-metro t-dark-metro t-s8*/
+/* #endregion t-metro t-dark-metro t-s8 */
 
-/*#region t-s1*/
+/* #region t-s1 */
 
 .t-s1 .o-achievement--unlocked {
   background-color: #dbd242;
   border-color: #c5ba26;
 }
 
-/*#endregion t-s1*/
+/* #endregion t-s1 */
 
-/*#region t-s2*/
+/* #region t-s2 */
 
 .t-s2 .o-achievement--locked {
-  background-color: rgba(0, 0, 0, 0);
+  background-color: rgba(0, 0, 0, 0%);
 }
 
-/*#endregion t-s2*/
+/* #endregion t-s2 */
 
-/*#region t-s5*/
+/* #region t-s5 */
 
 .t-s5 .o-achievement--unlocked {
-  border-color: #bbb;
+  border-color: #bbbbbb;
 }
 
 .t-s5 .o-achievement--locked {
-  border-color: #000;
-  background-color: #222;
+  border-color: #000000;
+  background-color: #222222;
 }
 
-/*#endregion t-s5*/
+/* #endregion t-s5 */
 
-/*#region t-s6 t-s10*/
+/* #region t-s6 t-s10 */
 
 .t-s6 .o-achievement--unlocked,
 .t-s10 .o-achievement--unlocked {
   background-color: #43a047;
 }
 
-/*#endregion t-s6 t-s10*/
+/* #endregion t-s6 t-s10 */
 
-/*#region t-s7*/
+/* #region t-s7 */
 
 .t-s7 .o-achievement--unlocked {
   background-color: #bbbbbb;
-  border-color: #666;
+  border-color: #666666;
 }
 
 .t-s7 .o-achievement--locked {
-  background-color: #555;
-  border-color: #111;
+  background-color: #555555;
+  border-color: #111111;
 }
 
-/*#endregion t-s7*/
+/* #endregion t-s7 */
 
-/*#endregion themes*/
+/* #endregion themes */
 
-/*#endregion o-achievement*/
+/* #endregion o-achievement */
 
-/*#region c-achievements-tab*/
+/* #region c-achievements-tab */
 
 .l-achievements-tab {
   display: flex;
@@ -2942,6 +3075,7 @@ screen and (max-width: 480px) {
   position: relative;
   display: inline;
   justify-content: center;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -2965,9 +3099,9 @@ screen and (max-width: 480px) {
   color: #757575;
 }
 
-/*#endregion c-achievements-tab*/
+/* #endregion c-achievements-tab */
 
-/*#region achievement-grid*/
+/* #region achievement-grid */
 
 .l-achievement-grid {
   display: flex;
@@ -2999,16 +3133,16 @@ screen and (max-width: 480px) {
 }
 
 .t-s7 .c-achievement-grid__row--completed {
-  background-color: #aaa;
+  background-color: #aaaaaa;
 }
 
-/*#endregion achievement-grid*/
+/* #endregion achievement-grid */
 
-/*#endregion Achievements*/
+/* #endregion Achievements */
 
-/*#region Challenges*/
+/* #region Challenges */
 
-/*#region l-challenges-tab*/
+/* #region l-challenges-tab */
 
 .l-challenges-tab {
   display: flex;
@@ -3026,6 +3160,7 @@ screen and (max-width: 480px) {
 
 .o-challenges-tab__header-toggle {
   cursor: pointer;
+  -webkit-user-select: none;
   user-select: none;
   display: inline-flex;
   flex-direction: row;
@@ -3053,16 +3188,15 @@ screen and (max-width: 480px) {
   flex-direction: column;
 }
 
-/*#endregion l-challenges-tab*/
+/* #endregion l-challenges-tab */
 
-/*#region l-challenge-grid*/
+/* #region l-challenge-grid */
 
 .l-challenge-grid {
   width: 90rem;
   display: flex;
-  flex-direction: row;
+  flex-flow: row wrap;
   justify-content: center;
-  flex-wrap: wrap;
 }
 
 .l-challenge-grid__cell {
@@ -3073,9 +3207,9 @@ screen and (max-width: 480px) {
   display: none;
 }
 
-/*#endregion l-challenge-grid*/
+/* #endregion l-challenge-grid */
 
-/*#region c-challenge-box*/
+/* #region c-challenge-box */
 
 .c-challenge-box {
   width: 40rem;
@@ -3110,20 +3244,20 @@ screen and (max-width: 480px) {
 }
 
 .c-challenge-box__reward-description--small-text {
-  font-size: .95rem;
+  font-size: 0.95rem;
 }
 
-/*#region themes*/
+/* #region themes */
 
-/*#region t-dark*/
+/* #region t-dark */
 
 .t-dark .c-challenge-box--normal {
   background-color: #27343b;
 }
 
-/*#endregion t-dark*/
+/* #endregion t-dark */
 
-/*#region t-metro t-dark-metro t-inverted-metro t-s8*/
+/* #region t-metro t-dark-metro t-inverted-metro t-s8 */
 
 .s-base--metro .c-challenge-box--normal {
   border-color: black;
@@ -3141,26 +3275,26 @@ screen and (max-width: 480px) {
   background-color: #27343b;
 }
 
-/*#endregion t-metro t-dark-metro t-inverted-metro*/
+/* #endregion t-metro t-dark-metro t-inverted-metro */
 
-/*#region t-s1*/
+/* #region t-s1 */
 
 .t-s1 .c-challenge-box--normal,
 .t-s1 .c-challenge-box--infinity {
   background-color: #dbd242;
 }
 
-/*#endregion t-s1*/
+/* #endregion t-s1 */
 
-/*#region t-s2*/
+/* #region t-s2 */
 
 .t-s2 .c-challenge-box--normal {
   color: white;
 }
 
-/*#endregion t-s2*/
+/* #endregion t-s2 */
 
-/*#region t-s6 t-s10*/
+/* #region t-s6 t-s10 */
 
 .t-s6 .c-challenge-box--normal,
 .t-s6 .c-challenge-box--infinity,
@@ -3183,9 +3317,9 @@ screen and (max-width: 480px) {
   border-color: white;
 }
 
-/*#endregion t-s6 t-s10*/
+/* #endregion t-s6 t-s10 */
 
-/*#region t-s7*/
+/* #region t-s7 */
 
 .t-s7 .c-challenge-box {
   color: black;
@@ -3193,13 +3327,13 @@ screen and (max-width: 480px) {
   background: white;
 }
 
-/*#endregion t-s7*/
+/* #endregion t-s7 */
 
-/*#endregion themes*/
+/* #endregion themes */
 
-/*#endregion c-challenge-box*/
+/* #endregion c-challenge-box */
 
-/*#region l-challenge-box*/
+/* #region l-challenge-box */
 
 .l-challenge-box {
   margin-top: 0.5rem;
@@ -3207,6 +3341,7 @@ screen and (max-width: 480px) {
   flex-direction: column;
   justify-content: space-between;
   align-items: center;
+
   /* because of hint-text */
   position: relative;
 }
@@ -3227,9 +3362,9 @@ screen and (max-width: 480px) {
   height: 5.5rem;
 }
 
-/*#endregion l-challenge-box*/
+/* #endregion l-challenge-box */
 
-/*#region o-challenge-btn*/
+/* #region o-challenge-btn */
 
 .o-challenge-btn {
   width: 15rem;
@@ -3275,9 +3410,9 @@ screen and (max-width: 480px) {
   background-color: #17a32e;
 }
 
-/*#region themes*/
+/* #region themes */
 
-/*#region t-dark*/
+/* #region t-dark */
 
 .t-dark .o-challenge-btn--unlocked {
   background-color: #546e7a;
@@ -3307,9 +3442,9 @@ screen and (max-width: 480px) {
   border-color: #b84b5f;
 }
 
-/*#endregion t-dark*/
+/* #endregion t-dark */
 
-/*#region t-metro t-dark-metro t-inverted-metro t-s8*/
+/* #region t-metro t-dark-metro t-inverted-metro t-s8 */
 
 .s-base--metro .o-challenge-btn--unlocked,
 .s-base--metro .o-challenge-btn--completed {
@@ -3344,9 +3479,9 @@ screen and (max-width: 480px) {
   border-right-color: #616161;
 }
 
-/*#endregion t-metro t-dark-metro t-inverted-metro t-s8*/
+/* #endregion t-metro t-dark-metro t-inverted-metro t-s8 */
 
-/*#region t-s1*/
+/* #region t-s1 */
 
 .t-s1 .o-challenge-btn--unlocked {
   color: white;
@@ -3359,9 +3494,9 @@ screen and (max-width: 480px) {
   background-color: #639565;
 }
 
-/*#endregion t-s1*/
+/* #endregion t-s1 */
 
-/*#region t-s6 t-s10*/
+/* #region t-s6 t-s10 */
 
 .t-s6 .o-challenge-btn,
 .t-s10 .o-challenge-btn {
@@ -3404,15 +3539,15 @@ screen and (max-width: 480px) {
   border-color: #b84b5f;
 }
 
-/*#endregion t-s6 t-s10*/
+/* #endregion t-s6 t-s10 */
 
-/*#endregion themes*/
+/* #endregion themes */
 
-/*#endregion o-challenge-btn*/
+/* #endregion o-challenge-btn */
 
-/*#endregion Challenges*/
+/* #endregion Challenges */
 
-/*#region infinity-tab*/
+/* #region infinity-tab */
 
 .c-infinity-tab__header {
   font-size: 1.5rem;
@@ -3423,9 +3558,9 @@ screen and (max-width: 480px) {
   color: var(--color-infinity);
 }
 
-/*#region themes*/
+/* #region themes */
 
-/*#region t-dark t-s6 t-s10*/
+/* #region t-dark t-s6 t-s10 */
 
 .t-dark .c-infinity-tab__infinity-points,
 .t-s6 .c-infinity-tab__infinity-points,
@@ -3434,23 +3569,23 @@ screen and (max-width: 480px) {
   text-shadow: 0 0 0.7rem;
 }
 
-/*#endregion t-dark t-s6 t-s10*/
+/* #endregion t-dark t-s6 t-s10 */
 
-/*#region t-s1*/
+/* #region t-s1 */
 
 .t-s1 .c-infinity-tab__infinity-points {
   text-shadow: 0.1rem 0.1rem 0 black;
 }
 
-/*#endregion t-s1*/
+/* #endregion t-s1 */
 
-/*#endregion themes*/
+/* #endregion themes */
 
-/*#endregion infinity-tab*/
+/* #endregion infinity-tab */
 
-/*#region Infinity Upgrades*/
+/* #region Infinity Upgrades */
 
-/*#region l-infinity-upgrades-tab*/
+/* #region l-infinity-upgrades-tab */
 
 .l-infinity-upgrades-tab {
   display: flex;
@@ -3466,9 +3601,9 @@ screen and (max-width: 480px) {
   margin: 0.5rem 0.8rem;
 }
 
-/*#endregion l-infinity-upgrades-tab*/
+/* #endregion l-infinity-upgrades-tab */
 
-/*#region l-infinity-upgrade-grid*/
+/* #region l-infinity-upgrade-grid */
 
 .l-infinity-upgrade-grid {
   display: flex;
@@ -3484,20 +3619,20 @@ screen and (max-width: 480px) {
   margin: 0.5rem 0.8rem;
 }
 
-/*#endregion l-infinity-upgrade-grid*/
+/* #endregion l-infinity-upgrade-grid */
 
 .l-infinity-upgrades-bottom-row {
   display: flex;
   margin-top: 1rem;
 }
 
-/*#region o-infinity-upgrade-btn*/
+/* #region o-infinity-upgrade-btn */
 
 .o-infinity-upgrade-btn {
   color: white;
   background-color: #1f1f1f;
   font-weight: bold;
-  font-size:  1rem;
+  font-size: 1rem;
   border: 0.1rem solid black;
   width: 19rem;
   height: 9rem;
@@ -3516,7 +3651,7 @@ screen and (max-width: 480px) {
   color: var(--color-text-inverted);
 }
 
-/*#region o-infinity-upgrade-btn--available*/
+/* #region o-infinity-upgrade-btn--available */
 
 .o-infinity-upgrade-btn--available:hover {
   background-color: #a53b98;
@@ -3542,9 +3677,9 @@ screen and (max-width: 480px) {
   background-color: #9c27b0;
 }
 
-/*#endregion o-infinity-upgrade-btn--available*/
+/* #endregion o-infinity-upgrade-btn--available */
 
-/*#region o-infinity-upgrade-btn--color-2*/
+/* #region o-infinity-upgrade-btn--color-2 */
 
 .o-infinity-upgrade-btn--color-2.o-infinity-upgrade-btn--available:hover {
   background-color: #ff3300;
@@ -3560,9 +3695,9 @@ screen and (max-width: 480px) {
   background-color: #f44336;
 }
 
-/*#endregion o-infinity-upgrade-btn--color-2*/
+/* #endregion o-infinity-upgrade-btn--color-2 */
 
-/*#region o-infinity-upgrade-btn--color-3*/
+/* #region o-infinity-upgrade-btn--color-3 */
 
 .o-infinity-upgrade-btn--color-3.o-infinity-upgrade-btn--available:hover {
   background-color: #c6d50d;
@@ -3578,9 +3713,9 @@ screen and (max-width: 480px) {
   background-color: #ffeb3b;
 }
 
-/*#endregion o-infinity-upgrade-btn--color-3*/
+/* #endregion o-infinity-upgrade-btn--color-3 */
 
-/*#region o-infinity-upgrade-btn--color-4*/
+/* #region o-infinity-upgrade-btn--color-4 */
 
 .o-infinity-upgrade-btn--color-4.o-infinity-upgrade-btn--available:hover {
   background-color: #0cfec5;
@@ -3596,13 +3731,12 @@ screen and (max-width: 480px) {
   background-color: #00bcd4;
 }
 
-/*#endregion o-infinity-upgrade-btn--color-4*/
-
-/*#region o-infinity-upgrade-btn--multiplier*/
+/* #endregion o-infinity-upgrade-btn--color-4 */
 
+/* #region o-infinity-upgrade-btn--multiplier */
 
 .o-infinity-upgrade-btn--multiplier.c-pelle-useless--available {
-  filter: grayscale(25%)
+  filter: grayscale(25%);
 }
 
 .o-infinity-upgrade-btn--multiplier.o-infinity-upgrade-btn--useless-available {
@@ -3659,9 +3793,9 @@ screen and (max-width: 480px) {
   color: black;
 }
 
-/*#endregion o-infinity-upgrade-btn--multiplier*/
+/* #endregion o-infinity-upgrade-btn--multiplier */
 
-/*#region o-infinity-upgrade-btn--unavailable*/
+/* #region o-infinity-upgrade-btn--unavailable */
 
 .o-infinity-upgrade-btn--useless-unavailable {
   color: #f7f7f7;
@@ -3690,7 +3824,7 @@ screen and (max-width: 480px) {
 }
 
 .t-dark .o-infinity-upgrade-btn--unavailable:hover {
-  background-color: #37474F;
+  background-color: #37474f;
 }
 
 .s-base--metro .o-infinity-upgrade-btn--unavailable {
@@ -3721,12 +3855,12 @@ screen and (max-width: 480px) {
 
 .t-s6 .o-infinity-upgrade-btn--unavailable:hover,
 .t-s10 .o-infinity-upgrade-btn--unavailable:hover {
-  background-color: #222;
+  background-color: #222222;
 }
 
-/*#endregion o-infinity-upgrade-btn--unavailable*/
+/* #endregion o-infinity-upgrade-btn--unavailable */
 
-/*#region o-infinity-upgrade-btn--bought*/
+/* #region o-infinity-upgrade-btn--bought */
 
 .o-infinity-upgrade-btn--bought {
   color: black;
@@ -3749,7 +3883,7 @@ screen and (max-width: 480px) {
   color: black;
 }
 
-/*#endregion o-infinity-upgrade-btn--bought*/
+/* #endregion o-infinity-upgrade-btn--bought */
 
 .o-infinity-upgrade-btn--chargeable {
   color: var(--color-teresa--base);
@@ -3769,15 +3903,15 @@ screen and (max-width: 480px) {
 }
 
 @keyframes a-charged-infinity-upgrade-glow {
-  0%   { box-shadow: inset 0 0 2rem 0}
-  13%  { box-shadow: inset 0 0 2rem 0.15rem}
-  25%  { box-shadow: inset 0 0 2rem 0.4rem}
-  38%  { box-shadow: inset 0 0 2rem 0.65rem}
-  50%  { box-shadow: inset 0 0 2rem 0.8rem}
-  63%  { box-shadow: inset 0 0 2rem 0.65rem}
-  75%  { box-shadow: inset 0 0 2rem 0.4rem}
-  88%  { box-shadow: inset 0 0 2rem 0.15rem}
-  100% { box-shadow: inset 0 0 2rem 0}
+  0% { box-shadow: inset 0 0 2rem 0; }
+  13% { box-shadow: inset 0 0 2rem 0.15rem; }
+  25% { box-shadow: inset 0 0 2rem 0.4rem; }
+  38% { box-shadow: inset 0 0 2rem 0.65rem; }
+  50% { box-shadow: inset 0 0 2rem 0.8rem; }
+  63% { box-shadow: inset 0 0 2rem 0.65rem; }
+  75% { box-shadow: inset 0 0 2rem 0.4rem; }
+  88% { box-shadow: inset 0 0 2rem 0.15rem; }
+  100% { box-shadow: inset 0 0 2rem 0; }
 }
 
 .o-infinity-upgrade-btn--charged {
@@ -3796,13 +3930,13 @@ screen and (max-width: 480px) {
   color: var(--color-teresa--accent);
 }
 
-/*#endregion o-infinity-upgrade-btn*/
+/* #endregion o-infinity-upgrade-btn */
 
-/*#endregion Infinity Upgrades*/
+/* #endregion Infinity Upgrades */
 
-/*#region Autobuyers*/
+/* #region Autobuyers */
 
-/*#region l-autobuyers-tab*/
+/* #region l-autobuyers-tab */
 
 .l-autobuyers-tab {
   display: flex;
@@ -3815,9 +3949,9 @@ screen and (max-width: 480px) {
   text-align: center;
 }
 
-/*#endregion l-autobuyers-tab*/
+/* #endregion l-autobuyers-tab */
 
-/*#region l-autobuyer-grid*/
+/* #region l-autobuyer-grid */
 
 .l-autobuyer-grid {
   display: flex;
@@ -3830,9 +3964,9 @@ screen and (max-width: 480px) {
   justify-content: center;
 }
 
-/*#endregion l-autobuyer-grid*/
+/* #endregion l-autobuyer-grid */
 
-/*#region o-autobuyer-input*/
+/* #region o-autobuyer-input */
 
 .o-autobuyer-input {
   font-size: 1.3rem;
@@ -3845,12 +3979,12 @@ screen and (max-width: 480px) {
 
 .t-metro .o-autobuyer-input {
   color: black;
-  border-color: #A9A9A9;
+  border-color: #a9a9a9;
 }
 
 .t-dark .o-autobuyer-input,
 .t-dark-metro .o-autobuyer-input {
-  background-color: #455A64;
+  background-color: #455a64;
   border-color: black;
 }
 
@@ -3863,7 +3997,7 @@ screen and (max-width: 480px) {
 .t-s10 .o-autobuyer-input {
   color: white;
   background-color: black;
-  border-color: #ccc;
+  border-color: #cccccc;
 }
 
 .o-autobuyer-input--invalid {
@@ -3875,15 +4009,16 @@ screen and (max-width: 480px) {
   background-color: var(--color-bad);
 }
 
-/*#endregion o-autobuyer-input*/
+/* #endregion o-autobuyer-input */
 
-/*#region o-autobuyer-toggle-checkbox*/
+/* #region o-autobuyer-toggle-checkbox */
 
 .o-autobuyer-toggle-checkbox {
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -3901,6 +4036,7 @@ screen and (max-width: 480px) {
   color: black;
   font-weight: bold;
   cursor: pointer;
+  -webkit-user-select: none;
   user-select: none;
   transition-duration: 0.2s;
 }
@@ -3923,7 +4059,7 @@ screen and (max-width: 480px) {
 
 .t-s6 .o-autobuyer-toggle-checkbox__label,
 .t-s10 .o-autobuyer-toggle-checkbox__label {
-  border-color: #ccc;
+  border-color: #cccccc;
 }
 
 .o-autobuyer-toggle-checkbox__label:hover {
@@ -3951,9 +4087,9 @@ screen and (max-width: 480px) {
   background: var(--color-bad);
 }
 
-/*#endregion o-autobuyer-toggle-checkbox*/
+/* #endregion o-autobuyer-toggle-checkbox */
 
-/*#region o-autobuyer-btn*/
+/* #region o-autobuyer-btn */
 
 .o-autobuyer-btn {
   width: 17.5rem;
@@ -3985,7 +4121,7 @@ screen and (max-width: 480px) {
 .t-dark .o-autobuyer-btn {
   color: black;
   border-color: black;
-  background: #455A64;
+  background: #455a64;
 }
 
 .t-dark .o-autobuyer-btn:hover {
@@ -4026,9 +4162,9 @@ screen and (max-width: 480px) {
   width: 90%;
 }
 
-/*#endregion o-autobuyer-btn*/
+/* #endregion o-autobuyer-btn */
 
-/*#region autobuyer-box*/
+/* #region autobuyer-box */
 
 .c-autobuyer-box {
   width: 23rem;
@@ -4046,7 +4182,7 @@ screen and (max-width: 480px) {
 }
 
 .t-s5 .c-autobuyer-box {
-  background: #ddd;
+  background: #dddddd;
 }
 
 .t-s8 .c-autobuyer-box {
@@ -4068,13 +4204,13 @@ screen and (max-width: 480px) {
 
 .t-metro .c-autobuyer-box__mode-select {
   color: black;
-  border: 0.1rem solid #A9A9A9;
+  border: 0.1rem solid #a9a9a9;
 }
 
 .t-dark .c-autobuyer-box__mode-select,
 .t-dark-metro .c-autobuyer-box__mode-select {
   color: black;
-  background-color: #455A64;
+  background-color: #455a64;
   border: 0.1rem solid black;
 }
 
@@ -4087,7 +4223,7 @@ screen and (max-width: 480px) {
 .t-s10 .c-autobuyer-box__mode-select {
   color: white;
   background-color: black;
-  border: 0.1rem solid #ccc;
+  border: 0.1rem solid #cccccc;
 }
 
 .l-autobuyer-box {
@@ -4105,7 +4241,7 @@ screen and (max-width: 480px) {
   color: var(--color-text);
   border: var(--var-border-width, 0.2rem) solid #383232;
   border-radius: var(--var-border-radius, 0.5rem);
-  margin: .5rem;
+  margin: 0.5rem;
   padding: 1rem;
   width: 90rem;
 }
@@ -4129,7 +4265,7 @@ screen and (max-width: 480px) {
 
 .t-s6 .c-autobuyer-box-row,
 .t-s10 .c-autobuyer-box-row {
-  border: 0.1rem solid #ccc;
+  border: 0.1rem solid #cccccc;
   background: black;
 }
 
@@ -4156,9 +4292,9 @@ screen and (max-width: 480px) {
 .c-autobuyer-box-slot {
   position: relative;
   border: var(--var-border-width, 0.2rem) solid #383232;
-  border-radius: var(--var-border-radius, .5rem);
-  margin: .25rem;
-  padding: 1rem .5rem;
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin: 0.25rem;
+  padding: 1rem 0.5rem;
 }
 
 .s-base--metro .c-autobuyer-box-slot {
@@ -4180,7 +4316,7 @@ screen and (max-width: 480px) {
 
 .t-s6 .c-autobuyer-box-slot,
 .t-s10 .c-autobuyer-box-slot {
-  border: 0.1rem solid #ccc;
+  border: 0.1rem solid #cccccc;
   background: black;
 }
 
@@ -4188,12 +4324,14 @@ screen and (max-width: 480px) {
   background: white;
 }
 
+/* stylelint-disable selector-class-pattern */
 .c-autobuyer-box-row__intervalSlot,
 .c-autobuyer-box-row__toggleSlot,
 .c-autobuyer-box-row__checkboxSlot,
 .l-autobuyer-box__header {
   width: 25%;
 }
+/* stylelint-enable selector-class-pattern */
 
 .l-autobuyer-box__title {
   width: 20rem;
@@ -4244,21 +4382,22 @@ screen and (max-width: 480px) {
   flex-grow: 1;
 }
 
-/*#endregion autobuyer-box*/
+/* #endregion autobuyer-box */
 
-/*#endregion Autobuyers*/
+/* #endregion Autobuyers */
 
-/*#region Replicanti*/
+/* #region Replicanti */
 
 .l-replicanti-tab {
   display: flex;
   flex-direction: column;
   align-items: center;
-  /* To prevent button jitter*/
+
+  /* To prevent button jitter */
   width: 100%;
 }
 
-/*#region c-replicanti-description*/
+/* #region c-replicanti-description */
 
 .c-replicanti-description {
   font-size: 1.5rem;
@@ -4282,7 +4421,7 @@ screen and (max-width: 480px) {
 
 .t-metro .c-replicanti-description__accent,
 .t-s8 .c-replicanti-description__accent {
-  text-shadow: 0 0 0.1rem rgba(0, 0, 0, 0.5), -0.1rem 0.1rem 0.1rem black;
+  text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;
 }
 
 .t-dark .c-replicanti-description__accent,
@@ -4291,7 +4430,7 @@ screen and (max-width: 480px) {
   text-shadow: 0 0 0.7rem #03a9f4;
 }
 
-/*#endregion c-replicanti-description*/
+/* #endregion c-replicanti-description */
 
 .l-replicanti-upgrade-row {
   display: flex;
@@ -4302,11 +4441,11 @@ screen and (max-width: 480px) {
   margin: 0.3rem;
 }
 
-/*#endregion Replicanti*/
+/* #endregion Replicanti */
 
-/*#region Break Infinity*/
+/* #region Break Infinity */
 
-/*#region l-break-infinity-tab*/
+/* #region l-break-infinity-tab */
 
 .l-break-infinity-tab {
   display: flex;
@@ -4327,9 +4466,9 @@ screen and (max-width: 480px) {
   margin-top: 1rem;
 }
 
-/*#endregion l-break-infinity-tab*/
+/* #endregion l-break-infinity-tab */
 
-/*#region l-break-infinity-upgrade-grid*/
+/* #region l-break-infinity-upgrade-grid */
 
 .l-break-infinity-upgrade-grid {
   display: flex;
@@ -4345,11 +4484,11 @@ screen and (max-width: 480px) {
   margin: 0.5rem 0.8rem;
 }
 
-/*#endregion l-break-infinity-upgrade-grid*/
+/* #endregion l-break-infinity-upgrade-grid */
 
-/*#endregion Break Infinity*/
+/* #endregion Break Infinity */
 
-/*#region eternity-tab*/
+/* #region eternity-tab */
 
 .c-eternity-tab__header {
   font-size: 1.5rem;
@@ -4360,9 +4499,9 @@ screen and (max-width: 480px) {
   color: var(--color-eternity);
 }
 
-/*#region themes*/
+/* #region themes */
 
-/*#region t-dark t-s6 t-s10*/
+/* #region t-dark t-s6 t-s10 */
 
 .t-dark .c-eternity-tab__eternity-points,
 .t-s6 .c-eternity-tab__eternity-points,
@@ -4370,21 +4509,21 @@ screen and (max-width: 480px) {
   text-shadow: 0 0 0.7rem;
 }
 
-/*#endregion t-dark t-s6 t-s10*/
+/* #endregion t-dark t-s6 t-s10 */
 
-/*#region t-s1*/
+/* #region t-s1 */
 
 .t-s1 .c-eternity-tab__eternity-points {
   text-shadow: 0.1rem 0.1rem 0 black;
 }
 
-/*#endregion t-s1*/
+/* #endregion t-s1 */
 
-/*#endregion themes*/
+/* #endregion themes */
 
-/*#endregion eternity-tab*/
+/* #endregion eternity-tab */
 
-/*#region Eternity Upgrades*/
+/* #region Eternity Upgrades */
 
 .l-eternity-upgrades-grid {
   display: flex;
@@ -4422,7 +4561,7 @@ screen and (max-width: 480px) {
 
 .o-eternity-upgrade--useless-available:hover {
   background-color: var(--color-pelle--secondary);
-  color:black;
+  color: black;
 }
 
 .o-eternity-upgrade--useless-unavailable {
@@ -4435,7 +4574,7 @@ screen and (max-width: 480px) {
 .o-eternity-upgrade--useless-unavailable:hover {
   background-color: var(--color-bad);
   filter: grayscale(0%);
-  cursor:default
+  cursor: default;
 }
 
 .o-eternity-upgrade--available {
@@ -4553,9 +4692,9 @@ screen and (max-width: 480px) {
   background: #636363;
 }
 
-/*#endregion Eternity Upgrades*/
+/* #endregion Eternity Upgrades */
 
-/*#region Eternity Milestones*/
+/* #region Eternity Milestones */
 
 .l-eternity-milestone-grid {
   display: flex;
@@ -4623,9 +4762,9 @@ screen and (max-width: 480px) {
   flex-direction: column;
 }
 
-/*#endregion Eternity Milestones*/
+/* #endregion Eternity Milestones */
 
-/*#region Dilation*/
+/* #region Dilation */
 
 .l-dilation-tab {
   display: flex;
@@ -4633,7 +4772,7 @@ screen and (max-width: 480px) {
   align-items: center;
 }
 
-/*#region c-dilation-tab*/
+/* #region c-dilation-tab */
 
 .c-dilation-tab__tachyons {
   color: black;
@@ -4667,8 +4806,8 @@ screen and (max-width: 480px) {
 }
 
 .t-dark .c-dilation-tab__tachyons,
-.t-s6  .c-dilation-tab__tachyons,
-.t-s10  .c-dilation-tab__tachyons {
+.t-s6 .c-dilation-tab__tachyons,
+.t-s10 .c-dilation-tab__tachyons {
   text-shadow: 0 0 0.7rem #64ddad;
 }
 
@@ -4682,7 +4821,7 @@ screen and (max-width: 480px) {
 .t-s8 .c-dilation-tab__dilated-time-income,
 .t-s8 .c-dilation-tab__galaxy-threshold,
 .t-s8 .c-dilation-tab__galaxies {
-  text-shadow: 0 0 0.1rem rgba(0, 0, 0, 0.5), -0.1rem 0.1rem 0.1rem black;
+  text-shadow: 0 0 0.1rem rgba(0, 0, 0, 50%), -0.1rem 0.1rem 0.1rem black;
 }
 
 .t-metro .c-dilation-tab__dilated-time,
@@ -4715,9 +4854,9 @@ screen and (max-width: 480px) {
   text-shadow: 0 0 0.7rem var(--color-dilation);
 }
 
-/*#endregion c-dilation-tab*/
+/* #endregion c-dilation-tab */
 
-/*#region l-dilation-upgrades-grid*/
+/* #region l-dilation-upgrades-grid */
 
 .l-dilation-upgrades-grid {
   display: flex;
@@ -4734,9 +4873,9 @@ screen and (max-width: 480px) {
   margin: 1.2rem 1.5rem;
 }
 
-/*#endregion l-dilation-upgrades-grid*/
+/* #endregion l-dilation-upgrades-grid */
 
-/*#region o-dilation-btn*/
+/* #region o-dilation-btn */
 
 .o-dilation-btn {
   font-weight: bold;
@@ -4792,7 +4931,7 @@ screen and (max-width: 480px) {
 .t-s1 .o-dilation-btn--locked {
   color: black;
   background-color: #9e9e9e;
-  box-shadow: .1rem .1rem .1rem 0 black;
+  box-shadow: 0.1rem 0.1rem 0.1rem 0 black;
   border: none;
 }
 
@@ -4824,40 +4963,40 @@ screen and (max-width: 480px) {
 }
 
 @keyframes a-dilation-btn-glow {
-  0%   { box-shadow: inset 0.5rem  0       2rem }
-  25%  { box-shadow: inset 0       0.5rem  2rem }
-  50%  { box-shadow: inset -0.5rem 0       2rem }
-  75%  { box-shadow: inset 0       -0.5rem 2rem }
-  100% { box-shadow: inset 0.5rem  0       2rem }
+  0% { box-shadow: inset 0.5rem  0       2rem; }
+  25% { box-shadow: inset 0       0.5rem  2rem; }
+  50% { box-shadow: inset -0.5rem 0       2rem; }
+  75% { box-shadow: inset 0       -0.5rem 2rem; }
+  100% { box-shadow: inset 0.5rem  0       2rem; }
 }
 
 @keyframes a-dilation-btn-glow--cancer {
-  0%   { box-shadow: inset  0.5px -0.5rem 2rem }
-  10%  { box-shadow: inset -0.5px  0.5rem 2rem }
-  20%  { box-shadow: inset  0.5px -0.5rem 2rem }
-  22%  { box-shadow: inset -0.5px  0.5rem 2rem }
-  25%  { box-shadow: inset  0.5px -0.5rem 2rem }
-  29%  { box-shadow: inset -0.5px  0.5rem 2rem }
-  39%  { box-shadow: inset  0.5px -0.5rem 2rem }
-  44%  { box-shadow: inset -0.5px  0.5rem 2rem }
-  53%  { box-shadow: inset  0.5px -0.5rem 2rem }
-  57%  { box-shadow: inset -0.5px  0.5rem 2rem }
-  63%  { box-shadow: inset  0.5px -0.5rem 2rem }
-  69%  { box-shadow: inset -0.5px  0.5rem 2rem }
-  71%  { box-shadow: inset  0.5px -0.5rem 2rem }
-  74%  { box-shadow: inset -0.5px  0.5rem 2rem }
-  75%  { box-shadow: inset  0.5px -0.5rem 2rem }
-  84%  { box-shadow: inset -0.5px  0.5rem 2rem }
-  88%  { box-shadow: inset  0.5px -0.5rem 2rem }
-  92%  { box-shadow: inset -0.5px  0.5rem 2rem }
-  93%  { box-shadow: inset  0.5px -0.5rem 2rem }
-  95%  { box-shadow: inset -0.5px  0.5rem 2rem }
-  100% { box-shadow: inset  0.5px -0.5rem 2rem }
+  0% { box-shadow: inset  0.5px -0.5rem 2rem; }
+  10% { box-shadow: inset -0.5px  0.5rem 2rem; }
+  20% { box-shadow: inset  0.5px -0.5rem 2rem; }
+  22% { box-shadow: inset -0.5px  0.5rem 2rem; }
+  25% { box-shadow: inset  0.5px -0.5rem 2rem; }
+  29% { box-shadow: inset -0.5px  0.5rem 2rem; }
+  39% { box-shadow: inset  0.5px -0.5rem 2rem; }
+  44% { box-shadow: inset -0.5px  0.5rem 2rem; }
+  53% { box-shadow: inset  0.5px -0.5rem 2rem; }
+  57% { box-shadow: inset -0.5px  0.5rem 2rem; }
+  63% { box-shadow: inset  0.5px -0.5rem 2rem; }
+  69% { box-shadow: inset -0.5px  0.5rem 2rem; }
+  71% { box-shadow: inset  0.5px -0.5rem 2rem; }
+  74% { box-shadow: inset -0.5px  0.5rem 2rem; }
+  75% { box-shadow: inset  0.5px -0.5rem 2rem; }
+  84% { box-shadow: inset -0.5px  0.5rem 2rem; }
+  88% { box-shadow: inset  0.5px -0.5rem 2rem; }
+  92% { box-shadow: inset -0.5px  0.5rem 2rem; }
+  93% { box-shadow: inset  0.5px -0.5rem 2rem; }
+  95% { box-shadow: inset -0.5px  0.5rem 2rem; }
+  100% { box-shadow: inset  0.5px -0.5rem 2rem; }
 }
 
-/*#endregion o-dilation-btn*/
+/* #endregion o-dilation-btn */
 
-/*#region o-dilation-upgrade*/
+/* #region o-dilation-upgrade */
 
 .o-dilation-upgrade {
   background: black;
@@ -4905,7 +5044,8 @@ screen and (max-width: 480px) {
   background-color: white;
 }
 
-.o-dilation-upgrade--bought,  .o-dilation-upgrade--capped {
+.o-dilation-upgrade--bought,
+.o-dilation-upgrade--capped {
   color: black;
   background-color: var(--color-dilation);
   border-color: black;
@@ -4921,7 +5061,7 @@ screen and (max-width: 480px) {
 .o-dilation-upgrade--useless-unavailable:hover {
   background-color: var(--color-bad);
   filter: grayscale(0%);
-  cursor:default
+  cursor: default;
 }
 
 .o-dilation-upgrade--unavailable {
@@ -4976,7 +5116,8 @@ screen and (max-width: 480px) {
   color: #64ddad;
 }
 
-.t-dark .o-dilation-upgrade--bought, .t-dark .o-dilation-upgrade--capped {
+.t-dark .o-dilation-upgrade--bought,
+.t-dark .o-dilation-upgrade--capped {
   background-color: var(--color-dilation);
 }
 
@@ -5010,9 +5151,7 @@ screen and (max-width: 480px) {
   background: var(--color-dilation);
 }
 
-/*#endregion o-dilation-upgrade*/
-
-
+/* #endregion o-dilation-upgrade */
 
 .c-tachyon-particle-container {
   position: fixed;
@@ -5031,20 +5170,22 @@ screen and (max-width: 480px) {
   fill: white;
 }
 
-/*#endregion Dilation*/
+/* #endregion Dilation */
 
-/*#region Modals*/
+/* #region Modals */
 
 @keyframes a-modal-overlay-fadein {
-  from {background-color: rgba(0,0,0,0); }
-  to {background-color: rgba(60, 60, 100, 0.5);}
+  from { background-color: rgba(0, 0, 0, 0%); }
+  to { background-color: rgba(60, 60, 100, 50%); }
 }
 
 .l-modal-overlay {
   position: fixed;
   left: 0;
   top: 0;
+  /* stylelint-disable-next-line unit-allowed-list */
   width: 100vw;
+  /* stylelint-disable-next-line unit-allowed-list */
   height: 100vh;
   z-index: 6;
   animation-name: a-modal-overlay-fadein;
@@ -5061,7 +5202,7 @@ screen and (max-width: 480px) {
   display: inline-block;
 }
 
-/*#region c-modal*/
+/* #region c-modal */
 
 .c-modal {
   color: var(--color-text);
@@ -5115,6 +5256,7 @@ screen and (max-width: 480px) {
   border: var(--var-border-width, 0.3rem) solid black;
   border-radius: var(--var-border-radius, 0.3rem);
   color: black;
+  -webkit-user-select: none;
   user-select: none;
   transition-duration: 0.2s;
   position: relative;
@@ -5166,7 +5308,7 @@ screen and (max-width: 480px) {
   border: 0.1rem solid #1b5e20;
 }
 
-.c-modal__confirmation-toggle__tooltip:after {
+.c-modal__confirmation-toggle__tooltip::after {
   position: absolute;
   bottom: 0;
   left: 50%;
@@ -5190,12 +5332,12 @@ screen and (max-width: 480px) {
   bottom: calc(100% + 0.7rem);
 }
 
-.c-modal__confirmation-toggle:hover .c-modal__confirmation-toggle__tooltip:after {
+.c-modal__confirmation-toggle:hover .c-modal__confirmation-toggle__tooltip::after {
   border-top-width: 0.6rem;
   margin-bottom: -0.8rem;
 }
 
-.s-base--metro .c-modal__confirmation-toggle:hover .c-modal__confirmation-toggle__tooltip:after {
+.s-base--metro .c-modal__confirmation-toggle:hover .c-modal__confirmation-toggle__tooltip::after {
   margin-bottom: -0.7rem;
 }
 
@@ -5212,9 +5354,9 @@ screen and (max-width: 480px) {
   background-color: var(--color-good-dark) !important;
 }
 
-/*#region themes*/
+/* #region themes */
 
-/*#region t-dark t-dark-metro*/
+/* #region t-dark t-dark-metro */
 
 .t-dark .c-modal {
   box-shadow: 0 0 1.5rem 0 black;
@@ -5226,13 +5368,13 @@ screen and (max-width: 480px) {
 
 .t-dark h3,
 .t-dark-metro h3 {
-  color: #999;
-  text-shadow: -0.1rem 0.1rem 0 rgba(0, 0, 0, 0.5);
+  color: #999999;
+  text-shadow: -0.1rem 0.1rem 0 rgba(0, 0, 0, 50%);
 }
 
-/*#endregion t-dark t-dark-metro*/
+/* #endregion t-dark t-dark-metro */
 
-/*#region t-s6 t-s10*/
+/* #region t-s6 t-s10 */
 
 .t-s6 .c-modal,
 .t-s10 .c-modal {
@@ -5240,27 +5382,27 @@ screen and (max-width: 480px) {
   box-shadow: 0 0 1.5rem 0 black;
 }
 
-/*#endregion t-s6 t-s10*/
+/* #endregion t-s6 t-s10 */
 
-/*#region t-s7*/
+/* #region t-s7 */
 
 .t-s7 .c-modal {
   filter: saturate(0);
 }
 
-/*#endregion t-s7*/
+/* #endregion t-s7 */
 
-/*#region t-s8*/
+/* #region t-s8 */
 
 .t-s8 h3 {
   color: black;
 }
 
-/*#endregion t-s8*/
+/* #endregion t-s8 */
 
-/*#endregion themes*/
+/* #endregion themes */
 
-/*#endregion c-modal*/
+/* #endregion c-modal */
 
 .l-modal-content--centered {
   display: flex;
@@ -5269,7 +5411,7 @@ screen and (max-width: 480px) {
   align-items: center;
 }
 
-/*#region c-modal-message*/
+/* #region c-modal-message */
 
 .c-modal-message {
   min-width: 50rem;
@@ -5283,9 +5425,9 @@ screen and (max-width: 480px) {
   margin: 1rem 0.5rem 0;
 }
 
-/*#endregion c-modal-message*/
+/* #endregion c-modal-message */
 
-/*#region c-modal-hard-reset*/
+/* #region c-modal-hard-reset */
 
 .c-modal-hard-reset-danger {
   color: var(--color-bad);
@@ -5304,9 +5446,9 @@ screen and (max-width: 480px) {
   width: 45rem;
 }
 
-/*#endregion c-modal-hard-reset*/
+/* #endregion c-modal-hard-reset */
 
-/*#region c-modal-away-progress*/
+/* #region c-modal-away-progress */
 
 .c-modal-away-progress {
   display: flex;
@@ -5317,10 +5459,10 @@ screen and (max-width: 480px) {
 
 .t-dark .c-modal-away-progress {
   text-shadow:
-  0 0 0.2rem black,
-  0 0 0.2rem black,
-  0 0 0.2rem black,
-  0 0 0.2rem black;
+    0 0 0.2rem black,
+    0 0 0.2rem black,
+    0 0 0.2rem black,
+    0 0 0.2rem black;
 }
 
 .c-modal-away-progress__header {
@@ -5353,7 +5495,7 @@ screen and (max-width: 480px) {
 .c-modal-away-progress__dimension-boosts,
 .c-modal-away-progress__antimatter-galaxies,
 .c-modal-away-progress__antimatter {
-  color: var(--color-antimatter)
+  color: var(--color-antimatter);
 }
 
 .t-dark .c-modal-away-progress__antimatter,
@@ -5376,13 +5518,13 @@ screen and (max-width: 480px) {
 .c-modal-away-progress__tachyon-galaxies,
 .c-modal-away-progress__dilated-time {
   color: var(--color-dilation);
-  filter: brightness(0.8)
+  filter: brightness(0.8);
 }
 
 .t-dark .c-modal-away-progress__tachyon-particles,
 .t-dark .c-modal-away-progress__tachyon-galaxies,
 .t-dark .c-modal-away-progress__dilated-time {
-  filter: none
+  filter: none;
 }
 
 .c-modal-away-progress__realities,
@@ -5439,15 +5581,15 @@ screen and (max-width: 480px) {
 .t-dark .c-modal-away-progress__effarig-memories,
 .t-dark .c-modal-away-progress__enslaved-memories,
 .t-dark .c-modal-away-progress__v-memories {
-  filter: none
+  filter: none;
 }
 
 .c-modal-away-progress__black-hole b,
 .c-modal-away-progress__black-hole {
   color: black;
   text-shadow:
-  0 0 0.2rem #e67919,
-  0 0 0.3rem #e67919;
+    0 0 0.2rem #e67919,
+    0 0 0.3rem #e67919;
 }
 
 .c-modal-away-progress__reality-shards {
@@ -5463,9 +5605,9 @@ screen and (max-width: 480px) {
   animation: none;
 }
 
-/*#endregion c-modal-away-progress*/
+/* #endregion c-modal-away-progress */
 
-/*#region c-modal-import*/
+/* #region c-modal-import */
 
 .c-modal-import__save-info > div {
   margin-top: 0.2rem;
@@ -5479,9 +5621,9 @@ screen and (max-width: 480px) {
   width: 45rem;
 }
 
-/*#endregion c-modal-import*/
+/* #endregion c-modal-import */
 
-/*#region c-modal-import-tree*/
+/* #region c-modal-import-tree */
 
 .c-modal-import-tree {
   width: 48rem;
@@ -5504,11 +5646,11 @@ screen and (max-width: 480px) {
   margin-top: 0.3rem;
 }
 
-/*#endregion c-modal-import-tree*/
+/* #endregion c-modal-import-tree */
 
 .c-modal-input {
   border: 0.1rem solid black;
-  background-color: #F2F2F2;
+  background-color: #f2f2f2;
   border-radius: var(--var-border-radius, 0.3rem);
   text-align: center;
 }
@@ -5521,7 +5663,8 @@ screen and (max-width: 480px) {
   width: 50rem;
 }
 
-.c-modal-options .o-primary-btn--option, .o-primary-btn--option-wide {
+.c-modal-options .o-primary-btn--option,
+.o-primary-btn--option-wide {
   padding: 0.5rem;
   margin: 0.5rem;
 }
@@ -5536,7 +5679,7 @@ screen and (max-width: 480px) {
   justify-content: center;
 }
 
-/*#region l-modal-options*/
+/* #region l-modal-options */
 
 .l-modal-options {
   display: flex;
@@ -5552,7 +5695,7 @@ screen and (max-width: 480px) {
   margin-bottom: 1rem;
 }
 
-/*#endregion l-modal-options*/
+/* #endregion l-modal-options */
 
 .l-modal-store-content {
   display: flex;
@@ -5587,7 +5730,7 @@ screen and (max-width: 480px) {
   padding: 0.8rem;
   border: none;
   background: burlywood;
-  border-radius: var(--var-border-radius, .5rem);
+  border-radius: var(--var-border-radius, 0.5rem);
   font-family: Typewriter;
   font-size: 2rem;
   cursor: pointer;
@@ -5607,7 +5750,7 @@ screen and (max-width: 480px) {
   margin-left: 1rem;
 }
 
-/*#region c-modal-hotkeys*/
+/* #region c-modal-hotkeys */
 
 .c-modal-hotkeys {
   font-size: 1.25rem;
@@ -5656,13 +5799,14 @@ kbd {
   box-shadow: inset 0 -0.1rem 0 #c6cbd1;
   color: #444d56;
   display: inline-block;
-  font: 1.1rem SFMono-Regular,Consolas,Liberation Mono,Menlo,Courier,monospace;
+  font: 1.1rem SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, monospace;
   line-height: 1rem;
   padding: 0.3rem 0.5rem;
   vertical-align: middle;
 }
 
-.t-dark kbd, .t-dark-metro kbd {
+.t-dark kbd,
+.t-dark-metro kbd {
   background-color: #212b36;
   border-color: #464e58;
   border-bottom-color: #4f5863;
@@ -5670,7 +5814,7 @@ kbd {
   color: #a9b3bc;
 }
 
-/*#endregion c-modal-hotkeys*/
+/* #endregion c-modal-hotkeys */
 
 .l-modal-split-preferences {
   display: flex;
@@ -5685,7 +5829,9 @@ kbd {
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
+  /* stylelint-disable-next-line unit-allowed-list */
   left: 50vw;
+  /* stylelint-disable-next-line unit-allowed-list */
   top: 50vh;
   width: 30rem;
   height: 30rem;
@@ -5783,7 +5929,7 @@ kbd {
   height: 100%;
 }
 
-/*#endregion Modals*/
+/* #endregion Modals */
 
 .l-notification-container {
   display: flex;
@@ -5797,7 +5943,7 @@ kbd {
   z-index: 1000;
 }
 
-/*#region o-notification*/
+/* #region o-notification */
 
 .o-notification {
   padding: 0.8rem 1.5rem;
@@ -5873,10 +6019,10 @@ kbd {
 }
 
 @keyframes a-notification--enter {
-  0%   { transform: translateX(125%) }
-  50%  { transform: translateX(-2rem) }
-  75%  { transform: translateX(1rem) }
-  100% { transform: translateX(0) }
+  0% { transform: translateX(125%); }
+  50% { transform: translateX(-2rem); }
+  75% { transform: translateX(1rem); }
+  100% { transform: translateX(0); }
 }
 
 .a-notification--leave {
@@ -5884,10 +6030,11 @@ kbd {
   transition: transform 0.25s ease-in;
 }
 
-/*#endregion o-notification*/
+/* #endregion o-notification */
 
-/*#region component*/
-/*#endregion component*/
+/* #region component */
+
+/* #endregion component */
 
 .o-celestial-quote-history {
   display: flex;
@@ -5900,7 +6047,7 @@ kbd {
 
 .l-celestial-quote-history__lines {
   font-size: 1.9rem;
-  line-height: 1.6em;
+  line-height: 1.6rem;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -5932,7 +6079,7 @@ kbd {
   opacity: 0.6;
 }
 
-/*#region Teresa tab*/
+/* #region Teresa tab */
 .l-teresa-celestial-tab {
   display: flex;
   flex-direction: column;
@@ -6001,7 +6148,7 @@ kbd {
 }
 
 .c-teresa-milestone-line--attained {
-  background-color: rgba(0, 0, 0, 0.5);
+  background-color: rgba(0, 0, 0, 50%);
 }
 
 .o-teresa-quotes {
@@ -6024,8 +6171,9 @@ kbd {
   width: 20rem;
   border-radius: var(--var-border-radius, 0.5rem);
   padding: 1rem;
-  margin: 0 10rem 1rem 10rem;
+  margin: 0 10rem 1rem;
   transition-duration: 0.15s;
+  -webkit-user-select: none;
   user-select: none;
   background-color: var(--color-teresa--base);
   font-weight: bold;
@@ -6070,29 +6218,40 @@ kbd {
 }
 
 @keyframes a-teresa-run-button__icon--glow {
-  0% {text-shadow: 0.1rem 0.1rem 0.3rem;}
-  50% {text-shadow: 0.1rem 0.1rem 0.8rem;}
-  100% {text-shadow: 0.1rem 0.1rem 0.3rem;}
+  0% { text-shadow: 0.1rem 0.1rem 0.3rem; }
+  50% { text-shadow: 0.1rem 0.1rem 0.8rem; }
+  100% { text-shadow: 0.1rem 0.1rem 0.3rem; }
 }
 
 @keyframes a-teresa-run-button__icon--super-glow {
-  0% {text-shadow: 0.1rem 0.1rem 0.3rem; box-shadow: 0 0 0.3rem var(--color-teresa--base);}
-  50% {text-shadow: 0.1rem 0.1rem 0.9rem; box-shadow: 0 0 1rem var(--color-teresa--base);}
-  100% {text-shadow: 0.1rem 0.1rem 0.3rem; box-shadow: 0 0 0.3rem var(--color-teresa--base);}
+  0% {
+    text-shadow: 0.1rem 0.1rem 0.3rem;
+    box-shadow: 0 0 0.3rem var(--color-teresa--base);
+  }
+
+  50% {
+    text-shadow: 0.1rem 0.1rem 0.9rem;
+    box-shadow: 0 0 1rem var(--color-teresa--base);
+  }
+
+  100% {
+    text-shadow: 0.1rem 0.1rem 0.3rem;
+    box-shadow: 0 0 0.3rem var(--color-teresa--base);
+  }
 }
 
 @keyframes a-teresa-run-button__icon--spin {
-  0% {transform: rotate(61deg);}
-  10% {transform: rotate(322deg);}
-  20% {transform: rotate(235deg);}
-  30% {transform: rotate(222deg);}
-  40% {transform: rotate(105deg);}
-  50% {transform: rotate(33deg);}
-  60% {transform: rotate(103deg);}
-  70% {transform: rotate(158deg);}
-  80% {transform: rotate(41deg);}
-  90% {transform: rotate(73deg);}
-  100% {transform: rotate(61deg);}
+  0% { transform: rotate(61deg); }
+  10% { transform: rotate(322deg); }
+  20% { transform: rotate(235deg); }
+  30% { transform: rotate(222deg); }
+  40% { transform: rotate(105deg); }
+  50% { transform: rotate(33deg); }
+  60% { transform: rotate(103deg); }
+  70% { transform: rotate(158deg); }
+  80% { transform: rotate(41deg); }
+  90% { transform: rotate(73deg); }
+  100% { transform: rotate(61deg); }
 }
 
 .c-teresa-shop {
@@ -6136,7 +6295,7 @@ kbd {
   font-size: 2rem;
   width: 13rem;
   padding: 0.5rem;
-  margin-bottom: 1rem
+  margin-bottom: 1rem;
 }
 
 .c-teresa-pour--unlock-available {
@@ -6144,9 +6303,9 @@ kbd {
 }
 
 @keyframes a-teresa-pour--unlock-available {
-  0% {box-shadow: 0 0 0.3rem var(--color-teresa--base) inset;}
-  50% {box-shadow: 0 0 1rem var(--color-teresa--base) inset;}
-  100% {box-shadow: 0 0 0.3rem var(--color-teresa--base) inset;}
+  0% { box-shadow: 0 0 0.3rem var(--color-teresa--base) inset; }
+  50% { box-shadow: 0 0 1rem var(--color-teresa--base) inset; }
+  100% { box-shadow: 0 0 0.3rem var(--color-teresa--base) inset; }
 }
 
 .s-base--metro .c-teresa-unlock {
@@ -6155,10 +6314,10 @@ kbd {
 
 .c-effarig-relics {
   padding: 20px;
-  font-size: 1.5em;
+  font-size: 1.5rem;
 }
 
-/*#endregion Teresa tab*/
+/* #endregion Teresa tab */
 
 /* #region effarig tab */
 
@@ -6184,7 +6343,7 @@ kbd {
   color: black;
   cursor: default;
   border: var(--var-border-width, 0.2rem) solid black;
-  box-shadow: 0.1rem 0.1rem 0.3rem rgba(0, 0, 0, 0.7);
+  box-shadow: 0.1rem 0.1rem 0.3rem rgba(0, 0, 0, 70%);
 }
 
 .c-effarig-shop-button--available {
@@ -6215,18 +6374,16 @@ kbd {
 .c-effarig-run-button {
   font-size: 10rem;
   font-weight: bold;
+  -webkit-user-select: none;
   user-select: none;
   cursor: pointer;
   transition-duration: 0.2s;
 }
 
-
 .c-effarig-run-button--not-running {
   background-color: var(--color-effarig--base);
   color: white;
   z-index: 0;
-  -webkit-animation: a-effarig-run-button--not-running-glow 2s ease-in-out infinite alternate;
-  -moz-animation: a-effarig-run-button--not-running-glow 2s ease-in-out infinite alternate;
   animation: a-effarig-run-button--not-running-glow 2s ease-in-out infinite alternate;
 }
 
@@ -6237,11 +6394,26 @@ kbd {
 
 @keyframes a-effarig-run-button--not-running-glow {
   from {
-    text-shadow: 0 0 1rem black, 0 0 2rem black, 0 0 3rem #cb1a1a, 0 0 4rem #cb1a1a, 0 0 5rem #cb1a1a, 0 0 6rem #cb1a1a, 0 0 7rem #cb1a1a;
+    text-shadow:
+      0 0 1rem black,
+      0 0 2rem black,
+      0 0 3rem #cb1a1a,
+      0 0 4rem #cb1a1a,
+      0 0 5rem #cb1a1a,
+      0 0 6rem #cb1a1a,
+      0 0 7rem #cb1a1a;
     box-shadow: 0 0 0.5rem #cb1a1a, 0 0 1rem #cb1a1a, 0 0 1.5rem #cb1a1a;
   }
+
   to {
-    text-shadow: 0 0 2rem black, 0 0 3rem #bf0404, 0 0 4rem #bf0404, 0 0 5rem #bf0404, 0 0 6rem #bf0404, 0 0 7rem #bf0404, 0 0 8rem #bf0404;
+    text-shadow:
+      0 0 2rem black,
+      0 0 3rem #bf0404,
+      0 0 4rem #bf0404,
+      0 0 5rem #bf0404,
+      0 0 6rem #bf0404,
+      0 0 7rem #bf0404,
+      0 0 8rem #bf0404;
     box-shadow: 0 0 0.5rem #bf0404, 0 0 1rem #bf0404, 0 0 1.5rem #bf0404, 0 0 2rem #bf0404;
   }
 }
@@ -6249,8 +6421,6 @@ kbd {
 .c-effarig-run-button--running {
   background: black;
   z-index: 0;
-  -webkit-animation: a-effarig-run-button--running-glow 2s infinite alternate;
-  -moz-animation: a-effarig-run-button--running-glow 2s infinite alternate;
   animation: a-effarig-run-button--running-glow 2s infinite alternate;
 }
 
@@ -6265,87 +6435,113 @@ kbd {
 
 .c-effarig-run-button__inner--running {
   background-image: url("../images/noise.png");
-  -webkit-background-clip: text;
   background-clip: text;
-  -webkit-text-fill-color: rgba(255, 0, 0, 0.5);
-  -webkit-animation: a-effarig-run-button--running-noise 15s infinite alternate;
-  -moz-animation: a-effarig-run-button--running-noise 15s infinite alternate;
+  -webkit-text-fill-color: rgba(255, 0, 0, 50%);
   animation: a-effarig-run-button--running-noise 15s infinite alternate;
   position: relative;
 }
 
-
-.c-effarig-run-button__inner--running:after {
+.c-effarig-run-button__inner--running::after {
   background: none;
   content: attr(button-symbol);
   z-index: -1;
   position: absolute;
-  -webkit-animation: a-effarig-run-button__inner--running-glow 2s infinite alternate;
-  -moz-animation: a-effarig-run-button__inner--running-glow 2s infinite alternate;
   animation: a-effarig-run-button__inner--running-glow 2s infinite alternate;
   left: 0;
   top: 0;
 }
 
 @keyframes a-effarig-run-button--running-noise {
-  0%   { -webkit-text-fill-color: rgba(255, 0, 0, 1);  }
-  20%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 1);
+  0% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
+  }
+
+  20% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: -50px 0;
   }
-  22%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 0.5);
+
+  22% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
     background-position: 100px -10px;
   }
-  24%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 1);
+
+  24% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 0 -150px;
   }
-  50%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 1);
+
+  50% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: -50px 0;
   }
-  51%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 0.5);
+
+  51% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
     background-position: 100px -10px;
   }
-  52%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 1);
+
+  52% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 0 -150px;
   }
-  54%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 1);
+
+  54% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 50px 0;
   }
-  56%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 0.5);
+
+  56% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
     background-position: -100px 10px;
   }
-  58%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 1);
+
+  58% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 0 50px;
   }
-  90%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 1);
+
+  90% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 50px 50px;
   }
-  91%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 0.5);
+
+  91% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
     background-position: 100px -110px;
   }
-  92%  {
-    -webkit-text-fill-color: rgba(255, 0, 0, 1);
+
+  92% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 0 70px;
   }
-  100% { -webkit-text-fill-color: rgba(255, 0, 0, 1); }
+
+  100% {
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
+  }
 }
 
 @keyframes a-effarig-run-button--running-glow {
   from {
-    box-shadow: 0 0 0.5rem #c20707 inset, 0 0 1rem #c20707 inset, 0 0 1.5rem #c20707 inset, 0 0 1.5rem #c20707, 0 0 1.5rem #c20707, 0 0 1.5rem #c20707;
+    box-shadow:
+      0 0 0.5rem #c20707 inset,
+      0 0 1rem #c20707 inset,
+      0 0 1.5rem #c20707 inset,
+      0 0 1.5rem #c20707,
+      0 0 1.5rem #c20707,
+      0 0 1.5rem #c20707;
   }
+
   to {
-    box-shadow: 0 0 0.5rem #e21717 inset, 0 0 1rem #e21717 inset, 0 0 1.5rem #e21717 inset, 0 0 1.5rem #e21717, 0 0 1.5rem #e21717, 0 0 1.5rem #e21717, 0 0 2rem #e21717 inset, 0 0 2rem #e21717;
+    box-shadow:
+      0 0 0.5rem #e21717 inset,
+      0 0 1rem #e21717 inset,
+      0 0 1.5rem #e21717 inset,
+      0 0 1.5rem #e21717,
+      0 0 1.5rem #e21717,
+      0 0 1.5rem #e21717,
+      0 0 2rem #e21717 inset,
+      0 0 2rem #e21717;
   }
 }
 
@@ -6353,6 +6549,7 @@ kbd {
   from {
     text-shadow: 0 0 0.5rem #a20707, 0 0 1rem #a20707, 0 0 1.5rem #a20707;
   }
+
   to {
     text-shadow: 0 0 0.5rem #c21717, 0 0 1rem #c21717, 0 0 1.5rem #c21717, 0 0 2rem #c21717;
   }
@@ -6366,7 +6563,7 @@ kbd {
 
 .l-effarig-run-button__fg {
   position: relative;
-  background-color: rgba(0, 0, 0, 0);
+  background-color: rgba(0, 0, 0, 0%);
 }
 
 .l-effarig-shop {
@@ -6429,7 +6626,7 @@ kbd {
   border-width: 0.1rem;
 }
 
-/* #endregion effarig tab*/
+/* #endregion effarig tab */
 
 /* #startregion enslaved tab */
 
@@ -6469,7 +6666,8 @@ kbd {
   margin: 1rem;
 }
 
-.o-enslaved-stored-time, .o-enslaved-gained-infinities {
+.o-enslaved-stored-time,
+.o-enslaved-gained-infinities {
   font-size: 1.6rem;
   min-width: 18rem;
   padding-bottom: 0.5rem;
@@ -6479,7 +6677,7 @@ kbd {
   padding: 0.5rem;
   border-radius: var(--var-border-radius, 0.5rem);
   border: var(--var-border-width, 0.2rem) solid sandybrown;
-  box-shadow: 0 0 2rem inset rgba(244, 164, 96, 0.5);
+  box-shadow: 0 0 2rem inset rgba(244, 164, 96, 50%);
   background-color: #fdd3b0;
   cursor: pointer;
   margin: 1rem 0.5rem;
@@ -6557,6 +6755,7 @@ kbd {
   display: flex;
   flex-direction: column;
   align-items: center;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -6602,13 +6801,19 @@ kbd {
 
 .c-enslaved-run-button__icon__glitch {
   position: absolute;
-  background-image: linear-gradient(rgba(0, 0, 0, 0) 0%, var(--color-enslaved--base) 20%, var(--color-enslaved--base) 80%, rgba(0,0,0,0) 100%);
+  background-image:
+    linear-gradient(
+      rgba(0, 0, 0, 0%) 0%,
+      var(--color-enslaved--base) 20%,
+      var(--color-enslaved--base) 80%,
+      rgba(0, 0, 0, 0%) 100%
+    );
   border: none;
   width: 0.1rem;
 }
 
 .c-enslaved-run-button__icon:hover .c-enslaved-run-button__icon__glitch {
-  background-image: linear-gradient(rgba(0, 0, 0, 0) 0%, black 20%, black 80%, rgba(0,0,0,0) 100%);
+  background-image: linear-gradient(rgba(0, 0, 0, 0%) 0%, black 20%, black 80%, rgba(0, 0, 0, 0%) 100%);
 }
 
 .o-enslaved-release-header-button {
@@ -6617,8 +6822,8 @@ kbd {
 }
 
 @keyframes a-enslaved-run-button--spin {
-  0% {transform: rotate(0deg)}
-  100% {transform: rotate(360deg)}
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
 }
 
 .c-enslaved-hint-modal {
@@ -6644,7 +6849,7 @@ kbd {
   border-radius: 0;
 }
 
-/* #endregion enslaved tab*/
+/* #endregion enslaved tab */
 
 /* #startregion v tab */
 
@@ -6681,12 +6886,16 @@ kbd {
   margin: 0 1%;
 }
 
-.l-v-unlocks-container li:nth-child(6n+4), .l-v-unlocks-container li:nth-child(6n+5), .l-v-unlocks-container li:nth-child(6n+6) {
+.l-v-unlocks-container li:nth-child(6n+4),
+.l-v-unlocks-container li:nth-child(6n+5),
+.l-v-unlocks-container li:nth-child(6n+6) {
   margin-top: -7%;
   margin-bottom: -7%;
 }
 
-.l-v-unlocks-container li:nth-child(6n+1), .l-v-unlocks-container li:nth-child(6n+2), .l-v-unlocks-container li:nth-child(6n+3) {
+.l-v-unlocks-container li:nth-child(6n+1),
+.l-v-unlocks-container li:nth-child(6n+2),
+.l-v-unlocks-container li:nth-child(6n+3) {
   transform: translateX(50%) rotate(-60deg) skewY(30deg);
 }
 
@@ -6757,6 +6966,7 @@ kbd {
   display: flex;
   flex-direction: column;
   justify-content: space-around;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -6843,42 +7053,90 @@ kbd {
 }
 
 .c-v-run-button--running .c-v-run-button__line--1 {
-  animation: a-c-v-run-button__line--1--move 3s infinite cubic-bezier(0.9, 0, 0, 0.9), a-c-v-run-button__line--burst 3s infinite cubic-bezier(0.9, 0, 0, 0.9);
+  animation:
+    a-c-v-run-button__line--1--move 3s infinite cubic-bezier(0.9, 0, 0, 0.9),
+    a-c-v-run-button__line--burst 3s infinite cubic-bezier(0.9, 0, 0, 0.9);
 }
 
 .c-v-run-button--running .c-v-run-button__line--2 {
-  animation: a-c-v-run-button__line--2--move 3s infinite cubic-bezier(0.9, 0, 0, 0.9), a-c-v-run-button__line--burst 3s infinite cubic-bezier(0.9, 0, 0, 0.9);
+  animation:
+    a-c-v-run-button__line--2--move 3s infinite cubic-bezier(0.9, 0, 0, 0.9),
+    a-c-v-run-button__line--burst 3s infinite cubic-bezier(0.9, 0, 0, 0.9);
 }
 
 .c-v-run-button--running .c-v-run-button__line--3 {
-  animation: a-c-v-run-button__line--3--move 3s infinite cubic-bezier(0.9, 0, 0, 0.9), a-c-v-run-button__line--burst 3s infinite cubic-bezier(0.9, 0, 0, 0.9);
+  animation:
+    a-c-v-run-button__line--3--move 3s infinite cubic-bezier(0.9, 0, 0, 0.9),
+    a-c-v-run-button__line--burst 3s infinite cubic-bezier(0.9, 0, 0, 0.9);
 }
 
 @keyframes a-c-v-run-button__line--1--move {
-  0% {top: 23.4rem; left: 12.6rem; transform: rotate(-30deg);}
-  50% {top: 23.4rem; left: 1.8rem; transform: rotate(30deg);}
-  100% {top: 23.4rem; left: 12.6rem; transform: rotate(-30deg);}
+  0% {
+    top: 23.4rem;
+    left: 12.6rem;
+    transform: rotate(-30deg);
+  }
+
+  50% {
+    top: 23.4rem;
+    left: 1.8rem;
+    transform: rotate(30deg);
+  }
+
+  100% {
+    top: 23.4rem;
+    left: 12.6rem;
+    transform: rotate(-30deg);
+  }
 }
 
 @keyframes a-c-v-run-button__line--2--move {
-  0% {top: 14.4rem; left: -3rem; transform: rotate(90deg);}
-  50% {top: 5.4rem; left: 2.4rem; transform: rotate(150deg);}
-  100% {top: 14.4rem; left: -3rem; transform: rotate(90deg);}
+  0% {
+    top: 14.4rem;
+    left: -3rem;
+    transform: rotate(90deg);
+  }
+
+  50% {
+    top: 5.4rem;
+    left: 2.4rem;
+    transform: rotate(150deg);
+  }
+
+  100% {
+    top: 14.4rem;
+    left: -3rem;
+    transform: rotate(90deg);
+  }
 }
 
 @keyframes a-c-v-run-button__line--3--move {
-  0% {top: 5.4rem; left: 12.6rem; transform: rotate(30deg);}
-  50% {top: 14.4rem; left: 17.4rem; transform: rotate(90deg);}
-  100% {top: 5.4rem; left: 12.6rem; transform: rotate(30deg);}
+  0% {
+    top: 5.4rem;
+    left: 12.6rem;
+    transform: rotate(30deg);
+  }
+
+  50% {
+    top: 14.4rem;
+    left: 17.4rem;
+    transform: rotate(90deg);
+  }
+
+  100% {
+    top: 5.4rem;
+    left: 12.6rem;
+    transform: rotate(30deg);
+  }
 }
 
 @keyframes a-c-v-run-button__line--burst {
-  0% {box-shadow: 0 0 3rem black;}
-  50% {box-shadow: 0 0 0 black;}
-  100% {box-shadow: 0 0 3rem black;}
+  0% { box-shadow: 0 0 3rem black; }
+  50% { box-shadow: 0 0 0 black; }
+  100% { box-shadow: 0 0 3rem black; }
 }
 
-/* #endregion v tab*/
+/* #endregion v tab */
 
 /* #startregion ra tab */
 
@@ -6922,6 +7180,7 @@ kbd {
   height: 1.75rem;
   border-left: 0.1rem solid white;
   padding: 0 0.2rem;
+  -webkit-user-select: none;
   user-select: none;
   cursor: default;
 }
@@ -6946,7 +7205,7 @@ kbd {
 
 .o-ra-unlock-hover-text {
   background-color: black;
-  color: #fff;
+  color: #ffffff;
   text-align: center;
   border-radius: var(--var-border-radius, 5px);
   position: absolute;
@@ -7015,13 +7274,14 @@ kbd {
   align-items: center;
   justify-content: center;
   font-size: 2.3rem;
-  box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 0.7);
+  box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 70%);
   width: 4rem;
   height: 4rem;
-  background: #222;
+  background: #222222;
   border-radius: var(--var-border-radius, 50%);
-  border: 0.1rem solid #111;
+  border: 0.1rem solid #111111;
   margin: 0 0.3rem;
+  -webkit-user-select: none;
   user-select: none;
   position: relative;
 }
@@ -7031,7 +7291,7 @@ kbd {
 }
 
 .c-ra-upgrade-icon--inactive {
-  color: #555;
+  color: #555555;
 }
 
 .l-ra-non-pets {
@@ -7089,19 +7349,21 @@ kbd {
 }
 
 .c-ra-run-button__icon--running .c-ra-run-button__icon__sigil {
-  animation: a-c-ra-run-button__icon__sigil--undulate 0.6s infinite ease-in-out, a-c-ra-run-button__icon__sigil--glow 3s infinite ease-in-out;
+  animation:
+    a-c-ra-run-button__icon__sigil--undulate 0.6s infinite ease-in-out,
+    a-c-ra-run-button__icon__sigil--glow 3s infinite ease-in-out;
 }
 
 @keyframes a-c-ra-run-button__icon__sigil--undulate {
-  0% {transform: scale(0.9)}
-  50% {transform: scale(1)}
-  100% {transform: scale(0.9)}
+  0% { transform: scale(0.9); }
+  50% { transform: scale(1); }
+  100% { transform: scale(0.9); }
 }
 
 @keyframes a-c-ra-run-button__icon__sigil--glow {
-  0% {text-shadow: 0 0 1rem;}
-  50% {text-shadow: 0 0 3rem;}
-  100% {text-shadow: 0 0 1rem;}
+  0% { text-shadow: 0 0 1rem; }
+  50% { text-shadow: 0 0 3rem; }
+  100% { text-shadow: 0 0 1rem; }
 }
 
 .c-ra-rewards {
@@ -7111,6 +7373,7 @@ kbd {
   flex-direction: row;
   justify-content: center;
 }
+
 .c-ra-rewards-inner {
   margin: 0 1rem;
 }
@@ -7148,7 +7411,8 @@ kbd {
   height: 6rem;
   margin: 0.2rem;
   border-radius: var(--var-border-radius, 1rem);
-  border: 0.1rem solid #222;
+  border: 0.1rem solid #222222;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -7274,7 +7538,7 @@ kbd {
   border: 0.1rem solid black;
   border-radius: var(--var-border-radius, 0.8rem);
   color: white;
-  background: #222;
+  background: #222222;
   width: 24rem;
   margin-left: 0;
   padding: 0.4rem;
@@ -7282,10 +7546,10 @@ kbd {
   pointer-events: none;
   position: absolute;
   bottom: 100%;
-  box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 0.7);
+  box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 70%);
 }
 
-.c-ra-pet-upgrade__tooltip:after {
+.c-ra-pet-upgrade__tooltip::after {
   position: absolute;
   bottom: 0;
   left: 50%;
@@ -7310,7 +7574,7 @@ kbd {
   bottom: calc(100% + 0.7rem);
 }
 
-.c-ra-pet-upgrade:hover .c-ra-pet-upgrade__tooltip:after {
+.c-ra-pet-upgrade:hover .c-ra-pet-upgrade__tooltip::after {
   border-top-width: 0.7rem;
   margin-bottom: -0.7rem;
 }
@@ -7325,7 +7589,7 @@ kbd {
   bottom: calc(100% + 0.7rem);
 }
 
-.c-ra-level-up-btn:hover .c-ra-pet-upgrade__tooltip:after {
+.c-ra-level-up-btn:hover .c-ra-pet-upgrade__tooltip::after {
   border-top-width: 0.7rem;
   margin-bottom: -0.7rem;
 }
@@ -7335,7 +7599,7 @@ kbd {
   bottom: calc(100% + 0.7rem);
 }
 
-.c-ra-upgrade-icon:hover .c-ra-pet-upgrade__tooltip:after {
+.c-ra-upgrade-icon:hover .c-ra-pet-upgrade__tooltip::after {
   border-top-width: 0.7rem;
   margin-bottom: -0.7rem;
 }
@@ -7348,7 +7612,7 @@ kbd {
   color: var(--color-ra-pet--effarig);
 }
 
-.c-ra-upgrade-icon--enslaved .c-ra-pet-upgrade__tooltip{
+.c-ra-upgrade-icon--enslaved .c-ra-pet-upgrade__tooltip {
   color: var(--color-ra-pet--enslaved);
 }
 
@@ -7357,7 +7621,7 @@ kbd {
 }
 
 .c-ra-upgrade-icon--inactive .c-ra-pet-upgrade__tooltip {
-  color: #888;
+  color: #888888;
 }
 
 .c-ra-pet-upgrade__tooltip__name {
@@ -7402,7 +7666,7 @@ kbd {
 
 .c-ra-pet-btn--available {
   cursor: pointer;
-  background: #222;
+  background: #222222;
 }
 
 .c-ra-pet-btn--available:hover {
@@ -7413,7 +7677,8 @@ kbd {
   color: var(--color-ra-pet--teresa);
 }
 
-.c-ra-pet-btn--teresa:hover, .c-ra-pet-btn--teresa__capped {
+.c-ra-pet-btn--teresa:hover,
+.c-ra-pet-btn--teresa__capped {
   background: var(--color-ra-pet--teresa);
 }
 
@@ -7421,7 +7686,8 @@ kbd {
   color: var(--color-ra-pet--effarig);
 }
 
-.c-ra-pet-btn--effarig:hover, .c-ra-pet-btn--effarig__capped {
+.c-ra-pet-btn--effarig:hover,
+.c-ra-pet-btn--effarig__capped {
   background: var(--color-ra-pet--effarig);
 }
 
@@ -7433,7 +7699,8 @@ kbd {
   color: var(--color-ra-pet--enslaved);
 }
 
-.c-ra-pet-btn--enslaved:hover, .c-ra-pet-btn--enslaved__capped {
+.c-ra-pet-btn--enslaved:hover,
+.c-ra-pet-btn--enslaved__capped {
   background: var(--color-ra-pet--enslaved);
 }
 
@@ -7441,7 +7708,8 @@ kbd {
   color: var(--color-ra-pet--v);
 }
 
-.c-ra-pet-btn--v:hover, .c-ra-pet-btn--v__capped {
+.c-ra-pet-btn--v:hover,
+.c-ra-pet-btn--v__capped {
   background: var(--color-ra-pet--v);
 }
 
@@ -7459,7 +7727,6 @@ kbd {
   padding: 0 1rem;
 }
 
-
 .c-alchemy-resource-info {
   display: flex;
   flex-direction: column;
@@ -7536,14 +7803,14 @@ kbd {
 }
 
 @keyframes a-rainbow-stroke {
-  0% {stroke: red}
-  14.2% {stroke: orange}
-  28.4% {stroke: yellow}
-  42.6% {stroke: green}
-  56.8% {stroke: blue}
-  71% {stroke: indigo}
-  85.2% {stroke: violet}
-  100% {stroke: red}
+  0% { stroke: red; }
+  14.2% { stroke: orange; }
+  28.4% { stroke: yellow; }
+  42.6% { stroke: green; }
+  56.8% { stroke: blue; }
+  71% { stroke: indigo; }
+  85.2% { stroke: violet; }
+  100% { stroke: red; }
 }
 
 .o-alchemy-reaction-arrow--focused {
@@ -7584,6 +7851,7 @@ kbd {
   height: 3rem;
   margin-left: -1.5rem;
   margin-top: -1.5rem;
+  -webkit-user-select: none;
   user-select: none;
   font-size: 2rem;
   border: 0.1rem solid black;
@@ -7602,7 +7870,7 @@ kbd {
   top: 50%;
   margin-left: -1.2rem;
   margin-top: -1.2rem;
-  background-color: #bbb;
+  background-color: #bbbbbb;
   border: 0.1rem solid black;
   border-radius: var(--var-border-radius, 50%);
   z-index: 4;
@@ -7655,6 +7923,7 @@ kbd {
   opacity: 0.25;
   z-index: 4;
 }
+
 .o-alchemy-node--base {
   background-color: #81d4fa;
 }
@@ -7667,7 +7936,6 @@ kbd {
   background-color: crimson;
 }
 
-
 .c-ra-unlock-unlocked {
   background: lightgreen;
 }
@@ -7690,6 +7958,7 @@ kbd {
   font-size: 1.1rem;
   cursor: pointer;
   color: black;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -7706,12 +7975,12 @@ kbd {
 }
 
 .o-ra-teresa-switch-idle-on {
-  background: #00e6ff
+  background: #00e6ff;
 }
 
-/* #endregion ra tab*/
+/* #endregion ra tab */
 
-/* #startregion laitela tab*/
+/* #startregion laitela tab */
 
 .l-laitela-celestial-tab {
   display: flex;
@@ -7814,10 +8083,12 @@ kbd {
     color: var(--color-laitela--base);
     background: var(--color-laitela--accent);
   }
+
   50% {
     color: var(--color-laitela--accent);
     background: var(--color-laitela--base);
   }
+
   100% {
     color: var(--color-laitela--base);
     background: var(--color-laitela--accent);
@@ -7835,10 +8106,12 @@ kbd {
     color: black;
     background: white;
   }
+
   50% {
     color: white;
     background: black;
   }
+
   100% {
     color: black;
     background: white;
@@ -7910,7 +8183,7 @@ kbd {
   height: 21.8rem;
   width: 18.8rem;
   transform: rotate(90deg);
-  background-image: url(../images/laitela-icon.svg);
+  background-image: url("../images/laitela-icon.svg");
   background-position: center;
   background-repeat: repeat-y;
   background-color: transparent;
@@ -7965,7 +8238,7 @@ kbd {
   width: 20rem;
   margin-bottom: 1rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
-  border-radius: var(--var-border-radius, .5rem);
+  border-radius: var(--var-border-radius, 0.5rem);
   font-family: Typewriter;
   font-size: 1.1rem;
   font-weight: bold;
@@ -8054,7 +8327,7 @@ kbd {
   font-weight: bold;
   width: 22rem;
   height: 4%;
-  border-radius: var(--var-border-radius, .5rem);
+  border-radius: var(--var-border-radius, 0.5rem);
   border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
   cursor: pointer;
   transition-duration: 0.15s;
@@ -8073,7 +8346,7 @@ kbd {
   font-weight: bold;
   width: 22rem;
   height: 4%;
-  border-radius: var(--var-border-radius, .5rem);
+  border-radius: var(--var-border-radius, 0.5rem);
   border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
   font-size: 20px;
   padding-top: 10rem;
@@ -8097,7 +8370,7 @@ kbd {
   width: 12rem;
   border-radius: 50%;
   background-color: black;
-  background-image: url(../images/laitela-icon.svg);
+  background-image: url("../images/laitela-icon.svg");
   background-position: center;
   background-repeat: repeat-y;
   background-size: 4.95rem;
@@ -8110,7 +8383,7 @@ kbd {
 }
 
 .o-laitela-run-button__icon:hover {
-  background-image: url(../images/laitela-icon-dark.svg);
+  background-image: url("../images/laitela-icon-dark.svg");
   background-color: white;
 }
 
@@ -8119,8 +8392,8 @@ kbd {
 }
 
 @keyframes a-laitela-run-button__icon--scroll {
-  0% {background-position-y: 0}
-  100% {background-position-y: 24rem}
+  0% { background-position-y: 0; }
+  100% { background-position-y: 24rem; }
 }
 
 .l-laitela-annihilation-container {
@@ -8175,7 +8448,7 @@ kbd {
   width: 20rem;
   height: 3rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
-  border-radius: var(--var-border-radius, .5rem);
+  border-radius: var(--var-border-radius, 0.5rem);
   cursor: pointer;
   font-family: Typewriter;
   font-size: 1.1rem;
@@ -8192,8 +8465,7 @@ kbd {
   box-shadow: none;
 }
 
-/* #endregion laitela tab*/
-
+/* #endregion laitela tab */
 
 .c-performance-stats {
   width: 25rem;
@@ -8220,7 +8492,6 @@ kbd {
 }
 
 .l-glyph-levels-and-weights {
-  display: -ms-grid;
   display: grid;
   width: 100%;
   padding-top: 1rem;
@@ -8233,80 +8504,72 @@ kbd {
 
 .l-glyph-levels-and-weights__adjust-label {
   grid-column: 4;
-  -ms-grid-column: 4;
   -ms-grid-column-span: 2;
   grid-row: 5;
-  -ms-grid-row: 5;
   white-space: nowrap;
   font-weight: bold;
-  padding: 0.25em 0 .25em 1em;
+  padding: 0.25rem 0 0.25rem 1rem;
   z-index: 2;
 }
 
 .l-glyph-levels-and-weights__adjust-auto {
   grid-column: 4;
-  -ms-grid-column: 4;
   -ms-grid-column-span: 2;
   grid-row: 6;
-  -ms-grid-row: 6;
   white-space: nowrap;
   font-weight: bold;
-  padding: 0.25em 0 .25em 1em;
+  padding: 0.25rem 0 0.25rem 1rem;
   z-index: 2;
 }
 
 .l-glyph-levels-and-weights__adjust-outline {
   grid-column: 4 / 5;
-  -ms-grid-column: 4;
+  grid-column: 4;
   -ms-grid-column-span: 1;
-  -ms-grid-row: 1;
-  position:relative;
+  grid-row: 1;
+  position: relative;
 }
 
 .l-glyph-levels-and-weights__adjust-outline::after {
-  content: '';
+  content: "";
   position: absolute;
   border: var(--var-border-width, 0.2rem) solid var(--color-reality-light);
-  border-radius: var(--var-border-radius, 0.5em);
-  top: -0.5em;
-  bottom: -0.5em;
-  left: -0.5em;
-  right: -0.5em;
+  border-radius: var(--var-border-radius, 0.5rem);
+  top: -0.5rem;
+  bottom: -0.5rem;
+  left: -0.5rem;
+  right: -0.5rem;
 }
 
 .l-glyph-levels-and-weights__factor {
   grid-column: 1;
-  -ms-grid-column: 1;
   text-align: left;
-  padding-left: 1em;
-  padding-top: 0.3em;
-  padding-bottom: 0.3em;
-  display:flex;
+  padding-left: 1rem;
+  padding-top: 0.3rem;
+  padding-bottom: 0.3rem;
+  display: flex;
   align-items: center;
 }
 
 .l-glyph-levels-and-weights__operator {
   grid-column: 2;
-  -ms-grid-column: 2;
-  display:flex;
+  display: flex;
   align-items: center;
-  padding-left: 1em;
+  padding-left: 1rem;
 }
 
 .l-glyph-levels-and-weights__factor-val {
   grid-column: 3;
-  -ms-grid-column: 3;
   text-align: right;
-  padding-left: 1em;
+  padding-left: 1rem;
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  padding-right: 2em;
+  padding-right: 2rem;
 }
 
 .l-glyph-levels-and-weights__slider {
   grid-column: 4;
-  -ms-grid-column: 4;
   display: flex;
   align-items: center;
   margin-top: 0.4rem;
@@ -8382,6 +8645,7 @@ kbd {
   align-items: center;
   justify-content: center;
   z-index: 2;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -8495,7 +8759,7 @@ kbd {
 
 .c-reality-upgrade-btn--bought {
   background-color: var(--color-reality);
-  border-color: #094E0B;
+  border-color: #094e0b;
   cursor: default;
 }
 
@@ -8527,7 +8791,7 @@ kbd {
 
 .c-reality-upgrade-btn--black-hole-unlock {
   margin: auto;
-  text-shadow: -0.1rem 0.1rem 0.3rem var(--color-reality-light)
+  text-shadow: -0.1rem 0.1rem 0.3rem var(--color-reality-light);
 }
 
 .t-dark .c-reality-upgrade-btn--unavailable {
@@ -8554,7 +8818,7 @@ kbd {
 .t-s6.c-reality-upgrade-btn--bought,
 .t-s10.c-reality-upgrade-btn--bought {
   background-color: var(--color-reality);
-  border-color: #094E0B;
+  border-color: #094e0b;
 }
 
 .t-s6.c-reality-upgrade-btn--bought:hover,
@@ -8610,7 +8874,7 @@ kbd {
   color: var(--color-reality);
 }
 
-/*#region reality-tab*/
+/* #region reality-tab */
 
 .c-reality-tab__header {
   font-size: 1.5rem;
@@ -8621,9 +8885,9 @@ kbd {
   color: var(--color-reality);
 }
 
-/*#region themes*/
+/* #region themes */
 
-/*#region t-dark t-s6 t-s10*/
+/* #region t-dark t-s6 t-s10 */
 
 .t-dark .c-reality-tab__reality-machines,
 .t-s6 .c-reality-tab__reality-machines,
@@ -8631,19 +8895,19 @@ kbd {
   text-shadow: 0 0 0.7rem;
 }
 
-/*#endregion t-dark t-s6 t-s10*/
+/* #endregion t-dark t-s6 t-s10 */
 
-/*#region t-s1*/
+/* #region t-s1 */
 
 .t-s1 .c-reality-tab__reality-machines {
   text-shadow: 0.1rem 0.1rem 0 black;
 }
 
-/*#endregion t-s1*/
+/* #endregion t-s1 */
 
-/*#endregion themes*/
+/* #endregion themes */
 
-/*#endregion reality-tab*/
+/* #endregion reality-tab */
 
 .c-automator-blocks {
   width: 100%;
@@ -8658,6 +8922,7 @@ kbd {
   color: #c080ff;
   border-radius: var(--var-border-radius, 0.5rem);
   width: 8.5rem;
+  -webkit-user-select: none;
   user-select: none;
   cursor: grab;
 }
@@ -8684,7 +8949,7 @@ kbd {
 }
 
 .c-automator-block-row > * {
-  margin-right: 0.5rem
+  margin-right: 0.5rem;
 }
 
 .c-automator-block-row-active {
@@ -8706,9 +8971,7 @@ kbd {
   border-bottom-left-radius: var(--var-border-radius, 1rem);
   box-sizing: border-box;
   padding: 0.5rem;
-  tab-size: 1.5em;
-  -moz-tab-size: 1.5em;
-  -o-tab-size: 1.5em;
+  tab-size: 1.5rem;
 }
 
 .s-base--metro .c-automator-block-editor::-webkit-scrollbar-thumb {
@@ -8727,7 +8990,7 @@ kbd {
 }
 
 input.o-automator-block-input {
-  color: #0f0;
+  color: #00ff00;
 }
 
 .l-automator-nested-block {
@@ -8736,7 +8999,7 @@ input.o-automator-block-input {
   border: var(--var-border-width, 2px) dotted #55ff55;
   margin-left: 3rem;
   margin-top: 0.5rem;
-  min-widtH: 30rem;
+  min-width: 30rem;
 }
 
 .o-automator-block-delete {
@@ -8795,9 +9058,10 @@ input.o-automator-block-input {
   position: relative;
   overflow: hidden;
   touch-action: pan-y;
+  -webkit-user-select: none;
   user-select: none;
   -webkit-user-drag: none;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
   width: 60rem;
   height: 60rem;
   border: var(--var-border-width, 0.2rem) solid black;
@@ -8807,20 +9071,23 @@ input.o-automator-block-input {
 .c-perk-network__canvas {
   position: relative;
   touch-action: none;
+  -webkit-user-select: none;
   user-select: none;
   -webkit-user-drag: none;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
   width: 100%;
   height: 100%;
 }
 
-/* #startregion h2p tab*/
+/* #startregion h2p tab */
 
 .l-h2p-modal {
   display: flex;
   flex-direction: column;
   margin: 0.5rem;
+  /* stylelint-disable-next-line unit-allowed-list */
   width: calc(100vw - 20vh);
+  /* stylelint-disable-next-line unit-allowed-list */
   height: calc(100vh - 20vh);
 }
 
@@ -8841,6 +9108,7 @@ input.o-automator-block-input {
   flex-direction: column;
   width: 15rem;
 }
+
 .l-h2p-info {
   flex: 1 1 50rem;
   display: flex;
@@ -8848,6 +9116,7 @@ input.o-automator-block-input {
 }
 
 .c-h2p-title {
+  -webkit-user-select: none;
   user-select: none;
   font-size: 3rem;
 }
@@ -9020,7 +9289,7 @@ input.o-automator-block-input {
 .c-hide-modal-tab-button--eternity {
   color: var(--color-eternity);
   background: var(--color-prestige--accent);
-  border-color: var(--color-eternity)
+  border-color: var(--color-eternity);
 }
 
 .c-hide-modal-tab-button--eternity:hover {
@@ -9051,7 +9320,9 @@ input.o-automator-block-input {
 }
 
 /* Prevent any themes overriding font awesome */
-.fa, .far, .fas {
+.fa,
+.far,
+.fas {
   font-family: "Font Awesome 6 Free" !important;
 }
 
@@ -9065,7 +9336,7 @@ input.o-automator-block-input {
   position: relative;
 }
 
-.tutorial--glow:after {
+.tutorial--glow::after {
   content: "";
   position: absolute;
   width: 100%;
@@ -9077,9 +9348,14 @@ input.o-automator-block-input {
   border-radius: var(--var-border-radius, inherit);
 }
 
-.o-celestial-nav__hoverable .tooltiptext { display: none; }
+.o-celestial-nav__hoverable .tooltiptext {
+  display: none;
+}
+
 .o-celestial-nav__hoverable:hover .tooltiptext,
-.o-celestial-nav__force-hover .tooltiptext { display: block; }
+.o-celestial-nav__force-hover .tooltiptext {
+  display: block;
+}
 
 .c-celestial-nav__test-ring {
   fill: blue;
@@ -9100,24 +9376,24 @@ input.o-automator-block-input {
 }
 
 .c-celestial-nav__test-incomplete {
-  fill: #888;
+  fill: #888888;
 }
 
 .o-celestial-nav__symbol {
   text-anchor: middle;
   font-weight: bold;
-  font-family: Font Awesome;
+  font-family: "Font Awesome";
 }
 
 .o-celestial-nav__legend-arrow {
-  stroke: #CCC;
+  stroke: #cccccc;
   fill: none;
   stroke-linecap: butt;
   stroke-width: 2;
 }
 
 .o-celestial-nav__hoverable:hover .o-celestial-nav__legend-arrow {
-  stroke: #FFF;
+  stroke: #ffffff;
 }
 
 .o-celestial-nav__legend-outline {
@@ -9128,7 +9404,7 @@ input.o-automator-block-input {
 }
 
 .o-celestial-nav__hoverable:hover .o-celestial-nav__legend-outline {
-  stroke: #FFF;
+  stroke: #ffffff;
 }
 
 .o-celestial-nav__node-overlay {
@@ -9148,19 +9424,13 @@ input.o-automator-block-input {
 }
 
 .o-no-mouse {
-  -moz-user-select: none;
-  -khtml-user-select: none;
   -webkit-user-select: none;
-  -ms-user-select: none;
   user-select: none;
   pointer-events: none;
 }
 
 .tooltiptext {
-  -moz-user-select: none;
-  -khtml-user-select: none;
   -webkit-user-select: none;
-  -ms-user-select: none;
   user-select: none;
   pointer-events: none;
 }
@@ -9169,6 +9439,7 @@ input.o-automator-block-input {
   margin: auto;
   border: var(--var-border-width, 0.2rem) solid black;
   border-radius: var(--var-border-radius, 5px);
+
   /* background: #1a1a1a; */
 }
 
diff --git a/public/stylesheets/theme-Dark Metro.css b/public/stylesheets/theme-Dark Metro.css
index ace7ff67b..5aa679df3 100644
--- a/public/stylesheets/theme-Dark Metro.css	
+++ b/public/stylesheets/theme-Dark Metro.css	
@@ -1,28 +1,28 @@
 body.t-dark-metro {
-  background-image: url('../images/dark-bg.png');
+  background-image: url("../images/dark-bg.png");
   background-position: center;
   color: #757575;
 }
 
 .t-dark-metro .c-tt-buy-button--unlocked {
   background: #212121;
-  color: #00BCD4;
-  border: 0.1rem solid #00BCD4;
+  color: #00bcd4;
+  border: 0.1rem solid #00bcd4;
 }
 
 .t-dark-metro .c-tt-buy-button--unlocked:hover {
   color: #212121;
-  background: #00BCD4;
+  background: #00bcd4;
 }
 
 .t-dark-metro .c-tt-buy-button--locked {
-  background: #9E9E9E;
+  background: #9e9e9e;
   border: none;
-  box-shadow: 1px 1px 1px 0 #000;
+  box-shadow: 1px 1px 1px 0 #000000;
 }
 
 .t-dark-metro .c-tt-buy-button--locked:hover {
-  background: #E53935;
+  background: #e53935;
 }
 
 .t-dark-metro #realityanimbg {
diff --git a/public/stylesheets/theme-Dark.css b/public/stylesheets/theme-Dark.css
index 16cb82813..56016fecd 100644
--- a/public/stylesheets/theme-Dark.css
+++ b/public/stylesheets/theme-Dark.css
@@ -1,33 +1,33 @@
 body.t-dark {
-  background-image: url('../images/dark-bg.png');
+  background-image: url("../images/dark-bg.png");
   background-position: center;
   color: #888888;
 }
 
 input.t-dark {
-  background-color: #455A64;
+  background-color: #455a64;
   border: 0.1rem solid black;
 }
 
 .t-dark .c-tt-amount {
-  color: #64DD17;
-  text-shadow: 0 0 7px #64DD17;
+  color: #64dd17;
+  text-shadow: 0 0 7px #64dd17;
 }
 
 .t-dark .c-tt-buy-button--unlocked {
-  color: #3AACD6;
+  color: #3aacd6;
   background: #161616;
-  border: 0.1rem solid #3AACD6;
+  border: 0.1rem solid #3aacd6;
 }
 
 .t-dark .c-tt-buy-button--unlocked:hover {
   color: #161616;
-  background: #3AACD6;
+  background: #3aacd6;
 }
 
 .t-dark .c-tt-buy-button--locked {
   background: #263238;
-  border: 0.1rem solid #3AACD6;
+  border: 0.1rem solid #3aacd6;
 }
 
 .t-dark .c-tt-buy-button--locked:hover {
@@ -41,4 +41,4 @@ input.t-dark {
 
 .t-dark #realityanimbg {
   filter: invert(1);
-}
\ No newline at end of file
+}
diff --git a/public/stylesheets/theme-Inverted Metro.css b/public/stylesheets/theme-Inverted Metro.css
index 5f40eb0e0..e29caa5f5 100644
--- a/public/stylesheets/theme-Inverted Metro.css	
+++ b/public/stylesheets/theme-Inverted Metro.css	
@@ -6,7 +6,7 @@ body.t-inverted-metro {
 .t-inverted-metro #page,
 .t-inverted-metro .l-notification-container,
 .t-inverted-metro .c-modal,
-.t-inverted-metro #TTbuttons,
+.t-inverted-metro .time-theorem-buttons,
 .t-inverted-metro .sidebar,
 .t-inverted-metro .c-glyph-tooltip {
   filter: invert(100%);
@@ -18,28 +18,28 @@ body.t-inverted-metro {
 
 .t-inverted-metro #timetheorems,
 .t-inverted-metro .c-ttshop__save-load-text,
-.t-inverted-metro #minimizeArrow,
+.t-inverted-metro .minimize-arrow,
 .t-inverted-metro .ttshop-background {
-  color: #bbb;
+  color: #bbbbbb;
 }
 
 .t-inverted-metro .c-tt-buy-button--unlocked {
   background: #212121;
-  color: #00BCD4;
-  border: 0.1rem solid #00BCD4;
+  color: #00bcd4;
+  border: 0.1rem solid #00bcd4;
 }
 
 .t-inverted-metro .c-tt-buy-button--unlocked:hover {
   color: #212121;
-  background: #00BCD4;
+  background: #00bcd4;
 }
 
 .t-inverted-metro .c-tt-buy-button--locked {
-  background: #9E9E9E;
+  background: #9e9e9e;
   border: none;
-  box-shadow: 1px 1px 1px 0 #000;
+  box-shadow: 1px 1px 1px 0 #000000;
 }
 
 .t-inverted-metro .c-tt-buy-button--locked:hover {
-  background: #EF5350;
+  background: #ef5350;
 }
diff --git a/public/stylesheets/theme-Inverted.css b/public/stylesheets/theme-Inverted.css
index d390c7b16..04db5cb12 100644
--- a/public/stylesheets/theme-Inverted.css
+++ b/public/stylesheets/theme-Inverted.css
@@ -6,7 +6,7 @@ body.t-inverted {
 .t-inverted #page,
 .t-inverted .l-notification-container,
 .t-inverted .c-modal,
-.t-inverted #TTbuttons,
+.t-inverted .time-theorem-buttons,
 .t-inverted .sidebar,
 .t-inverted .c-glyph-tooltip {
   filter: invert(100%);
diff --git a/public/stylesheets/theme-Metro.css b/public/stylesheets/theme-Metro.css
index 58ed41035..4279a1295 100644
--- a/public/stylesheets/theme-Metro.css
+++ b/public/stylesheets/theme-Metro.css
@@ -1,20 +1,20 @@
 .t-metro .c-tt-buy-button--unlocked {
   background: #212121;
-  color: #00BCD4;
-  border: 0.1rem solid #00BCD4;
+  color: #00bcd4;
+  border: 0.1rem solid #00bcd4;
 }
 
 .t-metro .c-tt-buy-button--unlocked:hover {
   color: #212121;
-  background: #00BCD4;
+  background: #00bcd4;
 }
 
 .t-metro .c-tt-buy-button--locked {
-  background: #9E9E9E;
+  background: #9e9e9e;
   border: none;
-  box-shadow: 1px 1px 1px 0 #000;
+  box-shadow: 1px 1px 1px 0 #000000;
 }
 
 .t-metro .c-tt-buy-button--locked:hover {
-  background: #EF5350;
-}
\ No newline at end of file
+  background: #ef5350;
+}
diff --git a/public/stylesheets/theme-S1.css b/public/stylesheets/theme-S1.css
index 563678cfa..b8269f381 100644
--- a/public/stylesheets/theme-S1.css
+++ b/public/stylesheets/theme-S1.css
@@ -1,11 +1,10 @@
 html {
-  background: url('../images/s1-bg.svg') no-repeat;
-  background-size: contain;
+  background: url("../images/s1-bg.svg") no-repeat;
   align-content: center;
   background-size: 100%;
   background-color: #d72621;
-  background-attachment:fixed;
-  background-position:center bottom;
+  background-attachment: fixed;
+  background-position: center bottom;
 }
 
 body.t-s1 {
@@ -38,26 +37,27 @@ body.t-s1 {
 
 #snow {
   display: block !important;
-  background-image: url('../images/snow1.png'), url('../images/snow2.png'), url('../images/snow3.png');
+  background-image: url("../images/snow1.png"), url("../images/snow2.png"), url("../images/snow3.png");
   height: 100%;
   width: 100%;
   left: 0;
   top: 0;
-	position: fixed;
+  position: fixed;
   z-index: 0;
   opacity: 1;
   pointer-events: none;
-  animation: snow 10s linear infinite, snowFade 10s cubic-bezier(0,0.3,1,0.7) infinite;
+  animation: snow 10s linear infinite, snowFade 10s cubic-bezier(0, 0.3, 1, 0.7) infinite;
 }
 
 @keyframes snow {
-  0% {background-position: 0 0, 0 0, 0 0;}
-  50% {background-position: 500px 500px, 100px 200px, -100px 150px;}
-  100% {background-position: 1000px 1000px, 200px 400px, -200px 300px;}
+  0% { background-position: 0 0, 0 0, 0 0; }
+  50% { background-position: 500px 500px, 100px 200px, -100px 150px; }
+  100% { background-position: 1000px 1000px, 200px 400px, -200px 300px; }
 }
 
+/* stylelint-disable-next-line keyframes-name-pattern */
 @keyframes snowFade {
-  0% {opacity: 0;}
-  50% {opacity: 1;}
-  100% {opacity: 0;}
+  0% { opacity: 0; }
+  50% { opacity: 1; }
+  100% { opacity: 0; }
 }
diff --git a/public/stylesheets/theme-S10.css b/public/stylesheets/theme-S10.css
index 0a2c3bec7..30708b75f 100644
--- a/public/stylesheets/theme-S10.css
+++ b/public/stylesheets/theme-S10.css
@@ -1,5 +1,6 @@
 .t-s10 #stars {
   display: block;
+
   /* Make video to at least 100% wide and tall */
   min-width: 100%;
   min-height: 100%;
@@ -13,31 +14,31 @@
   top: 50%;
   left: 50%;
   z-index: -1000;
-  transform: translate(-50%,-50%);
+  transform: translate(-50%, -50%);
 }
 
 body.t-s10 {
-  color: #999;
+  color: #999999;
   background: black;
-  background-image: url('../images/stars-bg.png');
+  background-image: url("../images/stars-bg.png");
   background-size: 100%;
   background-position: center;
 }
 
 .t-s10 .c-tt-amount {
-  color: #64DD17;
-  text-shadow: 0 0 7px #64DD17;
+  color: #64dd17;
+  text-shadow: 0 0 7px #64dd17;
 }
 
 .t-s10 .c-tt-buy-button--unlocked {
-  color: #3AACD6;
+  color: #3aacd6;
   background: black;
-  border: 0.1rem solid #3AACD6;
+  border: 0.1rem solid #3aacd6;
 }
 
 .t-s10 .c-tt-buy-button--unlocked:hover {
   color: black;
-  background: #3AACD6;
+  background: #3aacd6;
 }
 
 .t-s10 .c-tt-buy-button--locked {
@@ -53,7 +54,7 @@ body.t-s10 {
 }
 
 .t-s10 .c-rm-amount__desc {
-  color: #999;
+  color: #999999;
 }
 
 .t-s10 #realityanimbg {
diff --git a/public/stylesheets/theme-S11.css b/public/stylesheets/theme-S11.css
index aa2169d99..20523ae39 100644
--- a/public/stylesheets/theme-S11.css
+++ b/public/stylesheets/theme-S11.css
@@ -1,29 +1,29 @@
 @font-face {
   font-family: Typewriter;
-  src: url('BlobEmoji-Bold.ttf'), url('MonospaceTypewriter.ttf');
+  src: url("BlobEmoji-Bold.ttf"), url("MonospaceTypewriter.ttf");
 }
 
 body.t-s11 {
-  color: #999;
+  color: #999999;
   background: black;
   background-size: 100%;
   background-position: center;
 }
 
 .t-s11 .c-tt-amount {
-  color: #64DD17;
-  text-shadow: 0 0 7px #64DD17;
+  color: #64dd17;
+  text-shadow: 0 0 7px #64dd17;
 }
 
 .t-s11 .c-tt-buy-button--unlocked {
-  color: #3AACD6;
+  color: #3aacd6;
   background: black;
-  border: 0.1rem solid #3AACD6;
+  border: 0.1rem solid #3aacd6;
 }
 
 .t-s11 .c-tt-buy-button--unlocked:hover {
   color: black;
-  background: #3AACD6;
+  background: #3aacd6;
 }
 
 .t-s11 .c-tt-buy-button--locked {
@@ -39,7 +39,7 @@ body.t-s11 {
 }
 
 .t-s11 .c-rm-amount__desc {
-  color: #999;
+  color: #999999;
 }
 
 .t-s11 #realityanimbg {
@@ -56,6 +56,7 @@ body.t-s11 {
   font-size: 20px;
   fill: orange !important;
   pointer-events: none;
+  -webkit-user-select: none;
   user-select: none;
   cursor: default;
 }
diff --git a/public/stylesheets/theme-S2.css b/public/stylesheets/theme-S2.css
index a6a0ccc46..4b26ae090 100644
--- a/public/stylesheets/theme-S2.css
+++ b/public/stylesheets/theme-S2.css
@@ -1,6 +1,5 @@
 html {
-  background: url('../images/s2-bg.svg') no-repeat;
-  background-size: contain;
+  background: url("../images/s2-bg.svg") no-repeat;
   background-position-x: 50%;
   background-position-y: 50%;
   background-size: 50%;
@@ -17,7 +16,7 @@ body {
 .t-s2 #page,
 .t-s2 .l-notification-container,
 .t-s2 .c-modal,
-.t-s2 #TTbuttons,
+.t-s2 .time-theorem-buttons,
 .t-s2 .sidebar,
 .t-s2 .c-glyph-tooltip {
   filter: sepia(100%) hue-rotate(180deg) saturate(250%);
diff --git a/public/stylesheets/theme-S3.css b/public/stylesheets/theme-S3.css
index 9295871b0..7c3569d40 100644
--- a/public/stylesheets/theme-S3.css
+++ b/public/stylesheets/theme-S3.css
@@ -6,24 +6,24 @@ body {
 .t-s3 #page,
 .t-s3 .l-notification-container,
 .t-s3 .c-modal,
-.t-s3 #TTbuttons,
+.t-s3 .time-theorem-buttons,
 .t-s3 .sidebar,
 .t-s3 .c-glyph-tooltip {
   animation: glasses 7s infinite;
 }
 
 @keyframes glasses {
-  0% {filter: blur(0);}
-  10% {filter: blur(3px);}
-  20% {filter: blur(0);}
-  30% {transform: rotateZ(0deg)}
-  35% {transform: rotateZ(4deg)}
-  40% {transform: rotateZ(-4deg)}
-  45% {transform: rotateZ(0deg)}
-  55% {filter: invert(0%);}
-  65% {filter: invert(100%);}
-  75% {filter: invert(0%);}
-  85% {filter: opacity(100%);}
-  92.5% {filter: opacity(50%);}
-  100% {filter: opacity(100%);}
+  0% { filter: blur(0); }
+  10% { filter: blur(3px); }
+  20% { filter: blur(0); }
+  30% { transform: rotateZ(0deg); }
+  35% { transform: rotateZ(4deg); }
+  40% { transform: rotateZ(-4deg); }
+  45% { transform: rotateZ(0deg); }
+  55% { filter: invert(0%); }
+  65% { filter: invert(100%); }
+  75% { filter: invert(0%); }
+  85% { filter: opacity(100%); }
+  92.5% { filter: opacity(50%); }
+  100% { filter: opacity(100%); }
 }
diff --git a/public/stylesheets/theme-S4.css b/public/stylesheets/theme-S4.css
index f87038258..e2862942e 100644
--- a/public/stylesheets/theme-S4.css
+++ b/public/stylesheets/theme-S4.css
@@ -1,33 +1,34 @@
 * {
   border-radius: 40% !important;
+  box-shadow: 1px 1px 1px 0 #9e9e9e;
+  font-family:
+    "Comic Sans MS",
+    cursive,
+    sans-serif,
+    Typewriter,
+    fas,
+    fab,
+    "Font Awesome 6 Brands",
+    "Font Awesome 6 Free" !important;
 }
 
-* {
-  font-family: "Comic Sans MS", cursive, sans-serif, Typewriter,
-  fas, fab, 'Font Awesome 6 Brands', 'Font Awesome 6 Free' !important;
-}
-
-html{
-  background-color: #FF00FF;
+html {
+  background-color: #ff00ff;
   color: black !important;
-  background-attachment:fixed;
-  background-position:center bottom;
+  background-attachment: fixed;
+  background-position: center bottom;
   border: 0.1rem solid white !important;
 }
 
 #container {
-  cursor: url(cursor.cur),  auto !important;
+  cursor: url("cursor.cur"), auto !important;
 }
 
 body {
-  background: #0FFF0F !important;
+  background: #0fff0f !important;
   border: 0.1rem solid white !important;
 }
 
 .o-achievement {
   border-radius: 0.8rem !important;
 }
-
-* {
-  box-shadow: 1px 1px 1px 0 #9E9E9E;
-}
diff --git a/public/stylesheets/theme-S5.css b/public/stylesheets/theme-S5.css
index b7095cc35..dbd63da85 100644
--- a/public/stylesheets/theme-S5.css
+++ b/public/stylesheets/theme-S5.css
@@ -1,5 +1,5 @@
 html {
-  background: url('../images/s5-bg.jpg');
+  background: url("../images/s5-bg.jpg");
   background-position-x: 50%;
   background-position-y: 50%;
   background-size: 150%;
@@ -15,7 +15,7 @@ body.t-s5 {
 .t-s5 #page,
 .t-s5 .l-notification-container,
 .t-s5 .c-modal,
-.t-s5 #TTbuttons,
+.t-s5 .time-theorem-buttons,
 .t-s5 .sidebar {
   filter: sepia(100%) hue-rotate(0deg) saturate(100%);
 }
diff --git a/public/stylesheets/theme-S6.css b/public/stylesheets/theme-S6.css
index 1a3d61e37..30c44098b 100644
--- a/public/stylesheets/theme-S6.css
+++ b/public/stylesheets/theme-S6.css
@@ -1,5 +1,6 @@
 .t-s6 #stars {
   display: block;
+
   /* Make video to at least 100% wide and tall */
   min-width: 100%;
   min-height: 100%;
@@ -13,31 +14,31 @@
   top: 50%;
   left: 50%;
   z-index: -1000;
-  transform: translate(-50%,-50%);
+  transform: translate(-50%, -50%);
 }
 
 body.t-s6 {
-  color: #999;
+  color: #999999;
   background: black;
-  background-image: url('../images/stars-bg.png');
+  background-image: url("../images/stars-bg.png");
   background-size: 100%;
   background-position: center;
 }
 
 .t-s6 .c-tt-amount {
-  color: #64DD17;
-  text-shadow: 0 0 7px #64DD17;
+  color: #64dd17;
+  text-shadow: 0 0 7px #64dd17;
 }
 
 .t-s6 .c-tt-buy-button--unlocked {
-  color: #3AACD6;
+  color: #3aacd6;
   background: black;
-  border: 0.1rem solid #3AACD6;
+  border: 0.1rem solid #3aacd6;
 }
 
 .t-s6 .c-tt-buy-button--unlocked:hover {
   color: black;
-  background: #3AACD6;
+  background: #3aacd6;
 }
 
 .t-s6 .c-tt-buy-button--locked {
@@ -53,7 +54,7 @@ body.t-s6 {
 }
 
 .t-s6 .c-rm-amount__desc {
-  color: #999;
+  color: #999999;
 }
 
 .t-s6 #realityanimbg {
diff --git a/public/stylesheets/theme-S7.css b/public/stylesheets/theme-S7.css
index 1bc1caafe..00e38f142 100644
--- a/public/stylesheets/theme-S7.css
+++ b/public/stylesheets/theme-S7.css
@@ -1,5 +1,5 @@
 * {
-  font-family: "Arial", Typewriter;
+  font-family: Arial, Typewriter;
   transition-duration: 1ms !important;
   border-width: 1px !important;
   border-radius: 0 !important;
@@ -12,27 +12,19 @@
 }
 
 button {
-  -webkit-border-radius: 0 !important;
-  -moz-border-radius: 0 !important;
   border-radius: 0 !important;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.00, rgb(222, 222, 222)), color-stop(1.00, rgb(246, 246, 246))) !important;
-  background-image: -moz-linear-gradient(center bottom, rgb(222, 222, 222) 0%, rgb(246, 246, 246) 100%) !important;
   background-image: linear-gradient(to top, rgb(222, 222, 222) 0%, rgb(246, 246, 246) 100%) !important;
   padding: 3px !important;
-  border: 0.1rem solid #9B9B9B !important;
+  border: 0.1rem solid #9b9b9b !important;
   color: black !important;
   text-decoration: none !important;
 }
 
 .o-primary-btn {
-  -webkit-border-radius: 0 !important;
-  -moz-border-radius: 0 !important;
   border-radius: 0 !important;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.00, rgb(222, 222, 222)), color-stop(1.00, rgb(246, 246, 246))) !important;
-  background-image: -moz-linear-gradient(center bottom, rgb(222, 222, 222) 0%, rgb(246, 246, 246) 100%) !important;
   background-image: linear-gradient(to top, rgb(222, 222, 222) 0%, rgb(246, 246, 246) 100%) !important;
   padding: 3px !important;
-  border: 0.1rem solid #9B9B9B !important;
+  border: 0.1rem solid #9b9b9b !important;
   color: black !important;
   text-decoration: none !important;
 }
diff --git a/public/stylesheets/theme-S8.css b/public/stylesheets/theme-S8.css
index db5515b0c..de5ad7dd3 100644
--- a/public/stylesheets/theme-S8.css
+++ b/public/stylesheets/theme-S8.css
@@ -1,5 +1,5 @@
 body.t-s8 {
-  background: url('../images/s8-bg.jpg') no-repeat;
+  background: url("../images/s8-bg.jpg") no-repeat;
   color: black;
   background-color: white;
   height: 100%;
@@ -15,30 +15,30 @@ body.t-s8 {
   color: black;
 }
 
-/*metro  theme with less box shadows*/
+/* metro  theme with less box shadows */
 
-
-.t-s8 input, .t-s8 select {
-  border: 0.1rem solid #A9A9A9;
+.t-s8 input,
+.t-s8 select {
+  border: 0.1rem solid #a9a9a9;
 }
 
 .t-s8 .c-tt-buy-button--unlocked {
   background: #212121;
-  color: #00BCD4;
-  border: 0.1rem solid #00BCD4;
+  color: #00bcd4;
+  border: 0.1rem solid #00bcd4;
 }
 
 .t-s8 .c-tt-buy-button--unlocked:hover {
   color: #212121;
-  background: #00BCD4;
+  background: #00bcd4;
 }
 
 .t-s8 .c-tt-buy-button--locked {
-  background: #9E9E9E;
+  background: #9e9e9e;
   border: none;
-  box-shadow: 1px 1px 1px 0 #000;
+  box-shadow: 1px 1px 1px 0 #000000;
 }
 
 .t-s8 .c-tt-buy-button--locked:hover {
-  background: #EF5350;
+  background: #ef5350;
 }
diff --git a/public/stylesheets/theme-S9.css b/public/stylesheets/theme-S9.css
index ad4321620..03ff6b9ab 100644
--- a/public/stylesheets/theme-S9.css
+++ b/public/stylesheets/theme-S9.css
@@ -1,10 +1,11 @@
 * {
   color: transparent !important;
   text-shadow: none !important;
+  -webkit-user-select: none;
   user-select: none;
 }
 
-[ach-tooltip]:before {
+[ach-tooltip]::before {
   color: transparent;
 }
 
@@ -51,4 +52,4 @@
 
 .o-celestial-nav__legend-text {
   fill: transparent !important;
-}
\ No newline at end of file
+}
diff --git a/public/stylesheets/time-studies.css b/public/stylesheets/time-studies.css
index 8276984fd..43fd97edf 100644
--- a/public/stylesheets/time-studies.css
+++ b/public/stylesheets/time-studies.css
@@ -35,7 +35,7 @@
   z-index: 0;
 }
 
-/*#region o-time-study*/
+/* #region o-time-study */
 
 .c-pelle-useless {
   border: 0.1rem solid;
@@ -46,7 +46,7 @@
   height: 10rem;
   transition-duration: 0.2s;
   border-radius: var(--var-border-radius, 0.4rem);
-  font-size: 1.0rem;
+  font-size: 1rem;
 }
 
 .c-pelle-useless-available {
@@ -80,7 +80,7 @@
   height: 10rem;
   transition-duration: 0.2s;
   border-radius: var(--var-border-radius, 0.4rem);
-  font-size: 1.0rem;
+  font-size: 1rem;
 }
 
 .o-time-study--available {
@@ -115,9 +115,9 @@
 }
 
 @keyframes a-time-study {
-  0%   { box-shadow: inset 0 0 0.3rem 0 }
-  50%  { box-shadow: inset 0 0 2rem 0 }
-  100% { box-shadow: inset 0 0 0.3rem 0 }
+  0% { box-shadow: inset 0 0 0.3rem 0; }
+  50% { box-shadow: inset 0 0 2rem 0; }
+  100% { box-shadow: inset 0 0 0.3rem 0; }
 }
 
 .o-time-study--small {
@@ -231,7 +231,7 @@
 }
 
 .o-time-study-dilation--available:hover {
-  color: #64DD17;
+  color: #64dd17;
   background-color: white;
   animation: a-time-study-dilation 10s infinite;
 }
@@ -260,11 +260,11 @@
 }
 
 @keyframes a-time-study-dilation {
-  0%   { box-shadow: inset 0.5rem  0       2rem }
-  25%  { box-shadow: inset 0       0.5rem  2rem }
-  50%  { box-shadow: inset -0.5rem 0       2rem }
-  75%  { box-shadow: inset 0       -0.5rem 2rem }
-  100% { box-shadow: inset 0.5rem  0       2rem }
+  0% { box-shadow: inset 0.5rem  0       2rem; }
+  25% { box-shadow: inset 0       0.5rem  2rem; }
+  50% { box-shadow: inset -0.5rem 0       2rem; }
+  75% { box-shadow: inset 0       -0.5rem 2rem; }
+  100% { box-shadow: inset 0.5rem  0       2rem; }
 }
 
 .o-time-study-normal--unavailable {
@@ -394,11 +394,11 @@
 }
 
 @keyframes a-eternity-challenge-running {
-  0%   { box-shadow: inset 1rem  0       3rem #490066 }
-  25%  { box-shadow: inset 0     0.5rem  3rem #490066 }
-  50%  { box-shadow: inset -1rem 0       3rem #490066 }
-  75%  { box-shadow: inset 0     -0.5rem 3rem #490066 }
-  100% { box-shadow: inset 1rem  0       3rem #490066 }
+  0% { box-shadow: inset 1rem  0       3rem #490066; }
+  25% { box-shadow: inset 0     0.5rem  3rem #490066; }
+  50% { box-shadow: inset -1rem 0       3rem #490066; }
+  75% { box-shadow: inset 0     -0.5rem 3rem #490066; }
+  100% { box-shadow: inset 1rem  0       3rem #490066; }
 }
 
 .o-time-study-dilation--bought {
@@ -481,7 +481,7 @@
   cursor: default;
 }
 
-/*#endregion o-time-study*/
+/* #endregion o-time-study */
 
 .o-time-study-connection {
   /* This one should be px, because it rem svg behaves weirdly under scale */
diff --git a/public/stylesheets/tooltips.css b/public/stylesheets/tooltips.css
index 7b1844a10..55f24c714 100644
--- a/public/stylesheets/tooltips.css
+++ b/public/stylesheets/tooltips.css
@@ -5,7 +5,7 @@
 }
 
 .general-tooltip .tooltip-inner {
-  background: rgba(0, 0, 0, 0.9);
+  background: rgba(0, 0, 0, 90%);
   color: white;
   border-radius: var(--var-border-radius, 3px);
   width: 160px;
@@ -14,6 +14,7 @@
   font-family: Typewriter, serif;
   font-size: 14px;
   line-height: 1.2;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -47,7 +48,7 @@
   height: 0;
   position: absolute;
   margin: 5px;
-  border: solid rgba(0, 0, 0, 0.9);
+  border: solid rgba(0, 0, 0, 90%);
   z-index: 1;
 }
 
@@ -56,7 +57,7 @@
 }
 
 .general-tooltip[x-placement^="top"] .tooltip-arrow {
-  border-width: 5px 5px 0 5px  !important;
+  border-width: 5px 5px 0 !important;
   border-left-color: transparent !important;
   border-right-color: transparent !important;
   border-bottom-color: transparent !important;
@@ -71,7 +72,7 @@
 }
 
 .general-tooltip[x-placement^="bottom"] .tooltip-arrow {
-  border-width: 0 5px 5px 5px;
+  border-width: 0 5px 5px;
   border-left-color: transparent !important;
   border-right-color: transparent !important;
   border-top-color: transparent !important;
@@ -116,20 +117,20 @@
   color: black;
   padding: 24px;
   border-radius: var(--var-border-radius, 5px);
-  box-shadow: 0 5px 30px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 5px 30px rgba(0, 0, 0, 10%);
 }
 
 .general-tooltip.popover .popover-arrow {
   border-color: #f9f9f9;
 }
 
-.general-tooltip[aria-hidden='true'] {
+.general-tooltip[aria-hidden="true"] {
   visibility: hidden;
   opacity: 0;
   transition: opacity 0.3s, visibility 0.3s;
 }
 
-.general-tooltip[aria-hidden='false'] {
+.general-tooltip[aria-hidden="false"] {
   visibility: visible;
   opacity: 1;
   transition: opacity 0.3s;
diff --git a/public/stylesheets/vue-sfc-classes.css b/public/stylesheets/vue-sfc-classes.css
index 47fb73b43..d6c6c7167 100644
--- a/public/stylesheets/vue-sfc-classes.css
+++ b/public/stylesheets/vue-sfc-classes.css
@@ -45,6 +45,7 @@
   white-space: nowrap;
   font-weight: bold;
   text-align: left;
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -86,7 +87,7 @@
 }
 
 .old-ui .t-s1 .c-news-ticker {
-  background-color: #dbd242
+  background-color: #dbd242;
 }
 
 .old-ui .t-s6 .c-news-ticker,
diff --git a/src/components/BlobBackground.vue b/src/components/BlobBackground.vue
index e87d07514..327470a65 100644
--- a/src/components/BlobBackground.vue
+++ b/src/components/BlobBackground.vue
@@ -46,13 +46,15 @@ export default {
 <style scoped>
 .o-blob-background {
   fill: #fbc21b;
-  text-shadow: 0 0 5px #000,
-               0 0 5px #000,
-               0 0 5px #000;
+  text-shadow:
+    0 0 5px #000000,
+    0 0 5px #000000,
+    0 0 5px #000000;
   opacity: 0.3;
   overflow: visible;
   pointer-events: none;
+  -webkit-user-select: none;
   user-select: none;
   cursor: default;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/BlobSnowflake.vue b/src/components/BlobSnowflake.vue
index deda011cb..a7240c736 100644
--- a/src/components/BlobSnowflake.vue
+++ b/src/components/BlobSnowflake.vue
@@ -98,12 +98,14 @@ export default {
 <style scoped>
 .o-blob-snowflake {
   fill: #fbc21b;
-  text-shadow: 0 0 5px #000,
-               0 0 5px #000,
-               0 0 5px #000;
+  text-shadow:
+    0 0 5px #000000,
+    0 0 5px #000000,
+    0 0 5px #000000;
   opacity: 0.9;
   overflow: visible;
   pointer-events: none;
+  -webkit-user-select: none;
   user-select: none;
   cursor: default;
 }
diff --git a/src/components/BlobSnowflakes.vue b/src/components/BlobSnowflakes.vue
index e344c4754..78a228f8d 100644
--- a/src/components/BlobSnowflakes.vue
+++ b/src/components/BlobSnowflakes.vue
@@ -75,6 +75,7 @@ export default {
   z-index: 9999;
   overflow: visible;
   pointer-events: none;
+  -webkit-user-select: none;
   user-select: none;
   cursor: default;
 }
@@ -88,6 +89,7 @@ export default {
   z-index: -9999;
   overflow: visible;
   pointer-events: none;
+  -webkit-user-select: none;
   user-select: none;
   cursor: default;
 }
diff --git a/src/components/CustomizeableTooltip.vue b/src/components/CustomizeableTooltip.vue
index 74e323f9b..5e81325e0 100644
--- a/src/components/CustomizeableTooltip.vue
+++ b/src/components/CustomizeableTooltip.vue
@@ -151,8 +151,8 @@ export default {
   padding: 0.7rem;
   width: 16rem;
   border-radius: var(--var-border-radius, 0.3rem);
-  background-color: hsla(0, 0%, 5%, 0.9);
-  color: #fff;
+  background-color: hsla(0deg, 0%, 5%, 90%);
+  color: #ffffff;
   content: attr(ach-tooltip);
   text-align: center;
   font-size: 1.4rem;
@@ -180,7 +180,7 @@ export default {
 }
 
 .c-tooltip--top.c-tooltip-arrow {
-  border-top: 0.55rem solid hsla(0, 0%, 5%, 0.9);
+  border-top: 0.55rem solid hsla(0deg, 0%, 5%, 90%);
   border-bottom: 0;
 }
 
@@ -189,7 +189,7 @@ export default {
 }
 
 .c-tooltip--bottom.c-tooltip-arrow {
-  border-bottom: 0.55rem solid hsla(0, 0%, 5%, 0.9);
+  border-bottom: 0.55rem solid hsla(0deg, 0%, 5%, 90%);
   border-top: 0;
 }
 
@@ -198,7 +198,7 @@ export default {
 }
 
 .c-tooltip--right.c-tooltip-arrow {
-  border-right: 0.55rem solid hsla(0, 0%, 5%, 0.9);
+  border-right: 0.55rem solid hsla(0deg, 0%, 5%, 90%);
   border-left: 0;
 }
 
@@ -207,7 +207,7 @@ export default {
 }
 
 .c-tooltip--left.c-tooltip-arrow {
-  border-left: 0.55rem solid hsla(0, 0%, 5%, 0.9);
+  border-left: 0.55rem solid hsla(0deg, 0%, 5%, 90%);
   border-right: 0;
 }
 
diff --git a/src/components/ExpandingControlBox.vue b/src/components/ExpandingControlBox.vue
index 4a2466116..6dbb5976c 100644
--- a/src/components/ExpandingControlBox.vue
+++ b/src/components/ExpandingControlBox.vue
@@ -208,12 +208,10 @@ export default {
   width: 100%;
   left: 50%;
   transform: translateX(-50%);
-  -webkit-transform: translateX(-50%);
 }
 
 .l-expanding-control-box__container--transition {
   transition: max-height 0.5s;
-  -webkit-transition: max-height 0.5s;
 }
 
 .l-expanding-control-box__button {
diff --git a/src/components/SaveTimer.vue b/src/components/SaveTimer.vue
index a603a8d8a..2059859a8 100644
--- a/src/components/SaveTimer.vue
+++ b/src/components/SaveTimer.vue
@@ -47,6 +47,7 @@ export default {
   border-top: 0.1rem solid var(--color-accent);
   border-right: 0.1rem solid var(--color-accent);
   cursor: pointer;
+  -webkit-user-select: none;
   user-select: none;
   padding: 0 0.5rem;
   z-index: 5;
@@ -54,7 +55,7 @@ export default {
 
 .t-inverted .o-save-timer,
 .t-inverted-metro .o-save-timer {
-  filter: invert(100%)
+  filter: invert(100%);
 }
 
 .t-s2 .o-save-timer {
@@ -64,4 +65,4 @@ export default {
 .t-s3 .o-save-timer {
   animation: glasses 7s infinite;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/SpeedrunStatus.vue b/src/components/SpeedrunStatus.vue
index 5f2b30f1d..91b00a228 100644
--- a/src/components/SpeedrunStatus.vue
+++ b/src/components/SpeedrunStatus.vue
@@ -114,6 +114,7 @@ export default {
   background-color: var(--color-base);
   white-space: nowrap;
   border: var(--var-border-width, 0.2rem) solid var(--color-accent);
+  -webkit-user-select: none;
   user-select: none;
   padding: 0.8rem 2rem;
   z-index: 5;
diff --git a/src/components/modals/InformationModal.vue b/src/components/modals/InformationModal.vue
index 4f1200263..2e9b805f2 100644
--- a/src/components/modals/InformationModal.vue
+++ b/src/components/modals/InformationModal.vue
@@ -95,6 +95,7 @@ export default {
 .l-information-modal {
   display: flex;
   flex-direction: column;
+  /* stylelint-disable-next-line unit-allowed-list */
   width: calc(100vw - 50vh);
   justify-content: space-around;
 }
@@ -125,15 +126,15 @@ export default {
 }
 
 .c-socials--icon__wrapper {
-  transition: all .2s ease-in-out;
+  transition: all 0.2s ease-in-out;
 }
 
 .c-socials--icon__wrapper:hover {
   transform: scale(1.1);
 }
 
-[ach-tooltip]:before {
+[ach-tooltip]::before {
   width: 20rem;
   font-size: 1.5rem;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/modals/ModalProgressBar.vue b/src/components/modals/ModalProgressBar.vue
index 254b8bdda..07cf78a5d 100644
--- a/src/components/modals/ModalProgressBar.vue
+++ b/src/components/modals/ModalProgressBar.vue
@@ -81,7 +81,9 @@ export default {
   align-items: center;
   justify-content: space-between;
   width: 40rem;
+  /* stylelint-disable-next-line unit-allowed-list */
   left: 50vw;
+  /* stylelint-disable-next-line unit-allowed-list */
   top: 50vh;
   transform: translate(-50%, -50%);
 }
@@ -117,4 +119,4 @@ export default {
   font-size: large;
   padding-bottom: 0.5rem;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/tabs/automator/AutomatorControls.vue b/src/components/tabs/automator/AutomatorControls.vue
index c4159320d..7e4f07567 100644
--- a/src/components/tabs/automator/AutomatorControls.vue
+++ b/src/components/tabs/automator/AutomatorControls.vue
@@ -115,7 +115,7 @@ export default {
   border-color: var(--color-reality-light);
 }
 
-.c-automator__button.fa-eject:before {
+.c-automator__button.fa-eject::before {
   transform: rotate(90deg);
 }
 </style>
diff --git a/src/components/tabs/automator/AutomatorEditor.vue b/src/components/tabs/automator/AutomatorEditor.vue
index 71e6d5e56..4de640555 100644
--- a/src/components/tabs/automator/AutomatorEditor.vue
+++ b/src/components/tabs/automator/AutomatorEditor.vue
@@ -163,7 +163,7 @@ export default {
   z-index: 1;
 }
 
-.c-slider-toggle-button:before {
+.c-slider-toggle-button::before {
   content: "";
   position: absolute;
   top: 0;
@@ -176,12 +176,12 @@ export default {
   z-index: 0;
 }
 
-.c-slider-toggle-button--right:before {
+.c-slider-toggle-button--right::before {
   left: 3rem;
   background-color: white;
 }
 
-.tutorial--glow:after {
+.tutorial--glow::after {
   z-index: 2;
 }
 </style>
diff --git a/src/components/tabs/black-hole/BlackHoleTab.vue b/src/components/tabs/black-hole/BlackHoleTab.vue
index 5b5ae1d7e..b49f8a729 100644
--- a/src/components/tabs/black-hole/BlackHoleTab.vue
+++ b/src/components/tabs/black-hole/BlackHoleTab.vue
@@ -219,7 +219,7 @@ export default {
 
 <style scoped>
 .l-auto-pause-button {
-  width: 30rem
+  width: 30rem;
 }
 
 .l-pre-unlock-text {
diff --git a/src/components/tabs/celestial-laitela/SingularityPane.vue b/src/components/tabs/celestial-laitela/SingularityPane.vue
index 874b6cca9..5f6d21c93 100644
--- a/src/components/tabs/celestial-laitela/SingularityPane.vue
+++ b/src/components/tabs/celestial-laitela/SingularityPane.vue
@@ -180,6 +180,6 @@ export default {
 
 <style scoped>
 .c-laitela-singularity__cap-control {
-  margin: 0 0.3rem 1rem 0.3rem;
+  margin: 0 0.3rem 1rem;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/tabs/celestial-pelle/CreditsContainer.vue b/src/components/tabs/celestial-pelle/CreditsContainer.vue
index cc84c9e0b..f3e2463a6 100644
--- a/src/components/tabs/celestial-pelle/CreditsContainer.vue
+++ b/src/components/tabs/celestial-pelle/CreditsContainer.vue
@@ -132,7 +132,6 @@ export default {
   font-size: 1.3rem;
 }
 
-
 .c-credits-cel-symbol {
   position: absolute;
   font-size: 14rem;
@@ -155,7 +154,7 @@ export default {
 .c-effarig-credits {
   left: 80%;
   top: 50rem;
-  color: #f40;
+  color: #ff4400;
   animation: a-effarig-credits 4s ease-in-out infinite;
 }
 
@@ -209,9 +208,20 @@ export default {
 }
 
 @keyframes a-effarig-credits {
-  0% { opacity: 0.8; text-shadow: 0 0 3rem; }
-  50% { opacity: 1; text-shadow: 0 0 4rem, 0 0 4rem; }
-  100% { opacity: 0.8; text-shadow: 0 0 3rem; }
+  0% {
+    opacity: 0.8;
+    text-shadow: 0 0 3rem;
+  }
+
+  50% {
+    opacity: 1;
+    text-shadow: 0 0 4rem, 0 0 4rem;
+  }
+
+  100% {
+    opacity: 0.8;
+    text-shadow: 0 0 3rem;
+  }
 }
 
 @keyframes a-enslaved-credits {
@@ -232,9 +242,20 @@ perfectly the same. */
 }
 
 @keyframes a-ra-credits {
-  0% { opacity: 0.1; transform: translateX(-50%) scale(0.2); }
-  50% { opacity: 0.4; transform: translateX(-50%) scale(0.9); }
-  100% { opacity: 0.1; transform: translateX(-50%) scale(0.2); }
+  0% {
+    opacity: 0.1;
+    transform: translateX(-50%) scale(0.2);
+  }
+
+  50% {
+    opacity: 0.4;
+    transform: translateX(-50%) scale(0.9);
+  }
+
+  100% {
+    opacity: 0.1;
+    transform: translateX(-50%) scale(0.2);
+  }
 }
 
 @keyframes a-laitela-credits {
diff --git a/src/components/tabs/celestial-pelle/FadeToBlack.vue b/src/components/tabs/celestial-pelle/FadeToBlack.vue
index 3d25c842b..751fc1e9a 100644
--- a/src/components/tabs/celestial-pelle/FadeToBlack.vue
+++ b/src/components/tabs/celestial-pelle/FadeToBlack.vue
@@ -25,13 +25,13 @@ export default {
 </template>
 
 <style scoped>
-  .black-overlay {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: black;
-    z-index: 8;
-  }
+.black-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: black;
+  z-index: 8;
+}
 </style>
diff --git a/src/components/tabs/celestial-pelle/PelleBarPanel.vue b/src/components/tabs/celestial-pelle/PelleBarPanel.vue
index 2f2c528d4..7de5ef015 100644
--- a/src/components/tabs/celestial-pelle/PelleBarPanel.vue
+++ b/src/components/tabs/celestial-pelle/PelleBarPanel.vue
@@ -75,6 +75,7 @@ export default {
   left: 1.5rem;
   top: 50%;
   transform: translateY(-50%);
+  cursor: pointer;
 }
 
 .l-pelle-panel-container {
@@ -82,6 +83,7 @@ export default {
   margin: 1rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.2rem);
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -102,8 +104,4 @@ export default {
   flex-direction: column;
   justify-content: flex-start;
 }
-
-.c-collapse-icon-clickable {
-  cursor: pointer;
-}
 </style>
diff --git a/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue b/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue
index 384a0719d..43d7b8270 100644
--- a/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue
+++ b/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue
@@ -156,6 +156,7 @@ export default {
   left: 1.5rem;
   top: 50%;
   transform: translateY(-50%);
+  cursor: pointer;
 }
 
 .l-pelle-panel-container {
@@ -163,6 +164,7 @@ export default {
   margin: 1rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.2rem);
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -196,7 +198,6 @@ export default {
   font-size: 2.5rem;
   background: linear-gradient(var(--color-pelle--secondary), var(--color-pelle--base));
   background-clip: text;
-  -webkit-background-clip: text;
   -webkit-text-fill-color: transparent;
 }
 
@@ -221,6 +222,7 @@ export default {
   height: 11.4rem;
   overflow: hidden;
   box-shadow: inset 0 0 0.1rem 0.1rem var(--color-pelle--base);
+
   /* box-shadow is here to prevent a weird grey border forming around the background */
 }
 
@@ -257,8 +259,4 @@ export default {
   font-size: 2rem;
   text-shadow: 0.2rem 0.2rem 0.2rem black;
 }
-
-.c-collapse-icon-clickable {
-  cursor: pointer;
-}
 </style>
diff --git a/src/components/tabs/celestial-pelle/PelleRift.vue b/src/components/tabs/celestial-pelle/PelleRift.vue
index 786302992..1cf5e8028 100644
--- a/src/components/tabs/celestial-pelle/PelleRift.vue
+++ b/src/components/tabs/celestial-pelle/PelleRift.vue
@@ -100,8 +100,9 @@ export default {
   margin-top: 1rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.5rem);
+
   /* transparent crimson */
-  box-shadow: inset 0 0 1rem 0.1rem rgba(237, 20, 61, 0.45), 0 0 1rem 0.1rem rgba(237, 20, 61, 0.45);
+  box-shadow: inset 0 0 1rem 0.1rem rgba(237, 20, 61, 45%), 0 0 1rem 0.1rem rgba(237, 20, 61, 45%);
 }
 
 .t-s1 .c-pelle-rift {
diff --git a/src/components/tabs/celestial-pelle/PelleRiftBar.vue b/src/components/tabs/celestial-pelle/PelleRiftBar.vue
index 51678d9e9..7a5259f4c 100644
--- a/src/components/tabs/celestial-pelle/PelleRiftBar.vue
+++ b/src/components/tabs/celestial-pelle/PelleRiftBar.vue
@@ -184,6 +184,7 @@ export default {
 
 .c-pelle-rift-bar {
   --color-bar-bg: #1e1e1e;
+
   height: 5rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--secondary);
   border-radius: var(--var-border-radius, 0.5rem);
@@ -195,16 +196,12 @@ export default {
   align-items: center;
   background: var(--color-bar-bg);
 }
+
 .c-pelle-rift-bar--filling,
 .c-pelle-rift-bar--idle {
   cursor: pointer;
 }
 
-.c-pelle-rift-bar--idle .l-overflow-hidden,
-.c-pelle-rift-bar--idle .o-pelle-rift-bar-percentage {
-  opacity: 0.6;
-}
-
 .l-overflow-hidden {
   overflow: hidden;
   border: var(--var-border-width, 0.16rem) solid transparent;
@@ -231,7 +228,6 @@ export default {
   box-shadow: inset 0 0 0.3rem 0.1rem var(--color-pelle--secondary);
 }
 
-
 /* FILLING STYLES */
 .o-pelle-rift-bar-fill {
   position: absolute;
@@ -251,10 +247,8 @@ export default {
   background: var(--color-pelle--base);
   z-index: 0;
   filter: brightness(0.5);
-  z-index: 0;
 }
 
-
 /* SPECIAL BAR OVERLAY STYLES */
 .o-pelle-rift-bar-permanent {
   position: absolute;
@@ -278,15 +272,15 @@ export default {
 
 @keyframes a-pelle-bar-overfill-pulse {
   /* #ed143d66 is the base pelle colour except transparent. */
-  0% { box-shadow: 0 0 0.7rem 1rem rgba(237, 20, 61, 0.4); }
-  50% { box-shadow: 0 0 1.5rem 0 rgba(237, 20, 61, 0.4); }
-  100% { box-shadow: 0 0 0.7rem 1rem rgba(237, 20, 61, 0.4); }
+  0% { box-shadow: 0 0 0.7rem 1rem rgba(237, 20, 61, 40%); }
+  50% { box-shadow: 0 0 1.5rem 0 rgba(237, 20, 61, 40%); }
+  100% { box-shadow: 0 0 0.7rem 1rem rgba(237, 20, 61, 40%); }
 }
 
 @keyframes a-pelle-bar-overfill-pulse-but-green {
-  0% { box-shadow: 0 0 0.7rem 1rem rgba(124, 183, 39, 0.533); }
-  50% { box-shadow: 0 0 1.5rem 0rem rgba(124, 183, 39, 0.533); }
-  100% { box-shadow: 0 0 0.7rem 1rem rgba(124, 183, 39, 0.533); }
+  0% { box-shadow: 0 0 0.7rem 1rem rgba(124, 183, 39, 53.3%); }
+  50% { box-shadow: 0 0 1.5rem 0 rgba(124, 183, 39, 53.3%); }
+  100% { box-shadow: 0 0 0.7rem 1rem rgba(124, 183, 39, 53.3%); }
 }
 
 .c-pelle-rift-bar-overfill-container {
@@ -297,13 +291,27 @@ export default {
   animation: a-pelle-bar-overfill-pulse-but-green 1s infinite linear;
 }
 
-
 /* ACTIVE RIFT FILLING STYLES */
 @keyframes a-pelle-bar-filling-sweep {
-  0% { left: 0; width: 0; }
-  10% { left: 0; width: 2rem; }
-  90% { left: calc(100% - 2rem); width: 2rem;  }
-  100% { left: 100%; width: 0; }
+  0% {
+    left: 0;
+    width: 0;
+  }
+
+  10% {
+    left: 0;
+    width: 2rem;
+  }
+
+  90% {
+    left: calc(100% - 2rem);
+    width: 2rem;
+  }
+
+  100% {
+    left: 100%;
+    width: 0;
+  }
 }
 
 .o-pelle-rift-bar-active-fill {
@@ -321,21 +329,27 @@ export default {
   color: white;
   text-shadow: 0.1rem 0.1rem 0.2rem var(--color-pelle--base);
   z-index: 2;
+
   /* This keeps the percentage from blocking the hover area */
   pointer-events: none;
 }
 
+.c-pelle-rift-bar--idle .l-overflow-hidden,
+.c-pelle-rift-bar--idle .o-pelle-rift-bar-percentage {
+  opacity: 0.6;
+}
+
 /* MILESTONE STYLES */
 .o-pelle-rift-bar-milestone-hover-container {
   height: 100%;
 }
 
 @keyframes a-pelle-bar-unfinished-milestone-flash {
-  0% { opacity: 1 }
-  20% { opacity: 1 }
-  50% { opacity: 0.3 }
-  80% { opacity: 1 }
-  100% { opacity: 1 }
+  0% { opacity: 1; }
+  20% { opacity: 1; }
+  50% { opacity: 0.3; }
+  80% { opacity: 1; }
+  100% { opacity: 1; }
 }
 
 .o-pelle-rift-bar-milestone-line {
diff --git a/src/components/tabs/celestial-pelle/PelleTab.vue b/src/components/tabs/celestial-pelle/PelleTab.vue
index 6f08ba9cd..45e8e9244 100644
--- a/src/components/tabs/celestial-pelle/PelleTab.vue
+++ b/src/components/tabs/celestial-pelle/PelleTab.vue
@@ -187,7 +187,7 @@ export default {
 }
 
 @keyframes roll {
-  100% { transform: rotateY(360deg) }
+  100% { transform: rotateY(360deg); }
 }
 
 .pelle-icon {
diff --git a/src/components/tabs/celestial-pelle/PelleUpgrade.vue b/src/components/tabs/celestial-pelle/PelleUpgrade.vue
index c120eb681..cb79ab615 100644
--- a/src/components/tabs/celestial-pelle/PelleUpgrade.vue
+++ b/src/components/tabs/celestial-pelle/PelleUpgrade.vue
@@ -184,7 +184,7 @@ export default {
   transition-duration: 0.3s;
 }
 
-
+/* stylelint-disable-next-line selector-class-pattern */
 .c-pelle-upgrade--galaxyGenerator {
   background: linear-gradient(var(--color-pelle--secondary), var(--color-pelle--base));
   color: black;
@@ -211,6 +211,7 @@ export default {
   color: black;
 }
 
+/* stylelint-disable-next-line selector-class-pattern */
 .c-pelle-upgrade--galaxyGenerator:hover,
 .c-pelle-upgrade--unavailable:hover,
 .c-pelle-upgrade--faded:hover,
@@ -220,12 +221,12 @@ export default {
 }
 
 .l-pelle-upgrade-gap {
-  height: 0.5em;
+  height: 0.5rem;
   flex-shrink: 0;
 }
 
 .c-improved-effect {
-  color: #0b0;
+  color: #00bb00;
   font-weight: bold;
   font-style: italic;
 }
diff --git a/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue b/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue
index d3acf3538..287d845db 100644
--- a/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue
+++ b/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue
@@ -146,6 +146,7 @@ export default {
   left: 1.5rem;
   top: 50%;
   transform: translateY(-50%);
+  cursor: pointer;
 }
 
 .l-pelle-panel-container {
@@ -153,6 +154,7 @@ export default {
   margin: 1rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.5rem);
+  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -209,8 +211,4 @@ export default {
   font-size: 2rem;
   color: var(--color-pelle--base);
 }
-
-.c-collapse-icon-clickable {
-  cursor: pointer;
-}
 </style>
diff --git a/src/components/tabs/celestial-pelle/RemnantGainFactor.vue b/src/components/tabs/celestial-pelle/RemnantGainFactor.vue
index 5ba75ba6a..e0b005a33 100644
--- a/src/components/tabs/celestial-pelle/RemnantGainFactor.vue
+++ b/src/components/tabs/celestial-pelle/RemnantGainFactor.vue
@@ -153,7 +153,7 @@ export default {
 
 .l-remnant-factors-row {
   display: flex;
-  width: 100%
+  width: 100%;
 }
 
 .l-remnant-factors-col {
diff --git a/src/components/tabs/celestial-ra/RaPet.vue b/src/components/tabs/celestial-ra/RaPet.vue
index 553f5ef90..93a779eb4 100644
--- a/src/components/tabs/celestial-ra/RaPet.vue
+++ b/src/components/tabs/celestial-ra/RaPet.vue
@@ -307,11 +307,13 @@ export default {
   display: flex;
   justify-content: center;
 }
+
 .c-ra-pet-upgrade-memory {
   border-top-right-radius: 0;
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
+
 .c-ra-pet-upgrade-chunk {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
diff --git a/src/components/tabs/celestial-v/VTab.vue b/src/components/tabs/celestial-v/VTab.vue
index 72ec26c31..e76790bf7 100644
--- a/src/components/tabs/celestial-v/VTab.vue
+++ b/src/components/tabs/celestial-v/VTab.vue
@@ -335,6 +335,6 @@ export default {
 }
 
 .l-v-goal-reduction-spacer {
-  height :0.8rem;
+  height: 0.8rem;
 }
 </style>
diff --git a/src/components/tabs/glyphs/GlyphLevelsAndWeights.vue b/src/components/tabs/glyphs/GlyphLevelsAndWeights.vue
index d89f02684..2b51c02c9 100644
--- a/src/components/tabs/glyphs/GlyphLevelsAndWeights.vue
+++ b/src/components/tabs/glyphs/GlyphLevelsAndWeights.vue
@@ -547,7 +547,6 @@ function roundPreservingSum(data) {
 
 <style scoped>
 .l-glyph-level-and-weights-note {
-  grid-column-start: 1;
-  grid-column-end: 5;
+  grid-column: 1 / 5;
 }
 </style>
diff --git a/src/components/tabs/glyphs/sidebar/SelectedEffectToggle.vue b/src/components/tabs/glyphs/sidebar/SelectedEffectToggle.vue
index f22f585ab..4a832972f 100644
--- a/src/components/tabs/glyphs/sidebar/SelectedEffectToggle.vue
+++ b/src/components/tabs/glyphs/sidebar/SelectedEffectToggle.vue
@@ -106,6 +106,7 @@ export default {
   color: black;
   font-size: 1rem;
   position: absolute;
+
   /* -0.1rem = -1px, needed because CSS renders a black border between the check and the border of the selector
   otherwise */
   top: -0.1rem;
diff --git a/src/components/tabs/perks/PerkPointLabel.vue b/src/components/tabs/perks/PerkPointLabel.vue
index 3eb97d55c..8cda01d78 100644
--- a/src/components/tabs/perks/PerkPointLabel.vue
+++ b/src/components/tabs/perks/PerkPointLabel.vue
@@ -71,7 +71,7 @@ export default {
 </template>
 
 <style scoped>
-  .perk-settings > button {
-    margin-right: 1rem;
-  }
+.perk-settings > button {
+  margin-right: 1rem;
+}
 </style>
diff --git a/src/components/tabs/replicanti/ReplicantiTab.vue b/src/components/tabs/replicanti/ReplicantiTab.vue
index 9faa30b43..24bc8ffb3 100644
--- a/src/components/tabs/replicanti/ReplicantiTab.vue
+++ b/src/components/tabs/replicanti/ReplicantiTab.vue
@@ -215,4 +215,5 @@ export default {
 </template>
 
 <style scoped>
+
 </style>
diff --git a/src/components/tabs/shop/ShopButton.vue b/src/components/tabs/shop/ShopButton.vue
index 876edbade..7c7121382 100644
--- a/src/components/tabs/shop/ShopButton.vue
+++ b/src/components/tabs/shop/ShopButton.vue
@@ -50,7 +50,7 @@ export default {
   padding: 1rem;
   border: var(--var-border-width, 0.2rem) solid #1f7d1f;
   border-radius: var(--var-border-radius, 0.5rem);
-  margin: .5rem;
+  margin: 0.5rem;
   background: #3c3c3c;
   color: white;
 }
@@ -63,7 +63,7 @@ export default {
   margin: auto;
   align-items: center;
   font-family: Typewriter;
-  padding: .5rem 2rem;
+  padding: 0.5rem 2rem;
   margin-top: 1rem;
   cursor: pointer;
 }
diff --git a/src/components/tabs/shop/ShopTab.vue b/src/components/tabs/shop/ShopTab.vue
index c4c517512..843382861 100644
--- a/src/components/tabs/shop/ShopTab.vue
+++ b/src/components/tabs/shop/ShopTab.vue
@@ -146,7 +146,7 @@ export default {
   margin: auto;
   align-items: center;
   font-family: Typewriter;
-  padding: .5rem 2rem;
+  padding: 0.5rem 2rem;
   margin-top: 1rem;
   cursor: pointer;
 }
diff --git a/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue b/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue
index 4c9124c11..85ecfa061 100644
--- a/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue
+++ b/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue
@@ -123,12 +123,12 @@ export default {
 
 <style scoped>
 .l-tt-save-load-btn__wrapper {
-  margin: 0.3em;
+  margin: 0.3rem;
   position: relative;
 }
 
 .l-tt-save-load-btn {
-  min-width: 2em;
+  min-width: 2rem;
 }
 
 .l-tt-save-load-btn__menu {
diff --git a/src/components/tabs/time-studies/tt-shop/TimeTheoremShop.vue b/src/components/tabs/time-studies/tt-shop/TimeTheoremShop.vue
index f3ea30a5d..09601bcda 100644
--- a/src/components/tabs/time-studies/tt-shop/TimeTheoremShop.vue
+++ b/src/components/tabs/time-studies/tt-shop/TimeTheoremShop.vue
@@ -131,7 +131,7 @@ export default {
 </script>
 
 <template>
-  <div class="TTbuttons">
+  <div class="time-theorem-buttons">
     <div class="ttshop-container ttshop-background">
       <div
         data-role="page"
@@ -219,7 +219,7 @@ export default {
       @click="minimize"
     >
       <span
-        id="minimizeArrow"
+        class="minimize-arrow"
         :style="minimizeArrowStyle"
       >▼</span>
     </button>
@@ -240,6 +240,6 @@ export default {
 }
 
 .ttbuttons-bottom-row-hide {
-  height: 0rem;
+  height: 0;
 }
 </style>
diff --git a/src/components/ui-modes/HeaderBlackHole.vue b/src/components/ui-modes/HeaderBlackHole.vue
index 1afa06db1..ae49f0baa 100644
--- a/src/components/ui-modes/HeaderBlackHole.vue
+++ b/src/components/ui-modes/HeaderBlackHole.vue
@@ -120,6 +120,7 @@ export default {
   margin: 0.2rem;
   vertical-align: middle;
 }
+
 .c-black-hole-status-text {
   margin: 0 0.8rem;
 }
diff --git a/src/components/ui-modes/modern/ModernTabButton.vue b/src/components/ui-modes/modern/ModernTabButton.vue
index 3186ab070..39fdfdbeb 100644
--- a/src/components/ui-modes/modern/ModernTabButton.vue
+++ b/src/components/ui-modes/modern/ModernTabButton.vue
@@ -105,7 +105,7 @@ export default {
 
 <style scoped>
 .o-tab-btn::before {
-  content: '';
+  content: "";
   width: 0;
   height: 100%;
   position: absolute;

From e07e35220ffbba99c125a438817150b810e31912 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 11 May 2022 10:34:47 -0700
Subject: [PATCH 31/89] fix appearance and em->rem oddities

---
 .stylelintrc.json                    |  2 +-
 public/stylesheets/glyphs.css        | 15 ++++++++++-----
 public/stylesheets/new-ui-styles.css |  8 ++++----
 public/stylesheets/styles.css        |  3 ++-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.stylelintrc.json b/.stylelintrc.json
index 8c5be5876..fd20ca7c4 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -16,7 +16,7 @@
         "property-no-vendor-prefix": [
             true,
             {
-                "ignoreProperties": ["appearance", "background-clip-text", "backdrop-filter", "clip-path", "user-select"]
+                "ignoreProperties": ["appearance", "background-clip", "backdrop-filter", "clip-path", "user-select"]
             }
         ],
 
diff --git a/public/stylesheets/glyphs.css b/public/stylesheets/glyphs.css
index dd065dc82..a0d288207 100644
--- a/public/stylesheets/glyphs.css
+++ b/public/stylesheets/glyphs.css
@@ -222,12 +222,14 @@
   border-radius: var(--var-border-radius, 0.2rem);
   border: solid 0.1rem;
   text-align: center;
-  appearance: textfield;
+  -webkit-appearance: none;
+  -moz-appearance: textfield;
 }
 
 .c-auto-sac-effect-tab__input::-webkit-inner-spin-button,
 .c-auto-sac-effect-tab__input::-webkit-outer-spin-button {
-  appearance: textfield;
+  -webkit-appearance: none;
+  -moz-appearance: textfield;
   margin: 0;
 }
 
@@ -240,7 +242,8 @@
   color: var(--color-reality-light);
   border-radius: var(--var-border-radius, 0.2rem);
   border: solid 0.1rem;
-  appearance: textfield;
+  -webkit-appearance: none;
+  -moz-appearance: textfield;
   margin: 0;
 }
 
@@ -259,7 +262,8 @@
 
 .c-auto-sac-type-tab__input::-webkit-outer-spin-button,
 .c-auto-sac-type-tab__input::-webkit-inner-spin-button {
-  appearance: textfield;
+  -webkit-appearance: none;
+  -moz-appearance: textfield;
   margin: 0;
 }
 
@@ -614,7 +618,8 @@
   border-bottom: 0.1rem solid;
   text-align: center;
   margin-bottom: 0.5rem;
-  appearance: textfield;
+  -webkit-appearance: none;
+  -moz-appearance: textfield;
 }
 
 .c-glyph-set-save-setting-button {
diff --git a/public/stylesheets/new-ui-styles.css b/public/stylesheets/new-ui-styles.css
index ab113963b..8b8593468 100644
--- a/public/stylesheets/new-ui-styles.css
+++ b/public/stylesheets/new-ui-styles.css
@@ -74,7 +74,7 @@ body.t-s9 {
 
 .resource h2 {
   margin: 0;
-  font-size: 1.7rem;
+  font-size: 1.9rem;
   z-index: 1;
 }
 
@@ -98,7 +98,7 @@ body.t-s9 {
 }
 
 .resource-name {
-  font-size: 0.8rem;
+  font-size: 1.2rem;
 }
 
 .o-sidebar-currency--antimatter {
@@ -166,7 +166,7 @@ body.t-s9 {
   border-width: 0.1rem;
   border-radius: 0;
   margin-top: -0.1rem;
-  font-size: 1.3rem;
+  font-size: 1.4rem;
   position: relative;
   transition-duration: 0.15s;
   transition-delay: 0.2s;
@@ -566,7 +566,7 @@ body.t-s9 {
   margin-top: 1rem;
   margin-bottom: 0.5rem;
   font-weight: bold;
-  font-size: 1.1rem;
+  font-size: 1.2rem;
   border-bottom: 0.1rem solid var(--color-good);
   padding-bottom: 0.6rem;
 }
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index bf3486c49..5cec90962 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -6047,7 +6047,7 @@ kbd {
 
 .l-celestial-quote-history__lines {
   font-size: 1.9rem;
-  line-height: 1.6rem;
+  line-height: 2.4rem;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -6435,6 +6435,7 @@ kbd {
 
 .c-effarig-run-button__inner--running {
   background-image: url("../images/noise.png");
+  -webkit-background-clip: text;
   background-clip: text;
   -webkit-text-fill-color: rgba(255, 0, 0, 50%);
   animation: a-effarig-run-button--running-noise 15s infinite alternate;

From 579c2e142f8aab18c3aa3358908e3d690406b568 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 11 May 2022 10:47:32 -0700
Subject: [PATCH 32/89] add stylelint-order, configure, and apply changes

---
 .stylelintrc.json                             |  338 ++-
 package-lock.json                             |   40 +
 package.json                                  |    1 +
 public/stylesheets/ad-slider-component.css    |  100 +-
 public/stylesheets/automator.css              |   92 +-
 public/stylesheets/glyphs.css                 |  412 ++--
 public/stylesheets/new-ui-styles.css          |  222 +-
 public/stylesheets/old-ui.css                 |   18 +-
 public/stylesheets/styles.css                 | 2090 +++++++++--------
 public/stylesheets/theme-Dark Metro.css       |    4 +-
 public/stylesheets/theme-Dark.css             |    2 +-
 public/stylesheets/theme-Inverted Metro.css   |    2 +-
 public/stylesheets/theme-Metro.css            |    2 +-
 public/stylesheets/theme-S1.css               |   16 +-
 public/stylesheets/theme-S10.css              |   10 +-
 public/stylesheets/theme-S11.css              |    4 +-
 public/stylesheets/theme-S2.css               |    2 +-
 public/stylesheets/theme-S4.css               |    6 +-
 public/stylesheets/theme-S6.css               |   10 +-
 public/stylesheets/theme-S7.css               |   20 +-
 public/stylesheets/theme-S8.css               |   10 +-
 public/stylesheets/time-studies.css           |   66 +-
 public/stylesheets/tooltips.css               |   52 +-
 public/stylesheets/vue-sfc-classes.css        |   10 +-
 src/components/BlobBackground.vue             |    4 +-
 src/components/BlobSnowflake.vue              |    4 +-
 src/components/BlobSnowflakes.vue             |   12 +-
 src/components/CustomizeableTooltip.vue       |   32 +-
 src/components/ExpandingControlBox.vue        |   14 +-
 src/components/SaveTimer.vue                  |   16 +-
 src/components/SpeedrunStatus.vue             |   12 +-
 src/components/modals/InformationModal.vue    |    6 +-
 src/components/modals/ModalProgressBar.vue    |   16 +-
 src/components/modals/PelleEffectsModal.vue   |    2 +-
 .../options/hidden-tabs/HiddenTabGroup.vue    |   10 +-
 .../tabs/automator/AutomatorBlocks.vue        |   11 +-
 .../tabs/automator/AutomatorButton.vue        |    4 +-
 .../automator/AutomatorDocsTemplateList.vue   |    2 +-
 .../tabs/automator/AutomatorEditor.vue        |   18 +-
 .../SingularityMilestoneComponent.vue         |    2 +-
 .../tabs/celestial-pelle/ArmageddonButton.vue |   12 +-
 .../tabs/celestial-pelle/CreditsContainer.vue |  192 +-
 .../tabs/celestial-pelle/FadeToBlack.vue      |    6 +-
 .../tabs/celestial-pelle/NewGame.vue          |   18 +-
 .../tabs/celestial-pelle/PelleBarPanel.vue    |   12 +-
 .../PelleGalaxyGeneratorPanel.vue             |   53 +-
 .../tabs/celestial-pelle/PelleRift.vue        |    8 +-
 .../tabs/celestial-pelle/PelleRiftBar.vue     |  253 +-
 .../tabs/celestial-pelle/PelleStrike.vue      |   16 +-
 .../tabs/celestial-pelle/PelleTab.vue         |   54 +-
 .../tabs/celestial-pelle/PelleUpgrade.vue     |   44 +-
 .../celestial-pelle/PelleUpgradePanel.vue     |   30 +-
 .../celestial-pelle/RemnantGainFactor.vue     |   10 +-
 src/components/tabs/celestial-ra/RaPet.vue    |    2 +-
 .../glyphs/sidebar/SelectedEffectToggle.vue   |    8 +-
 src/components/tabs/shop/ShopButton.vue       |   22 +-
 src/components/tabs/shop/ShopTab.vue          |   12 +-
 .../tt-shop/TimeStudySaveLoadButton.vue       |   22 +-
 src/components/ui-modes/HeaderBlackHole.vue   |    2 +-
 .../ui-modes/classic/ClassicSubtabButton.vue  |    6 +-
 .../ui-modes/classic/ClassicTabButton.vue     |    6 +-
 .../ui-modes/modern/ModernTabButton.vue       |    2 +-
 62 files changed, 2439 insertions(+), 2045 deletions(-)

diff --git a/.stylelintrc.json b/.stylelintrc.json
index fd20ca7c4..2ab809c30 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -1,4 +1,7 @@
 {
+    "plugins": [
+        "stylelint-order"
+    ],
     "extends": [
         "stylelint-config-standard",
         "stylelint-config-recommended-vue"
@@ -11,7 +14,8 @@
         "color-hex-length": "long",
         "custom-property-empty-line-before": null,
         "color-function-notation": null,
-
+        "declaration-empty-line-before": null,
+        "comment-empty-line-before": null,
 
         "property-no-vendor-prefix": [
             true,
@@ -52,6 +56,338 @@
             {
                 "message": "Expected id selector name to be kebab-case"
             }
+        ],
+
+        "order/order": [
+            "custom-properties",
+            "at-rules",
+            "rules",
+            "declarations"
+        ],
+        "order/properties-order": [
+            [
+                {
+                    "groupName": "content",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "content"
+                    ]
+                },
+                {
+                    "groupName": "display",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "display",
+                        "visibility",
+                        "float",
+                        "clear",
+                        "resize",
+                        "overflow",
+                        "overflow-x",
+                        "overflow-y",
+                        "white-space",
+                        "word-break",
+                        "overflow-wrap",
+                        "tab-size",
+                        "clip",
+                        "zoom"
+                    ]
+                },
+                {
+                    "groupName": "flex",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "flex",
+                        "flex-grow",
+                        "flex-shrink",
+                        "flex-basis",
+                        "flex-flow",
+                        "flex-direction",
+                        "flex-wrap"
+                    ]
+                },
+                {
+                    "groupName": "grid",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "grid",
+                        "grid-auto-columns",
+                        "grid-auto-flow",
+                        "grid-auto-rows",
+                        "grid-template-areas",
+                        "grid-template-columns",
+                        "grid-template-rows",
+                        "grid-row-gap",
+                        "grid-column-gap",
+                        "row-gap",
+                        "column-gap",
+                        "grid-row",
+                        "grid-row-start",
+                        "grid-row-end",
+                        "grid-column",
+                        "grid-column-start",
+                        "grid-column-end"
+                    ]
+                },
+                {
+                    "groupName": "table",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "table-layout",
+                        "empty-cells",
+                        "caption-side",
+                        "border-spacing",
+                        "border-collapse",
+                        "list-style",
+                        "list-style-position",
+                        "list-style-type",
+                        "list-style-image"
+                    ]
+                },
+                {
+                    "groupName": "size",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "width",
+                        "height",
+                        "min-width",
+                        "max-width",
+                        "min-height",
+                        "max-height"
+                    ]
+                },
+                {
+                    "groupName": "position",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "position",
+                        "will-change",
+                        "inset",
+                        "top",
+                        "right",
+                        "bottom",
+                        "left",
+                        "z-index"
+                    ]
+                },
+                {
+                    "groupName": "alignment",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "place-content",
+                        "justify-content",
+                        "align-content",
+                        "align-items",
+                        "align-self",
+                        "vertical-align",
+                        "text-align",
+                        "text-align-last"
+                    ]
+                },
+                {
+                    "groupName": "scrollbar",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "scrollbar-color",
+                        "scrollbar-width"
+                    ]
+                },
+                {
+                    "groupName": "svg",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "stroke",
+                        "stroke-width",
+                        "stroke-linecap",
+                        "stroke-dasharray",
+                        "fill",
+                        "text-anchor"
+                    ]
+                },
+                {
+                    "groupName": "font",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "font",
+                        "font-family",
+                        "font-size",
+                        "font-stretch",
+                        "font-style",
+                        "font-variant",
+                        "font-weight",
+                        "font-smoothing",
+                        "font-smooth",
+                        "line-height",
+                        "src",
+                        "unicode-range"
+                    ]
+                },
+                {
+                    "groupName": "color",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "opacity",
+                        "color"
+                    ]
+                },
+                {
+                    "groupName": "text",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "text-shadow",
+                        "text-decoration"
+                    ]
+                },
+                "appearance",
+                {
+                    "groupName": "background",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "background",
+                        "background-attachment",
+                        "background-clip",
+                        "background-color",
+                        "background-image",
+                        "background-origin",
+                        "background-position",
+                        "background-position-x",
+                        "background-position-y",
+                        "background-repeat",
+                        "background-size"
+                    ]
+                },
+                {
+                    "groupName": "border",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "border",
+                        "border-color",
+                        "border-style",
+                        "border-width",
+                        "border-top",
+                        "border-top-color",
+                        "border-top-style",
+                        "border-top-width",
+                        "border-right",
+                        "border-right-color",
+                        "border-right-style",
+                        "border-right-width",
+                        "border-bottom",
+                        "border-bottom-color",
+                        "border-bottom-style",
+                        "border-bottom-width",
+                        "border-left",
+                        "border-left-color",
+                        "border-left-style",
+                        "border-left-width",
+                        "border-radius",
+                        "border-top-left-radius",
+                        "border-top-right-radius",
+                        "border-bottom-right-radius",
+                        "border-bottom-left-radius",
+                        "border-spacing"
+                    ]
+                },
+                {
+                    "groupName": "box",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "box-shadow",
+                        "box-sizing"
+                    ]
+                },
+                {
+                    "groupName": "outline",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "outline",
+                        "outline-width",
+                        "outline-style",
+                        "outline-color",
+                        "outline-offset"
+                    ]
+                },
+                {
+                    "groupName": "margin",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "margin",
+                        "margin-top",
+                        "margin-right",
+                        "margin-bottom",
+                        "margin-left"
+                    ]
+                },
+                {
+                    "groupName": "padding",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "padding",
+                        "padding-top",
+                        "padding-right",
+                        "padding-bottom",
+                        "padding-left"
+                    ]
+                },
+                {
+                    "groupName": "animation",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "transform",
+                        "transform-origin",
+                        "filter",
+                        "mix-blend-mode",
+                        "transition",
+                        "transition-delay",
+                        "transition-timing-function",
+                        "transition-duration",
+                        "transition-property",
+                        "animation",
+                        "animation-name",
+                        "animation-duration",
+                        "animation-play-state",
+                        "animation-timing-function",
+                        "animation-delay",
+                        "animation-iteration-count",
+                        "animation-direction",
+                        "animation-fill-mode"
+                    ]
+                },
+                {
+                    "groupName": "pointer",
+                    "emptyLineBefore": "never",
+                    "noEmptyLineBetween": true,
+                    "properties": [
+                        "pointer-events",
+                        "user-select",
+                        "cursor"
+                    ]
+                }
+            ],
+            {
+                "unspecified": "bottomAlphabetical",
+                "emptyLineBeforeUnspecified": "always"
+            }
         ]
     }
 }
diff --git a/package-lock.json b/package-lock.json
index 07e1e288b..f14129e87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,6 +44,7 @@
         "stylelint": "^14.8.2",
         "stylelint-config-recommended-vue": "^1.4.0",
         "stylelint-config-standard": "^25.0.0",
+        "stylelint-order": "^5.0.0",
         "vue-template-compiler": "^2.6.11",
         "webpack": "^5.64.0"
       }
@@ -13212,6 +13213,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/postcss-sorting": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
+      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
+      "dev": true,
+      "peerDependencies": {
+        "postcss": "^8.3.9"
+      }
+    },
     "node_modules/postcss-svgo": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.3.tgz",
@@ -14648,6 +14658,19 @@
         "stylelint": "^14.4.0"
       }
     },
+    "node_modules/stylelint-order": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
+      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
+      "dev": true,
+      "dependencies": {
+        "postcss": "^8.3.11",
+        "postcss-sorting": "^7.0.1"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
     "node_modules/stylelint/node_modules/balanced-match": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
@@ -26403,6 +26426,13 @@
         "util-deprecate": "^1.0.2"
       }
     },
+    "postcss-sorting": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz",
+      "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==",
+      "dev": true,
+      "requires": {}
+    },
     "postcss-svgo": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.3.tgz",
@@ -27554,6 +27584,16 @@
         "stylelint-config-recommended": "^7.0.0"
       }
     },
+    "stylelint-order": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz",
+      "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==",
+      "dev": true,
+      "requires": {
+        "postcss": "^8.3.11",
+        "postcss-sorting": "^7.0.1"
+      }
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
diff --git a/package.json b/package.json
index 178e79c86..d849087af 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "stylelint": "^14.8.2",
     "stylelint-config-recommended-vue": "^1.4.0",
     "stylelint-config-standard": "^25.0.0",
+    "stylelint-order": "^5.0.0",
     "vue-template-compiler": "^2.6.11",
     "webpack": "^5.64.0"
   }
diff --git a/public/stylesheets/ad-slider-component.css b/public/stylesheets/ad-slider-component.css
index 8badc231b..871236217 100644
--- a/public/stylesheets/ad-slider-component.css
+++ b/public/stylesheets/ad-slider-component.css
@@ -30,9 +30,9 @@ SOFTWARE.
 
 .l-ad-slider {
   display: flex;
+  width: 100%;
   position: relative;
   align-items: center;
-  width: 100%;
 }
 
 .l-ad-slider--horizontal {
@@ -69,54 +69,54 @@ SOFTWARE.
 }
 
 .l-ad-slider__bg {
-  position: relative;
   display: block;
+  position: relative;
 }
 
 .c-ad-slider__bg {
-  border-radius: var(--var-border-radius, 1.5rem);
   background-color: #cccccc;
+  border-radius: var(--var-border-radius, 1.5rem);
 }
 
 .l-ad-slider__bg::after {
   content: "";
-  position: absolute;
-  left: 0;
-  top: 0;
   width: 100%;
   height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
 }
 
 .l-ad-slider__process {
   position: absolute;
-  transition: all 0s;
   z-index: 1;
+  transition: all 0s;
 }
 
 .c-ad-slider__process {
-  border-radius: var(--var-border-radius, 15px);
   background-color: #3498db;
+  border-radius: var(--var-border-radius, 15px);
 }
 
 .l-ad-slider__wrap .ad-slider-process.ad-slider-process-draggable {
-  cursor: pointer;
   z-index: 3;
+  cursor: pointer;
 }
 
 .l-ad-slider--horizontal .l-ad-slider__process {
   width: 0;
   height: 100%;
+  will-change: width;
   top: 0;
   left: 0;
-  will-change: width;
 }
 
 .l-ad-slider--vertical .l-ad-slider__process {
   width: 100%;
   height: 0;
+  will-change: height;
   bottom: 0;
   left: 0;
-  will-change: height;
 }
 
 .l-ad-slider--horizontal-reverse .l-ad-slider__process {
@@ -135,9 +135,9 @@ SOFTWARE.
 
 .l-ad-slider__dot {
   position: absolute;
-  transition: all 0s;
   will-change: transform;
   z-index: 2;
+  transition: all 0s;
 }
 
 .c-ad-slider__dot {
@@ -145,16 +145,16 @@ SOFTWARE.
 }
 
 .l-ad-slider__dot-handle {
+  display: flex;
   width: 100%;
   height: 100%;
-  display: flex;
-  align-items: center;
   justify-content: center;
+  align-items: center;
 }
 
 .c-ad-slider__dot-handle {
-  border-radius: var(--var-border-radius, 50%) !important;
   background-color: #ffffff;
+  border-radius: var(--var-border-radius, 50%) !important;
   box-shadow: 0.5px 0.5px 2px 1px rgba(0, 0, 0, 32%);
 }
 
@@ -187,16 +187,16 @@ SOFTWARE.
 }
 
 .c-ad-slider__button {
-  height: 1.6rem;
-  width: 1.6rem;
   display: flex;
+  width: 1.6rem;
+  height: 1.6rem;
   justify-content: center;
   align-items: center;
   font-size: 1rem;
-  border-radius: var(--var-border-radius, 50%);
   border: 0.1rem solid var(--color-reality-light);
-  cursor: pointer;
+  border-radius: var(--var-border-radius, 50%);
   transition-duration: 0.2s;
+  cursor: pointer;
 }
 
 .c-ad-slider__button:hover {
@@ -212,15 +212,15 @@ SOFTWARE.
 
 .l-ad-slider__wrap .ad-slider-tooltip {
   display: block;
-  font-size: 14px;
   white-space: nowrap;
-  padding: 2px 5px;
   min-width: 20px;
   text-align: center;
+  font-size: 14px;
   color: #ffffff;
-  border-radius: var(--var-border-radius, 5px);
-  border: 0.1rem solid #3498db;
   background-color: #3498db;
+  border: 0.1rem solid #3498db;
+  border-radius: var(--var-border-radius, 5px);
+  padding: 2px 5px;
 }
 
 .l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-top {
@@ -250,11 +250,11 @@ SOFTWARE.
 .l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-top .ad-slider-tooltip::before,
 .l-ad-slider__wrap .ad-slider-tooltip-top .vue-merged-tooltip .ad-slider-tooltip::before {
   content: "";
+  width: 0;
+  height: 0;
   position: absolute;
   bottom: -10px;
   left: 50%;
-  width: 0;
-  height: 0;
   border: 5px solid transparent;
   border: 6px solid transparent\0;
   border-top-color: inherit;
@@ -269,11 +269,11 @@ SOFTWARE.
 .l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-bottom .ad-slider-tooltip::before,
 .l-ad-slider__wrap .ad-slider-tooltip-bottom .vue-merged-tooltip .ad-slider-tooltip::before {
   content: "";
+  width: 0;
+  height: 0;
   position: absolute;
   top: -10px;
   left: 50%;
-  width: 0;
-  height: 0;
   border: 5px solid transparent;
   border: 6px solid transparent\0;
   border-bottom-color: inherit;
@@ -283,11 +283,11 @@ SOFTWARE.
 .l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-left .ad-slider-tooltip::before,
 .l-ad-slider__wrap .ad-slider-tooltip-left .vue-merged-tooltip .ad-slider-tooltip::before {
   content: "";
+  width: 0;
+  height: 0;
   position: absolute;
   top: 50%;
   right: -10px;
-  width: 0;
-  height: 0;
   border: 5px solid transparent;
   border: 6px solid transparent\0;
   border-left-color: inherit;
@@ -297,11 +297,11 @@ SOFTWARE.
 .l-ad-slider__wrap .ad-slider-tooltip-wrap.ad-slider-tooltip-right .ad-slider-tooltip::before,
 .l-ad-slider__wrap .ad-slider-tooltip-right .vue-merged-tooltip .ad-slider-tooltip::before {
   content: "";
+  width: 0;
+  height: 0;
   position: absolute;
   top: 50%;
   left: -10px;
-  width: 0;
-  height: 0;
   border: 5px solid transparent;
   border: 6px solid transparent\0;
   border-right-color: inherit;
@@ -317,33 +317,33 @@ SOFTWARE.
 }
 
 .l-ad-slider__wrap .ad-slider-piecewise {
-  position: absolute;
-  width: 100%;
-  padding: 0;
-  margin: 0;
-  left: 0;
-  top: 0;
-  height: 100%;
   list-style: none;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  margin: 0;
+  padding: 0;
 }
 
 .l-ad-slider__wrap .ad-slider-piecewise-item {
-  position: absolute;
   width: 8px;
   height: 8px;
+  position: absolute;
 }
 
 .l-ad-slider__wrap .ad-slider-piecewise-dot {
-  position: absolute;
-  left: 50%;
-  top: 50%;
+  display: inline-block;
   width: 100%;
   height: 100%;
-  display: inline-block;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  z-index: 2;
   background-color: rgba(0, 0, 0, 16%);
   border-radius: var(--var-border-radius, 50%);
   transform: translate(-50%, -50%);
-  z-index: 2;
   transition: all 0.3s;
 }
 
@@ -354,26 +354,26 @@ SOFTWARE.
 
 .l-ad-slider--horizontal .ad-slider-piecewise-label,
 .l-ad-slider--horizontal-reverse .ad-slider-piecewise-label {
-  position: absolute;
   display: inline-block;
+  visibility: visible;
+  white-space: nowrap;
+  position: absolute;
   top: 100%;
   left: 50%;
-  white-space: nowrap;
   font-size: 12px;
   color: #333333;
   transform: translate(-50%, 8px);
-  visibility: visible;
 }
 
 .l-ad-slider--vertical .ad-slider-piecewise-label,
 .l-ad-slider--vertical-reverse .ad-slider-piecewise-label {
-  position: absolute;
   display: inline-block;
+  visibility: visible;
+  white-space: nowrap;
+  position: absolute;
   top: 50%;
   left: 100%;
-  white-space: nowrap;
   font-size: 12px;
   color: #333333;
   transform: translate(8px, -50%);
-  visibility: visible;
 }
diff --git a/public/stylesheets/automator.css b/public/stylesheets/automator.css
index 18339b889..7ff2f2e0e 100644
--- a/public/stylesheets/automator.css
+++ b/public/stylesheets/automator.css
@@ -4,18 +4,18 @@
 }
 
 .c-automator-tab {
-  height: 57rem;
   width: 100rem;
+  height: 57rem;
 }
 
 .c-automator-tab > div {
-  height: 50rem;
   width: 100rem;
+  height: 50rem;
 }
 
 .c-automator-tab--full-screen {
-  height: auto;
   width: auto;
+  height: auto;
 }
 
 .l-automator-tab {
@@ -35,9 +35,9 @@
 
 .c-automator-points-list-col {
   position: relative;
+  text-align: left;
   border: var(--var-border-width, 0.15rem) solid var(--color-text);
   padding: 1rem;
-  text-align: left;
 }
 
 .l-automator-points-list-side-col {
@@ -55,27 +55,27 @@
 }
 
 .c-automator-points-list-cell {
-  position: relative;
+  overflow: hidden;
   width: 100%;
   height: 48%;
-  padding: 1rem;
-  border: var(--var-border-width, 0.15rem) solid var(--color-text);
+  position: relative;
   text-align: left;
-  overflow: hidden;
+  border: var(--var-border-width, 0.15rem) solid var(--color-text);
+  padding: 1rem;
 }
 
 .c-automator-points-list-symbol {
-  position: absolute;
   display: flex;
-  justify-content: center;
-  align-items: center;
+  width: 100%;
+  height: 100%;
+  position: absolute;
   top: 0;
   left: 0;
+  justify-content: center;
+  align-items: center;
   font-size: 15rem;
   opacity: 0.2;
   text-shadow: 0 0 2rem;
-  width: 100%;
-  height: 100%;
   pointer-events: none;
 }
 
@@ -105,17 +105,17 @@
 
 .l-automator-tab--full-screen {
   position: fixed;
-  left: 0;
-  right: 0;
   top: -6.5rem;
+  right: 0;
   bottom: 0;
-  margin-top: 0;
+  left: 0;
   z-index: 4;
+  margin-top: 0;
 }
 
 .l-automator-tab--full-screen > div {
-  height: calc(100% - 6.5rem);
   width: 100%;
+  height: calc(100% - 6.5rem);
 }
 
 .l-automator-pane {
@@ -143,29 +143,29 @@
 .l-automator__controls {
   display: flex;
   flex-direction: row;
-  align-items: center;
-  justify-content: flex-start;
 
   /* for corner buttons */
   position: relative;
+  justify-content: flex-start;
+  align-items: center;
 }
 
 .l-automator__button {
   display: flex;
-  align-items: center;
   justify-content: center;
+  align-items: center;
   padding: 0.3rem 0.8rem;
 }
 
 .l-automator__button--corner {
   position: absolute;
-  right: 0;
   top: 0;
+  right: 0;
 }
 
 .l-automator__script-names {
-  flex-grow: 1;
   display: flex;
+  flex-grow: 1;
   flex-direction: row;
   justify-content: space-evenly;
   align-items: center;
@@ -174,10 +174,10 @@
 .l-automator__scripts-dropdown {
   width: 90%;
   height: 90%;
-  padding: 0.2rem 0 0.3rem;
   border-width: 0.1rem;
   border-radius: 0;
   margin: 0.4rem;
+  padding: 0.2rem 0 0.3rem;
 }
 
 .l-automator__rename-input {
@@ -194,8 +194,8 @@
 .c-automator-editor__active-line-gutter {
   font-weight: bold;
   background: rgb(43, 6, 92);
-  filter: brightness(200%);
   outline: 0.1rem solid rgb(68, 0, 255);
+  filter: brightness(200%);
 }
 
 .c-automator-editor__event-line {
@@ -206,8 +206,8 @@
 .c-automator-editor__event-line-gutter {
   font-weight: bold;
   background: rgb(0, 127, 0);
-  filter: brightness(200%);
   outline: 0.1rem solid rgb(25, 200, 25);
+  filter: brightness(200%);
 }
 
 .c-automator-editor__error-line {
@@ -218,32 +218,32 @@
 .c-automator-editor__error-line-gutter {
   font-weight: bold;
   background: rgb(172, 6, 23);
-  filter: brightness(200%);
   outline: 0.1rem solid rgb(255, 0, 64);
+  filter: brightness(200%);
 }
 
 .c-automator-editor {
+  text-align: left;
   font-family: Typewriter, serif;
   font-size: 1.4rem;
-  text-align: left;
   border-bottom: 0.15rem solid #262626;
 }
 
 .l-automator-editor {
   display: flex;
-  flex-direction: column;
   flex: 1 1 auto;
+  flex-direction: column;
 }
 
 .l-automator-editor__codemirror-container {
   display: flex;
-  flex-direction: column;
   flex: 1 1 auto;
+  flex-direction: column;
 }
 
 .CodeMirror-hint {
-  font-size: 1rem;
   font-family: Typewriter, serif;
+  font-size: 1rem;
 }
 
 .s-base--metro .CodeMirror-vscrollbar::-webkit-scrollbar-thumb {
@@ -252,23 +252,23 @@
 
 .cm-s-liquibyte.CodeMirror,
 .cm-s-panda-syntax.CodeMirror {
-  font-size: 1.4rem;
-  font-family: Typewriter, serif;
-  line-height: 1.6rem;
 
   /* required for expanding into pane */
   flex: 1 1 auto;
+  font-family: Typewriter, serif;
+  font-size: 1.4rem;
+  line-height: 1.6rem;
 }
 
 .c-automator-docs {
-  border-right: 0.15rem solid #262626;
-  border-bottom: 0.15rem solid #262626;
-  background-color: lightgray;
-  padding-left: 1rem;
+  overflow: auto;
+  text-align: left;
   font-size: 1.4rem;
   color: black;
-  text-align: left;
-  overflow: auto;
+  background-color: lightgray;
+  border-right: 0.15rem solid #262626;
+  border-bottom: 0.15rem solid #262626;
+  padding-left: 1rem;
 }
 
 .c-automator-docs-page {
@@ -289,9 +289,9 @@
 .c-automator-docs--button {
   width: 2.8rem;
   height: 2.2rem;
-  margin: 0.1rem;
-  border-radius: var(--var-border-radius, 0.3rem);
   border-width: 0.1rem;
+  border-radius: var(--var-border-radius, 0.3rem);
+  margin: 0.1rem;
   cursor: pointer;
 }
 
@@ -302,13 +302,13 @@
 
 .o-automator-error-underline::before {
   content: "~~~~~~~~~~~~";
-  font-size: 0.6rem;
-  font-weight: 700;
-  font-family: "Times New Roman", serif;
-  color: red;
+  overflow: hidden;
   width: 100%;
   position: absolute;
   top: 12px;
   left: -1px;
-  overflow: hidden;
+  font-family: "Times New Roman", serif;
+  font-size: 0.6rem;
+  font-weight: 700;
+  color: red;
 }
diff --git a/public/stylesheets/glyphs.css b/public/stylesheets/glyphs.css
index a0d288207..9ff4c76b8 100644
--- a/public/stylesheets/glyphs.css
+++ b/public/stylesheets/glyphs.css
@@ -1,9 +1,9 @@
 .l-glyph-component {
   display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  box-sizing: border-box;
   position: relative;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
 }
 
 .c-glyph-component {
@@ -37,14 +37,15 @@
 .l-glyph-sacrifice-options {
   display: inline-flex;
   flex-direction: column;
-  padding: 1rem;
+  width: 27rem;
+  position: relative;
   margin-top: -0.2rem;
   margin-left: 0.5rem;
-  position: relative;
-  width: 27rem;
+  padding: 1rem;
 }
 
 .c-glyph-sacrifice-options {
+  position: relative;
   color: var(--color-reality-light);
   background: black;
   border: var(--var-border-width, 0.2rem) solid var(--color-reality);
@@ -52,7 +53,6 @@
   border-top-left-radius: 0;
   border-top-right-radius: 0;
   padding: 0.8rem 0.8rem 0.5rem;
-  position: relative;
 }
 
 .c-glyph-inventory-management-with-border {
@@ -69,14 +69,14 @@
 
 .l-glyph-sacrifice-options__help {
   position: absolute;
-  left: calc(100% - 1.8rem);
   top: 0;
+  left: calc(100% - 1.8rem);
   z-index: 2;
 }
 
 .c-glyph-sacrifice-options__help {
-  color: var(--color-reality-light);
   font-size: 1.2rem;
+  color: var(--color-reality-light);
 }
 
 .l-glyph-sacrifice-options__option {
@@ -85,15 +85,15 @@
 
 .c-glyph-sacrifice-options__option {
   display: flex;
-  justify-content: center;
-  align-items: center;
-  position: relative;
-  cursor: pointer;
-  border: var(--var-border-width, 0.2rem) solid;
-  transition-duration: 0.2s;
-  border-radius: var(--var-border-radius, 0.5rem);
   width: 4.6rem;
   height: 3rem;
+  position: relative;
+  justify-content: center;
+  align-items: center;
+  border: var(--var-border-width, 0.2rem) solid;
+  border-radius: var(--var-border-radius, 0.5rem);
+  transition-duration: 0.2s;
+  cursor: pointer;
 }
 
 .c-glyph-sacrifice-options__option:hover {
@@ -103,8 +103,8 @@
 
 .c-glyph-sacrifice-options__option--active {
   color: black;
-  border-color: var(--color-reality-light);
   background-color: var(--color-reality-light);
+  border-color: var(--color-reality-light);
   pointer-events: none;
 }
 
@@ -115,46 +115,46 @@
 
 .c-glyph-sacrifice-options__option__tooltip {
   display: flex;
-  justify-content: center;
-  align-items: center;
-  opacity: 0;
-  transition-duration: 0.2s;
-  font-size: 1.4rem;
-  font-weight: bold;
-  border: var(--var-border-width, 0.2rem) solid var(--color-reality);
-  border-radius: var(--var-border-radius, 0.5rem);
-  font-family: Typewriter;
-  color: var(--color-reality);
-  background: black;
   width: 17rem;
-  line-height: 2rem;
-  padding: 0.3rem 0;
-  z-index: 2;
-  pointer-events: none;
   position: absolute;
   top: 100%;
+  z-index: 2;
+  justify-content: center;
+  align-items: center;
+  font-family: Typewriter;
+  font-size: 1.4rem;
+  font-weight: bold;
+  line-height: 2rem;
+  opacity: 0;
+  color: var(--color-reality);
+  background: black;
+  border: var(--var-border-width, 0.2rem) solid var(--color-reality);
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 0.3rem 0;
+  transition-duration: 0.2s;
+  pointer-events: none;
 }
 
 .c-glyph-sacrifice-options__option__tooltip::after {
+  content: " ";
+  width: 0;
   position: absolute;
   top: 0;
   left: 50%;
-  margin-left: -0.7rem;
-  margin-bottom: 0;
-  width: 0;
-  border-bottom: 0 solid var(--color-reality-light);
-  border-right: 0.7rem solid transparent;
-  border-left: 0.7rem solid transparent;
-  content: " ";
-  transition-duration: 0.2s;
   z-index: 0;
+  border-right: 0.7rem solid transparent;
+  border-bottom: 0 solid var(--color-reality-light);
+  border-left: 0.7rem solid transparent;
+  margin-bottom: 0;
+  margin-left: -0.7rem;
+  transition-duration: 0.2s;
 }
 
 .c-glyph-sacrifice-options__option:hover .c-glyph-sacrifice-options__option__tooltip {
-  opacity: 1;
   top: calc(100% + 0.9rem);
-  border-color: var(--color-reality-light);
+  opacity: 1;
   color: var(--color-reality-light);
+  border-color: var(--color-reality-light);
 }
 
 .s-base--metro .c-glyph-sacrifice-options__option:hover .c-glyph-sacrifice-options__option__tooltip {
@@ -177,8 +177,8 @@
 .l-glyph-sacrifice-options__rarity-slider-div {
   display: flex;
   flex-direction: row;
-  align-items: center;
   justify-content: space-between;
+  align-items: center;
   padding-top: 0.3rem;
   padding-bottom: 0.3rem;
 }
@@ -194,8 +194,8 @@
 .c-glyph-sacrifice-options__rarity-slider-handle {
   color: var(--color-reality-light);
   background-color: black !important;
-  box-shadow: 0 0 0 0.1rem var(--color-reality-light) !important;
   border-radius: var(--var-border-radius, 0.8rem) !important;
+  box-shadow: 0 0 0 0.1rem var(--color-reality-light) !important;
 }
 
 .c-glyph-sacrifice-options__advanced {
@@ -216,14 +216,14 @@
 .c-auto-sac-type-tab__input {
   width: 2.5rem;
   height: 1.5rem;
-  font-size: 1.2rem;
-  background-color: #333333;
-  color: var(--color-reality-light);
-  border-radius: var(--var-border-radius, 0.2rem);
-  border: solid 0.1rem;
   text-align: center;
+  font-size: 1.2rem;
+  color: var(--color-reality-light);
   -webkit-appearance: none;
   -moz-appearance: textfield;
+  background-color: #333333;
+  border: solid 0.1rem;
+  border-radius: var(--var-border-radius, 0.2rem);
 }
 
 .c-auto-sac-effect-tab__input::-webkit-inner-spin-button,
@@ -236,22 +236,22 @@
 .c-auto-sac-effect-tab__input {
   width: 1.5rem;
   height: 1.5rem;
-  font-size: 1.2rem;
   text-align: center;
-  background-color: #333333;
+  font-size: 1.2rem;
   color: var(--color-reality-light);
-  border-radius: var(--var-border-radius, 0.2rem);
-  border: solid 0.1rem;
   -webkit-appearance: none;
   -moz-appearance: textfield;
+  background-color: #333333;
+  border: solid 0.1rem;
+  border-radius: var(--var-border-radius, 0.2rem);
   margin: 0;
 }
 
 .c-auto-sac-effect-tab__checkbox {
   width: 1.5rem;
   height: 1.5rem;
-  border-radius: var(--var-border-radius, 0.2rem);
   border: solid 0.1rem;
+  border-radius: var(--var-border-radius, 0.2rem);
 }
 
 .c-auto-sac-type-tab__input:focus {
@@ -273,11 +273,11 @@
 }
 
 .c-glyph-sacrifice-options__advanced-toggle {
-  background: black;
-  border-radius: var(--var-border-radius, 0.2rem);
-  border: solid 0.1rem;
-  font-size: 1.2rem;
   font-family: Typewriter, serif;
+  font-size: 1.2rem;
+  background: black;
+  border: solid 0.1rem;
+  border-radius: var(--var-border-radius, 0.2rem);
 }
 
 .l-advanced-sac-options-for-glyph-type {
@@ -294,30 +294,30 @@
 .l-auto-sac-type-tab__row-wrapper {
   display: flex;
   flex-direction: row;
-  align-items: center;
   justify-content: space-between;
+  align-items: center;
   margin: 0.25rem 0.5rem;
 }
 
 .c-auto-sac-type-tab__effect-desc {
-  border-radius: var(--var-border-radius, 0.5rem);
-  border: 0.1rem solid;
-  padding: 0.25rem 1.5rem;
   min-height: 3rem;
   position: relative;
+  border: 0.1rem solid;
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 0.25rem 1.5rem;
 }
 
 .c-auto-sac-type-tab__effect-desc--active {
-  cursor: pointer;
-  opacity: 1;
   font-weight: bold;
+  opacity: 1;
   text-shadow: 0 0 0.3rem;
+  cursor: pointer;
 }
 
 .c-auto-sac-type-tab__effect-desc--inactive {
-  cursor: pointer;
   opacity: 0.7;
   transition: opacity 0.2s;
+  cursor: pointer;
 }
 
 .c-auto-sac-type-tab__effect-desc--inactive:hover {
@@ -328,38 +328,38 @@
 .l-specified-effect-tab__effect-desc {
   display: inline-flex;
   width: 100%;
-  align-items: center;
   justify-content: center;
+  align-items: center;
 }
 
 .l-auto-sac-type-tab__effect-desc {
   display: inline-flex;
   width: calc(100% - 5rem);
-  align-items: center;
   justify-content: center;
+  align-items: center;
 }
 
 .l-glyph-sacrifice-options__advanced-type-select {
-  font-size: 2rem;
+  display: inline-flex;
   width: 3rem;
   height: 3rem;
-  display: inline-flex;
-  align-items: center;
   justify-content: center;
+  align-items: center;
+  font-size: 2rem;
   border-radius: var(--var-border-radius, 50%);
   margin-top: 0.4rem;
 }
 
 .c-glyph-sacrifice-options__advanced-type-select {
-  color: #888888;
-  font-size: 2rem;
   width: 2.5rem;
   height: 2.5rem;
-  margin: 1rem 0.25rem 0.25rem;
   font-family: Typewriter;
-  cursor: pointer;
+  font-size: 2rem;
   line-height: 0.1rem;
+  color: #888888;
+  margin: 1rem 0.25rem 0.25rem;
   transition-duration: 0.15s;
+  cursor: pointer;
 }
 
 .c-glyph-sacrifice-options__advanced-type-select:hover {
@@ -380,19 +380,19 @@
 .c-glyph-auto-pick-options__option {
   display: flex;
   flex-direction: column;
-  justify-content: center;
-  font-weight: bold;
-  font-size: 1rem;
-  cursor: pointer;
-  -webkit-user-select: none;
-  user-select: none;
   width: 12rem;
   height: 5rem;
-  padding: 0 0.5rem;
+  justify-content: center;
+  font-size: 1rem;
+  font-weight: bold;
   border: var(--var-border-width, 0.2rem) solid;
   border-radius: var(--var-border-radius, 0.5rem);
   margin: 0 0.5rem 1rem;
+  padding: 0 0.5rem;
   transition-duration: 0.2s;
+  -webkit-user-select: none;
+  user-select: none;
+  cursor: pointer;
 }
 
 .c-glyph-auto-pick-options__option:hover {
@@ -402,8 +402,8 @@
 
 .c-glyph-auto-pick-options__option--active {
   color: black;
-  border-color: var(--color-reality-light);
   background-color: var(--color-reality-light);
+  border-color: var(--color-reality-light);
   pointer-events: none;
 }
 
@@ -421,10 +421,10 @@
 .l-glyph-tooltip {
   display: flex;
   flex-direction: column;
-  align-items: center;
   width: 27.4rem;
-  padding: 0.5rem 0;
   position: absolute;
+  align-items: center;
+  padding: 0.5rem 0;
 }
 
 .l-glyph-tooltip--up-left {
@@ -444,17 +444,17 @@
 }
 
 .c-glyph-tooltip {
-  background-color: black;
-  color: #ffffff;
+  text-align: center;
   font-size: 1.2rem;
   font-weight: normal;
-  text-align: center;
-  border-radius: var(--var-border-radius, 0.6rem);
-  transition: opacity 0.3s;
+  color: #ffffff;
   text-shadow: none;
+  background-color: black;
+  border: var(--var-border-width, 0.2rem) solid black;
+  border-radius: var(--var-border-radius, 0.6rem);
   padding: 0.6rem;
   padding-bottom: 0.6rem;
-  border: var(--var-border-width, 0.2rem) solid black;
+  transition: opacity 0.3s;
 }
 
 .c-glyph-tooltip__description {
@@ -469,12 +469,12 @@
   display: flex;
   flex-direction: column;
   width: calc(100% + 2.4rem);
-  border: var(--var-border-width, 0.2rem) solid;
-  padding: 0.3rem 1rem 0.7rem;
   font-weight: bold;
-  margin-top: -4rem;
   background-color: black;
+  border: var(--var-border-width, 0.2rem) solid;
   border-radius: var(--var-border-radius, 0.8rem);
+  margin-top: -4rem;
+  padding: 0.3rem 1rem 0.7rem;
 }
 
 .l-glyph-tooltip__effects {
@@ -483,9 +483,9 @@
 }
 
 .c-glyph-tooltip__sacrifice {
-  color: #b4b4b4;
   font-size: 1rem;
   font-weight: normal;
+  color: #b4b4b4;
 }
 
 .c-glyph-tooltip__sacrifice--touchable {
@@ -511,10 +511,10 @@
 .l-equipped-glyphs {
   display: flex;
   flex-direction: column;
+  width: 20rem;
   align-content: center;
   align-items: center;
   padding: 1rem;
-  width: 20rem;
 }
 
 .l-equipped-glyphs__slots {
@@ -525,20 +525,20 @@
 }
 
 .l-equipped-glyphs__dropzone {
-  border-radius: 50%;
   width: 7rem;
   height: 7rem;
   position: absolute;
-  left: 50%;
   top: 50%;
-  transform: translate(-50%, -50%);
+  left: 50%;
   background-color: rgba(0, 0, 0, 0%);
+  border-radius: 50%;
+  transform: translate(-50%, -50%);
 }
 
 .l-equipped-glyphs__empty {
-  border-radius: 50%;
   width: 5rem;
   height: 5rem;
+  border-radius: 50%;
 }
 
 .c-equipped-glyphs__empty {
@@ -582,9 +582,9 @@
 .c-glyph-set-save-container {
   display: flex;
   flex-wrap: wrap;
+  max-width: 30rem;
   justify-content: center;
   margin: 1rem auto 0;
-  max-width: 30rem;
 }
 
 .c-glyph-single-set-save {
@@ -610,26 +610,26 @@
 .c-glyph-sets-save-name__input {
   width: 16rem;
   height: 1.5rem;
-  font-size: 1.35rem;
-  background-color: black;
-  color: var(--color-reality-light);
-  border-radius: var(--var-border-radius, 0.2rem);
-  border: none;
-  border-bottom: 0.1rem solid;
   text-align: center;
-  margin-bottom: 0.5rem;
+  font-size: 1.35rem;
+  color: var(--color-reality-light);
   -webkit-appearance: none;
   -moz-appearance: textfield;
+  background-color: black;
+  border: none;
+  border-bottom: 0.1rem solid;
+  border-radius: var(--var-border-radius, 0.2rem);
+  margin-bottom: 0.5rem;
 }
 
 .c-glyph-set-save-setting-button {
   width: 12.5rem;
   height: 2.5rem;
-  font-size: 0.9rem;
   font-family: Typewriter, serif;
+  font-size: 0.9rem;
   font-weight: bold;
-  background-color: black;
   color: var(--color-reality-light);
+  background-color: black;
   border: var(--var-border-width, 0.2rem) solid var(--color-reality);
   border-radius: var(--var-border-radius, 0.5rem);
   margin: 0 0.4rem 1rem;
@@ -638,8 +638,8 @@
 }
 
 .c-glyph-set-save-setting-button:hover {
-  background-color: var(--color-reality-light);
   color: black;
+  background-color: var(--color-reality-light);
 }
 
 .c-glyph-set-save-setting-button--disabled {
@@ -647,22 +647,22 @@
 }
 
 .c-glyph-set-save-setting-button--disabled:hover {
-  background-color: black;
   color: var(--color-reality-light);
+  background-color: black;
 }
 
 .c-glyph-set-save-button {
   height: 2.5rem;
+  text-align: center;
+  font-family: Typewriter, serif;
+  font-size: 1rem;
+  font-weight: bold;
   color: var(--color-reality-light);
   background-color: black;
   border: var(--var-border-width, 0.2rem) solid var(--color-reality);
   border-radius: var(--var-border-radius, 0.5rem);
-  cursor: pointer;
   transition-duration: 0.2s;
-  text-align: center;
-  font-size: 1rem;
-  font-weight: bold;
-  font-family: Typewriter, serif;
+  cursor: pointer;
 }
 
 .c-glyph-set-save-button:hover {
@@ -682,9 +682,9 @@
 }
 
 .l-glyph-set-save-spacing {
-  height: 6rem;
   display: flex;
   flex-direction: column;
+  height: 6rem;
   place-content: flex-end;
 }
 
@@ -719,19 +719,19 @@
 }
 
 .c-current-glyph-effects {
-  margin-top: 0;
-  margin-bottom: 0;
-  height: 30rem;
-  width: 45rem;
   overflow: auto;
+  width: 45rem;
+  height: 30rem;
+  position: relative;
   color: var(--color-reality-light);
   background: black;
   border: var(--var-border-width, 0.2rem) solid var(--color-reality);
   border-radius: var(--var-border-radius, 0.5rem);
   border-top-left-radius: 0;
   border-top-right-radius: 0;
+  margin-top: 0;
+  margin-bottom: 0;
   padding: 0.8rem 0.8rem 1.8rem;
-  position: relative;
 }
 
 .c-current-glyph-effects-with-top-border {
@@ -743,8 +743,8 @@
 }
 
 .c-glyph-tooltip .pelle-current-glyph-effects {
-  color: var(--color-pelle--base);
   font-weight: bold;
+  color: var(--color-pelle--base);
 }
 
 .t-s8 .c-current-glyph-effects {
@@ -752,15 +752,15 @@
 }
 
 .c-current-glyph-effects__header {
-  font-weight: bold;
   font-size: 1.2rem;
+  font-weight: bold;
 }
 
 .l-equipped-glyphs-and-effects-container {
   display: flex;
   flex-direction: row;
-  justify-content: space-around;
   width: 65rem;
+  justify-content: space-around;
 }
 
 .l-glyph-info-wrapper {
@@ -776,9 +776,9 @@
 .c-glyph-info-options {
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
-  height: 2.8rem;
   width: 100%;
+  height: 2.8rem;
+  justify-content: space-between;
 }
 
 .t-s8 .c-glyph-info-options {
@@ -787,20 +787,20 @@
 
 .c-glyph-info-button {
   display: flex;
+  width: 50%;
+  z-index: 1;
   justify-content: center;
   align-items: center;
-  width: 50%;
-  cursor: pointer;
+  text-align: center;
+  font-family: Typewriter;
+  font-size: 1.2rem;
+  font-weight: bold;
+  color: var(--color-reality-light);
   background-color: black;
   border: 0.2rem solid var(--color-reality);
   border-radius: 0.5rem 0.5rem 0 0;
-  color: var(--color-reality-light);
   transition: all 0.2s, border-bottom 0ms, padding-bottom 0ms;
-  text-align: center;
-  font-size: 1.2rem;
-  font-family: Typewriter;
-  font-weight: bold;
-  z-index: 1;
+  cursor: pointer;
 }
 
 .t-s8 .c-glyph-info-button {
@@ -810,23 +810,23 @@
 .l-glyph-info-button {
   display: flex;
   flex-direction: column;
-  justify-content: center;
-  align-items: center;
   width: 22rem;
   height: 3rem;
+  justify-content: center;
+  align-items: center;
 }
 
 .s-base--metro .c-glyph-info-button {
-  border-radius: 0;
-  border-width: 0.1rem;
   height: 2.9rem;
+  border-width: 0.1rem;
+  border-radius: 0;
 }
 
 .c-glyph-info-button--active {
   border-bottom: none;
-  cursor: default;
   padding-bottom: 0.3rem;
   transition-duration: 0ms;
+  cursor: default;
 }
 
 .c-glyph-info-button--inactive:hover {
@@ -839,11 +839,11 @@
 }
 
 .c-glyph-peek {
+  width: calc(100% - 1rem);
+  height: 9rem;
   border: 0.1rem solid #b8b8b8;
   border-radius: var(--var-border-radius, 0.5rem);
   padding: 1rem;
-  height: 9rem;
-  width: calc(100% - 1rem);
 }
 
 .c-glyph-choice-container {
@@ -855,38 +855,38 @@
 .c-glyph-choice-single-glyph {
   display: flex;
   flex-direction: row;
+  width: 36rem;
+  height: 12rem;
   justify-content: space-evenly;
   align-items: center;
   border-radius: var(--var-border-radius, 0.5rem);
   margin: 0.5rem;
-  height: 12rem;
-  width: 36rem;
 }
 
 .c-glyph-choice-icon {
   display: flex;
   flex-direction: column;
+  width: 10rem;
+  height: 10rem;
   justify-content: space-evenly;
   align-items: center;
+  font-size: 1.2rem;
+  text-shadow: 0.1rem 0.1rem 0.1rem black, 0.1rem 0.1rem 0 black;
   background-color: rgba(0, 0, 0, 10%);
   border: var(--var-border-width, 0.2rem) solid rgba(0, 0, 0, 15%);
   border-radius: var(--var-border-radius, 0.5rem);
-  font-size: 1.2rem;
-  height: 10rem;
-  width: 10rem;
-  text-shadow: 0.1rem 0.1rem 0.1rem black, 0.1rem 0.1rem 0 black;
   box-shadow: 0.3rem 0.3rem 0.3rem rgba(0, 0, 0, 50%);
 }
 
 .c-glyph-choice-effect-list {
   display: flex;
   flex-direction: column;
+  width: 25rem;
+  height: 11rem;
   justify-content: space-evenly;
   background-color: rgba(0, 0, 0, 10%);
   border: var(--var-border-width, 0.2rem) solid rgba(0, 0, 0, 15%);
   border-radius: var(--var-border-radius, 0.5rem);
-  height: 11rem;
-  width: 25rem;
 }
 
 .t-s8 .c-glyph-peek {
@@ -894,16 +894,16 @@
 }
 
 .c-sacrificed-glyphs--dragover {
+  z-index: 1;
   border: 0.3rem solid gray;
   box-shadow: 0 0 0.1rem 0.1rem black;
-  z-index: 1;
 }
 
 .s-base--dark .c-sacrificed-glyphs--dragover {
+  z-index: 2;
+  background-color: transparent;
   border: 0.2rem solid white;
   box-shadow: 0 0 0.1rem 0.1rem white;
-  background-color: transparent;
-  z-index: 2;
 }
 
 .c-sacrificed-glyphs__header {
@@ -943,9 +943,9 @@
 }
 
 .c-sacrificed-glyphs__confirm {
-  cursor: pointer;
   -webkit-user-select: none;
   user-select: none;
+  cursor: pointer;
 }
 
 .c-altered-glyphs-toggle-button {
@@ -987,18 +987,18 @@
 .c-glyph-inventory-option {
   width: 19rem;
   height: auto;
-  padding: 0.5rem;
-  margin-bottom: 0.5rem;
   position: relative;
+  text-align: center;
+  font-family: Typewriter, serif;
+  font-size: 1rem;
   font-weight: bold;
   color: var(--color-reality-light);
   background-color: black;
   border: var(--var-border-width, 0.2rem) solid var(--color-reality);
   border-radius: var(--var-border-radius, 0.5rem);
+  margin-bottom: 0.5rem;
+  padding: 0.5rem;
   transition-duration: 0.2s;
-  text-align: center;
-  font-size: 1rem;
-  font-family: Typewriter, serif;
   cursor: pointer;
 }
 
@@ -1010,54 +1010,54 @@
 
 .c-glyph-inventory-option__tooltip {
   display: flex;
-  justify-content: center;
-  align-items: center;
-  opacity: 0;
-  transition-duration: 0.2s;
-  font-size: 1.1rem;
-  font-weight: bold;
-  border: var(--var-border-width, 0.2rem) solid var(--color-reality);
-  border-radius: var(--var-border-radius, 0.5rem);
-  font-family: Typewriter;
-  color: var(--color-reality);
-  background: black;
   width: 100%;
-  left: 0%;
-  line-height: 1.8rem;
-  padding: 0.3rem;
-  z-index: 3;
-  pointer-events: none;
   position: absolute;
   bottom: 100%;
+  left: 0%;
+  z-index: 3;
+  justify-content: center;
+  align-items: center;
+  font-family: Typewriter;
+  font-size: 1.1rem;
+  font-weight: bold;
+  line-height: 1.8rem;
+  opacity: 0;
+  color: var(--color-reality);
+  background: black;
+  border: var(--var-border-width, 0.2rem) solid var(--color-reality);
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 0.3rem;
+  transition-duration: 0.2s;
+  pointer-events: none;
 }
 
 .c-glyph-inventory-option__tooltip::after {
+  content: " ";
+  width: 0;
   position: absolute;
   bottom: 0;
   left: 50%;
-  margin-left: -0.7rem;
-  margin-bottom: 0;
-  width: 0;
+  z-index: 0;
   border-top: 0 solid var(--color-reality-light);
   border-right: 0.7rem solid transparent;
   border-left: 0.7rem solid transparent;
-  content: " ";
+  margin-bottom: 0;
+  margin-left: -0.7rem;
   transition-duration: 0.2s;
-  z-index: 0;
 }
 
 .c-glyph-inventory-option:hover .c-glyph-inventory-option__tooltip {
-  opacity: 1;
   bottom: calc(100% + 0.9rem);
-  border-color: var(--color-reality-light);
+  opacity: 1;
   color: var(--color-reality-light);
+  border-color: var(--color-reality-light);
 }
 
 .s-base--metro .c-glyph-inventory-option:hover .c-glyph-inventory-option__tooltip {
-  opacity: 1;
   bottom: calc(100% + 0.8rem);
-  border-color: var(--color-reality-light);
+  opacity: 1;
   color: var(--color-reality-light);
+  border-color: var(--color-reality-light);
 }
 
 .c-glyph-inventory-option:hover .c-glyph-inventory-option__tooltip::after {
@@ -1072,51 +1072,51 @@
 .l-glyph-color-box {
   display: flex;
   position: relative;
-  left: -50%;
   top: 27.9rem;
+  left: -50%;
   z-index: 2;
 }
 
 .l-glyph-color-position__top {
+  width: 0%;
   position: absolute;
   right: 22.5rem;
-  width: 0%;
 }
 
 .l-glyph-color-position__low {
+  width: 0%;
   position: absolute;
   top: 2.9rem;
   right: 22.5rem;
-  width: 0%;
 }
 
 .l-glyph-sidebar-option-container {
   display: flex;
   flex-direction: column;
-  height: 5rem;
   width: 100%;
+  height: 5rem;
 }
 
 .l-glyph-sidebar-tab-container {
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
-  height: 5rem;
   width: 100%;
+  height: 5rem;
+  justify-content: space-between;
 }
 
 .c-glyph-sidebar-button {
+  z-index: 1;
+  text-align: center;
+  font-family: Typewriter;
+  font-size: 1rem;
+  font-weight: bold;
+  color: var(--color-reality-light);
   background-color: black;
   border: var(--var-border-width, 0.2rem) solid var(--color-reality);
   border-radius: var(--var-border-radius, 0.5rem) var(--var-border-radius, 0.5rem) 0 0;
-  color: var(--color-reality-light);
-  cursor: pointer;
   transition: all 0.2s, border-bottom 0ms, padding-bottom 0ms;
-  text-align: center;
-  font-size: 1rem;
-  font-family: Typewriter;
-  font-weight: bold;
-  z-index: 1;
+  cursor: pointer;
 }
 
 .s-base--metro .c-glyph-sidebar-button {
@@ -1130,9 +1130,9 @@
 
 .c-glyph-sidebar-button--active {
   border-bottom: none;
-  cursor: default;
   padding-bottom: 0.3rem;
   transition-duration: 0ms;
+  cursor: default;
 }
 
 .c-glyph-sidebar-button--active:hover {
@@ -1143,11 +1143,11 @@
 .l-glyph-sidebar-button {
   display: flex;
   flex-direction: column;
+  width: 100%;
+  height: 4rem;
   justify-content: center;
   align-items: center;
-  width: 100%;
   margin: 0 0.5rem;
-  height: 4rem;
 }
 
 .l-glyph-sidebar-panel-size {
@@ -1166,20 +1166,20 @@
 
 .o-glyph-color-checkbox {
   display: flex;
+  width: 2rem;
+  height: 2rem;
   justify-content: center;
   align-items: center;
   font-size: 1rem;
-  height: 2rem;
-  width: 2rem;
+  font-weight: bold;
+  color: black;
   border: var(--var-border-width, 0.2rem) solid var(--color-reality);
   border-top-right-radius: var(--var-border-radius, 1rem);
   border-bottom-left-radius: var(--var-border-radius, 0.3rem);
-  color: black;
-  font-weight: bold;
-  cursor: pointer;
+  transition-duration: 0.2s;
   -webkit-user-select: none;
   user-select: none;
-  transition-duration: 0.2s;
+  cursor: pointer;
 }
 
 .t-s8 .o-glyph-color-checkbox {
diff --git a/public/stylesheets/new-ui-styles.css b/public/stylesheets/new-ui-styles.css
index 8b8593468..264b6d626 100644
--- a/public/stylesheets/new-ui-styles.css
+++ b/public/stylesheets/new-ui-styles.css
@@ -33,14 +33,14 @@ body.t-s9 {
 }
 
 #page {
-  margin: auto;
   display: flex;
+  width: 100%;
+  height: 100%;
   justify-content: flex-start;
   align-items: stretch;
   font-family: Typewriter, serif;
   background: none;
-  height: 100%;
-  width: 100%;
+  margin: auto;
 }
 
 .sidebar {
@@ -60,10 +60,10 @@ body.t-s9 {
 }
 
 .resource {
-  height: 7rem;
-  width: 12rem;
   display: flex;
   flex-direction: column;
+  width: 12rem;
+  height: 7rem;
   justify-content: center;
   align-items: center;
   background-color: var(--color-base);
@@ -73,9 +73,9 @@ body.t-s9 {
 }
 
 .resource h2 {
-  margin: 0;
-  font-size: 1.9rem;
   z-index: 1;
+  font-size: 1.9rem;
+  margin: 0;
 }
 
 .t-dark .resource h2,
@@ -86,10 +86,10 @@ body.t-s9 {
 .resource-information {
   display: flex;
   flex-direction: column;
-  align-items: flex-start;
-  color: var(--color-text);
   justify-content: space-between;
+  align-items: flex-start;
   font-size: 1.5rem;
+  color: var(--color-text);
 }
 
 .resource-gain {
@@ -147,8 +147,8 @@ body.t-s9 {
 .resource-infinity-canreset,
 .resource-eternity-canreset {
   background-color: black;
-  cursor: pointer;
   transition-duration: 0.15s;
+  cursor: pointer;
 }
 
 .resource-infinity-canreset:hover,
@@ -163,13 +163,13 @@ body.t-s9 {
 
 .o-tab-btn {
   height: 4.6rem;
+  position: relative;
+  font-size: 1.4rem;
   border-width: 0.1rem;
   border-radius: 0;
   margin-top: -0.1rem;
-  font-size: 1.4rem;
-  position: relative;
-  transition-duration: 0.15s;
   transition-delay: 0.2s;
+  transition-duration: 0.15s;
 }
 
 .o-tab-btn:hover {
@@ -181,34 +181,34 @@ body.t-s9 {
 }
 
 .l-tab-btn-inner {
-  width: 100%;
-  height: 100%;
   display: flex;
   flex-direction: column;
+  width: 100%;
+  height: 100%;
   justify-content: center;
   align-items: center;
   cursor: pointer;
 }
 
 .o-tab-btn:hover .subtabs {
+  left: 14.3rem;
   opacity: 1;
   pointer-events: all;
-  left: 14.3rem;
 }
 
 .o-tab-btn::after {
   content: "";
-  position: absolute;
-  left: calc(100% + 0.1rem);
-  top: calc(0% + -0.1rem);
   width: 0;
   height: 0;
+  position: absolute;
+  top: calc(0% + -0.1rem);
+  left: calc(100% + 0.1rem);
+  z-index: 4;
+  border-top: 2.3rem solid transparent;
   border-bottom: 2.3rem solid transparent;
   border-left: 0 solid var(--color-accent);
-  border-top: 2.3rem solid transparent;
-  z-index: 4;
-  transition-duration: 0.15s;
   transition-delay: 0.2s;
+  transition-duration: 0.15s;
 }
 
 .o-tab-btn--subtabs:hover::after {
@@ -250,9 +250,9 @@ body.t-s9 {
 
 .tab-container {
   display: flex;
-  justify-content: center;
   flex-direction: column;
   position: relative;
+  justify-content: center;
 }
 
 .tab-container > .l-antimatter-dim-tab {
@@ -271,28 +271,28 @@ body.t-s9 {
 
 .subtabs {
   display: flex;
-  opacity: 0;
-  pointer-events: none;
   position: absolute;
   top: -0.6rem;
   left: 12rem;
   z-index: 4;
-  transition: pointer-events 0s linear 0s, all 0.15s linear 0.2s;
+  opacity: 0;
   padding: 0.5rem;
   padding-left: 0;
+  transition: pointer-events 0s linear 0s, all 0.15s linear 0.2s;
+  pointer-events: none;
 }
 
 .o-tab-btn--subtab {
-  height: 4.7rem;
   width: 4.7rem;
+  height: 4.7rem;
   font-size: 2.3rem;
   font-weight: bold;
-  margin-left: -0.1rem;
   line-height: 4.5rem;
-  cursor: pointer;
+  margin-left: -0.1rem;
   transition-duration: 0.15s;
   -webkit-user-select: none;
   user-select: none;
+  cursor: pointer;
 }
 
 .o-tab-btn--subtab .o-tab-btn--cel3 {
@@ -301,41 +301,41 @@ body.t-s9 {
 }
 
 .o-subtab__tooltip {
-  opacity: 0;
-  transition-duration: 0.2s;
-  font-size: 1.4rem;
-  font-weight: bold;
-  border: 0.1rem solid var(--color-accent);
-  color: var(--color-text);
-  background: var(--color-base);
   width: 20rem;
   height: 3rem;
-  line-height: 2.8rem;
-  margin-left: -7.7rem;
-  z-index: 2;
-  pointer-events: none;
   position: absolute;
   bottom: 100%;
+  z-index: 2;
+  font-size: 1.4rem;
+  font-weight: bold;
+  line-height: 2.8rem;
+  opacity: 0;
+  color: var(--color-text);
+  background: var(--color-base);
+  border: 0.1rem solid var(--color-accent);
+  margin-left: -7.7rem;
+  transition-duration: 0.2s;
+  pointer-events: none;
 }
 
 .o-subtab__tooltip::after {
+  content: " ";
+  width: 0;
   position: absolute;
   bottom: 0;
   left: 50%;
-  margin-left: -0.7rem;
-  margin-bottom: 0;
-  width: 0;
+  z-index: 0;
   border-top: 0 solid var(--color-accent);
   border-right: 0.7rem solid transparent;
   border-left: 0.7rem solid transparent;
-  content: " ";
+  margin-bottom: 0;
+  margin-left: -0.7rem;
   transition-duration: 0.2s;
-  z-index: 0;
 }
 
 .o-tab-btn--subtab:hover .o-subtab__tooltip {
-  opacity: 1;
   bottom: calc(100% + 0.7rem);
+  opacity: 1;
 }
 
 .o-tab-btn--subtab:hover .o-subtab__tooltip::after {
@@ -392,86 +392,86 @@ body.t-s9 {
 }
 
 .o-primary-btn--new {
-  background-color: var(--color-base);
-  border: 0.1rem solid var(--color-good);
-  padding: 1rem;
-  color: var(--color-text);
-  font-family: Typewriter, serif;
-  border-radius: var(--var-border-radius, 0.5rem);
-  position: relative;
+  overflow: hidden;
   width: 21rem;
   height: 4.4rem;
-  overflow: hidden;
+  position: relative;
+  font-family: Typewriter, serif;
+  color: var(--color-text);
+  background-color: var(--color-base);
+  border: 0.1rem solid var(--color-good);
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 1rem;
 }
 
 .o-primary-btn--dimension-reset {
   display: flex;
-  align-items: center;
-  justify-content: center;
   height: 6rem;
+  justify-content: center;
+  align-items: center;
   font-size: 1rem;
 }
 
 .button-content {
+  display: flex;
+  width: 100%;
+  height: 100%;
   position: absolute;
   top: 0;
   left: 0;
-  height: 100%;
-  width: 100%;
-  display: flex;
+  z-index: 1;
   justify-content: center;
   align-items: center;
-  z-index: 1;
 }
 
 .fill {
+  width: 100%;
+  height: 100%;
   position: absolute;
   top: 0;
   left: 0;
-  height: 100%;
-  width: 100%;
 }
 
 .fill-purchased {
-  height: 100%;
-  width: 20%;
-  background-color: var(--color-good);
   float: left;
+  width: 20%;
+  height: 100%;
+  background-color: var(--color-good);
 }
 
 .fill-possible {
-  height: 100%;
-  width: 40%;
-  background-color: var(--color-good-dark);
   float: left;
+  width: 40%;
+  height: 100%;
+  background-color: var(--color-good-dark);
 }
 
 .modes-container {
-  width: 100%;
   display: flex;
+  width: 100%;
   justify-content: space-between;
-  padding: 0 5rem;
   margin-top: 1rem;
+  padding: 0 5rem;
 }
 
 .resets-container {
   display: flex;
-  justify-content: space-around;
   height: 16rem;
+  justify-content: space-around;
 }
 
 .reset-container h4 {
-  margin: 0;
   font-size: 1.4rem;
+  margin: 0;
 }
 
 .reset-container {
-  width: 40%;
   display: flex;
   flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
+  width: 40%;
   height: 16rem;
+  justify-content: space-between;
+  align-items: center;
   margin-top: 0.3rem;
 }
 
@@ -490,34 +490,34 @@ body.t-s9 {
 }
 
 .tickspeed-btn {
-  padding: 0.5rem;
+  height: 3rem;
   min-width: 15rem;
   max-width: 20rem;
-  height: 3rem;
   font-size: 1.1rem;
+  padding: 0.5rem;
 }
 
 .tickspeed-max-btn {
-  padding: 0.5rem;
   width: 10rem;
   height: 3rem;
+  padding: 0.5rem;
 }
 
 .tickspeed-labels span {
-  color: var(--color-text);
   height: 3rem;
+  color: var(--color-text);
   padding: 0.5rem 1rem;
 }
 
 .particle {
-  position: absolute;
-  color: var(--color-text);
-  height: 1rem;
   width: 1rem;
+  height: 1rem;
+  position: absolute;
+  z-index: 0;
+  color: var(--color-text);
   background-image: url("../icon.png");
   background-position: center;
   background-size: cover;
-  z-index: 0;
 }
 
 .sacrifice-btn {
@@ -527,29 +527,29 @@ body.t-s9 {
 }
 
 .btn-big-crunch {
-  padding: 2rem;
-  font-size: 5rem;
-  border-radius: var(--var-border-radius, 0.5rem);
-  border: var(--var-border-width, 0.2rem) solid var(--color-infinity);
-  background-color: black;
-  color: var(--color-infinity);
+  z-index: 1;
   font-family: Typewriter;
+  font-size: 5rem;
+  color: var(--color-infinity);
+  background-color: black;
+  border: var(--var-border-width, 0.2rem) solid var(--color-infinity);
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 2rem;
   transition-duration: 0.15s;
   cursor: pointer;
-  z-index: 1;
 }
 
 .btn-big-crunch--small {
   position: absolute;
   top: 4.3rem;
   left: calc(50% - 0.6rem);
-  transform: translateX(-50%);
   font-size: 3rem;
+  transform: translateX(-50%);
 }
 
 .btn-big-crunch:hover {
-  background-color: var(--color-infinity);
   color: black;
+  background-color: var(--color-infinity);
 }
 
 .t-normal .c-game-header__tesseract-available {
@@ -562,12 +562,12 @@ body.t-s9 {
 }
 
 .information-header {
+  font-size: 1.2rem;
+  font-weight: bold;
   color: var(--color-text);
+  border-bottom: 0.1rem solid var(--color-good);
   margin-top: 1rem;
   margin-bottom: 0.5rem;
-  font-weight: bold;
-  font-size: 1.2rem;
-  border-bottom: 0.1rem solid var(--color-good);
   padding-bottom: 0.6rem;
 }
 
@@ -578,8 +578,8 @@ body.t-s9 {
 }
 
 .t-normal .o-achievement__tooltip {
-  border: 0.1rem solid var(--color-accent);
   background: var(--color-base);
+  border: 0.1rem solid var(--color-accent);
 }
 
 .t-normal .o-achievement__tooltip::after {
@@ -587,23 +587,23 @@ body.t-s9 {
 }
 
 .o-infinity-upgrade-btn--unavailable {
-  background: #525252;
   color: white;
+  background: #525252;
   border: 0.1rem solid var(--color-accent);
   cursor: default;
 }
 
 .o-infinity-upgrade-btn--unavailable:hover {
-  background: #525252;
   color: var(--color-text-inverted);
+  background: #525252;
 }
 
 .o-primary-btn--option,
 .o-primary-btn--option-wide,
 .c-select-theme__item,
 .c-select-notation__item {
-  background: var(--color-base);
   color: var(--color-text);
+  background: var(--color-base);
   border: 0.1rem solid var(--color-good);
 }
 
@@ -645,16 +645,16 @@ body.t-s9 {
 
 .o-autobuyer-input,
 .c-autobuyer-box__mode-select {
+  color: var(--color-accent);
   background: var(--color-base);
   border: 0.1rem solid var(--color-accent);
-  color: var(--color-accent);
 }
 
 .t-metro .o-autobuyer-input,
 .t-metro .c-autobuyer-box__mode-select {
   color: black;
-  border: 0.1rem solid #a9a9a9;
   background: white;
+  border: 0.1rem solid #a9a9a9;
 }
 
 .t-dark .o-autobuyer-input,
@@ -692,11 +692,11 @@ body.t-s9 {
 .c-antimatter-dim-row,
 .c-infinity-dim-row,
 .c-time-dim-row {
-  color: var(--color-text);
   font-weight: bold;
+  color: var(--color-text);
+  border-radius: var(--var-border-radius, 0.5rem);
   margin: 0;
   padding: 0.5rem 0 0.5rem 1rem;
-  border-radius: var(--var-border-radius, 0.5rem);
 }
 
 .c-antimatter-dim-row:nth-child(even) {
@@ -780,11 +780,11 @@ body.t-s9 {
 }
 
 .o-eternity-button__eternity-text {
-  color: var(--color-eternity);
   display: flex;
+  height: 100%;
   justify-content: center;
   align-items: center;
-  height: 100%;
+  color: var(--color-eternity);
   padding: 0 1rem;
 }
 
@@ -804,13 +804,13 @@ body.t-s9 {
 }
 
 .l-game-header__infinity-points {
-  left: 72%;
   top: 8.5rem;
+  left: 72%;
 }
 
 .l-game-header__eternity-points {
-  right: 72%;
   top: 8.5rem;
+  right: 72%;
 }
 
 .l-reset-buttons-container__reality-button {
@@ -823,10 +823,10 @@ body.t-s9 {
 }
 
 .l-reset-buttons-container {
-  position: absolute;
-  top: 0;
   width: 100%;
   min-height: 8rem;
+  position: absolute;
+  top: 0;
 }
 
 .l-game-header__antimatter-container {
@@ -891,11 +891,11 @@ body.t-s9 {
 }
 
 .l-help-me {
+  height: 2rem;
   position: absolute;
   top: 4.9rem;
-  height: 2rem;
-  border-radius: var(--var-border-radius, 50%);
   font-size: 1.5rem;
+  border-radius: var(--var-border-radius, 50%);
   transition-delay: 0s;
 }
 
diff --git a/public/stylesheets/old-ui.css b/public/stylesheets/old-ui.css
index 6a3ab32f5..698cd945d 100644
--- a/public/stylesheets/old-ui.css
+++ b/public/stylesheets/old-ui.css
@@ -1,8 +1,8 @@
 .c-old-ui {
-  padding: 0.9rem 1.5rem 0;
-  box-sizing: border-box;
   width: 100%;
   height: 100%;
+  box-sizing: border-box;
+  padding: 0.9rem 1.5rem 0;
 }
 
 .l-old-ui {
@@ -21,8 +21,8 @@
 }
 
 .l-old-ui__big-crunch-btn {
-  margin-top: 1.9rem;
   flex-shrink: 0;
+  margin-top: 1.9rem;
 }
 
 .l-old-ui__big-crunch-btn--overlay {
@@ -30,15 +30,15 @@
 }
 
 .l-old-ui__page {
-  width: 100%;
   flex: 1 0 auto;
+  width: 100%;
 }
 
 .l-old-ui-page {
   display: flex;
   flex-direction: column;
-  align-items: stretch;
   width: 100%;
+  align-items: stretch;
 }
 
 .o-emptiness {
@@ -46,17 +46,17 @@
 }
 
 .o-big-crunch-btn {
-  font-family: Typewriter, serif;
-  font-size: 5rem;
   width: 36rem;
   height: 10rem;
   z-index: 1;
+  font-family: Typewriter, serif;
+  font-size: 5rem;
 }
 
 .l-old-ui-antimatter-dim-tab {
-  height: 100%;
   display: flex;
   flex-direction: column;
+  height: 100%;
   align-items: center;
 }
 
@@ -77,9 +77,9 @@
 }
 
 .o-tab-btn--secondary {
-  font-size: 1.3rem;
   width: 17.5rem;
   height: 2.5rem;
+  font-size: 1.3rem;
   margin: 0.5rem 0.8rem;
   margin-bottom: 0.8rem;
 }
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index 5cec90962..1eb4d4f27 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -1,9 +1,9 @@
 html {
-  font-size: 62.5%;
-  height: 100%;
-  width: 100%;
   overflow: hidden;
+  width: 100%;
+  height: 100%;
   scrollbar-color: grey transparent;
+  font-size: 62.5%;
 }
 
 ::-webkit-scrollbar {
@@ -11,10 +11,10 @@ html {
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: grey;
   background-clip: content-box;
-  border-radius: 0.5rem;
+  background-color: grey;
   border: 0.2rem solid transparent;
+  border-radius: 0.5rem;
 }
 
 .s-base--metro::-webkit-scrollbar-thumb {
@@ -27,17 +27,17 @@ html {
 }
 
 * {
-  box-sizing: border-box;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  box-sizing: border-box;
 }
 
 /* css vars */
 
 #ui {
   display: flex;
-  align-items: center;
   justify-content: center;
+  align-items: center;
 }
 
 :root {
@@ -205,26 +205,26 @@ html {
 /* end css vars */
 
 body {
-  height: 100%;
+  overflow: hidden;
   width: 100%;
+  height: 100%;
+  text-align: center;
+  font-family: Typewriter, serif;
+  font-size: 1.1rem;
+  font-weight: 300;
+  line-height: 1.5;
+  color: #4f5957;
+  background-color: #ffffff;
   margin: 0;
   padding: 0;
-  color: #4f5957;
-  font-size: 1.1rem;
-  font-family: Typewriter, serif;
-  line-height: 1.5;
-  font-weight: 300;
-  text-align: center;
-  background-color: #ffffff;
-  overflow: hidden;
 }
 
 ._kong-test body {
+  overflow-y: auto;
   width: 1150px;
   height: 800px;
-  margin: auto;
   border: 0.1rem solid black;
-  overflow-y: auto;
+  margin: auto;
 }
 
 @font-face {
@@ -295,14 +295,14 @@ button:focus {
 /* #region TT shop */
 
 .time-theorem-buttons {
-  color: var(--color-text);
+  display: flex;
+  width: 55.5rem;
   position: fixed;
   bottom: 0;
-  font-family: Typewriter, serif;
-  display: flex;
-  align-items: flex-end;
   z-index: 2;
-  width: 55.5rem;
+  align-items: flex-end;
+  font-family: Typewriter, serif;
+  color: var(--color-text);
 }
 
 .l-tt-buy-button {
@@ -312,12 +312,12 @@ button:focus {
 }
 
 .c-tt-buy-button {
-  font-weight: bold;
   font-family: Typewriter, serif;
-  border: 0.1rem solid #691fa5;
-  transition-duration: 0.2s;
-  border-radius: var(--var-border-radius, 4px);
   font-size: 1.35rem;
+  font-weight: bold;
+  border: 0.1rem solid #691fa5;
+  border-radius: var(--var-border-radius, 4px);
+  transition-duration: 0.2s;
 }
 
 .c-tt-buy-button--unlocked {
@@ -341,9 +341,9 @@ button:focus {
 }
 
 .timetheorems {
-  font-size: 15px;
-  text-align: center;
   flex: 1 0 auto;
+  text-align: center;
+  font-size: 15px;
 }
 
 .ttbuttons-row {
@@ -359,31 +359,31 @@ button:focus {
 }
 
 .o-tt-top-row-button {
-  min-height: 3rem;
-  font-size: 1.2rem;
-  margin: 0.3rem;
   flex-grow: 0;
   flex-shrink: 0;
+  min-height: 3rem;
   align-self: stretch;
-  padding-left: 1rem;
+  font-size: 1.2rem;
+  margin: 0.3rem;
   padding-right: 1rem;
+  padding-left: 1rem;
 }
 
 .o-tt-autobuyer-button {
-  height: 2.5rem;
-  font-size: 1rem !important;
-  margin: 0.3rem;
   flex-grow: 0;
   flex-shrink: 0;
-  align-self: stretch;
-  padding-left: 1rem;
-  padding-right: 1rem;
+  height: 2.5rem;
   min-width: 8rem;
+  align-self: stretch;
+  font-size: 1rem !important;
+  margin: 0.3rem;
+  padding-right: 1rem;
+  padding-left: 1rem;
 }
 
 .l-tt-save-load-btn__wrapper {
-  margin: 0.3rem;
   position: relative;
+  margin: 0.3rem;
 }
 
 .l-tt-save-load-btn {
@@ -394,18 +394,18 @@ button:focus {
   position: absolute;
   top: -0.5rem;
   left: 50%;
-  transform: translate(-50%, -100%);
   padding: 0.5rem 0;
+  transform: translate(-50%, -100%);
 }
 
 .c-tt-save-load-btn__menu {
+  text-align: left;
+  font-family: Typewriter;
+  font-size: 1.4rem;
+  font-weight: bold;
   color: white;
   background: black;
   border-radius: var(--var-border-radius, 0.5rem);
-  text-align: left;
-  font-weight: bold;
-  font-family: Typewriter;
-  font-size: 1.4rem;
 }
 
 .l-tt-save-load-btn__menu::after {
@@ -413,10 +413,10 @@ button:focus {
   position: absolute;
   top: 100%;
   left: 50%;
-  margin-left: -0.5rem;
-  border-width: var(--var-border-width, 0.5rem);
-  border-style: solid;
   border-color: black transparent transparent;
+  border-style: solid;
+  border-width: var(--var-border-width, 0.5rem);
+  margin-left: -0.5rem;
 }
 
 .l-tt-save-load-btn__menu-rename {
@@ -425,9 +425,9 @@ button:focus {
 
 .c-tt-save-load-btn__menu-rename {
   text-align: left;
-  font-weight: bold;
   font-family: Typewriter;
   font-size: 1.4rem;
+  font-weight: bold;
   border: none;
   border-radius: var(--var-border-radius, 0.3rem);
   padding: 0.2rem;
@@ -439,8 +439,8 @@ button:focus {
 }
 
 .c-tt-save-load-btn__menu-item:hover {
-  background: white;
   color: black;
+  background: white;
 }
 
 .c-tt-autobuyer-toggle {
@@ -454,12 +454,12 @@ button:focus {
 }
 
 .ttshop-background {
+  z-index: 1;
   background: var(--color-base);
   border: var(--var-border-width, 0.2rem) solid black;
   border-bottom: none;
   border-top-left-radius: var(--var-border-radius, 7px);
   border-top-right-radius: var(--var-border-radius, 7px);
-  z-index: 1;
 }
 
 .t-s6 .ttshop-background,
@@ -468,22 +468,22 @@ button:focus {
 }
 
 .ttshop-container {
-  padding: 0 0.5rem;
-  min-width: 60rem;
-  max-width: 80rem;
   display: flex;
   flex-direction: column;
+  min-width: 60rem;
+  max-width: 80rem;
+  padding: 0 0.5rem;
   transition: all 0.25s ease-out;
 }
 
 .ttshop-minimize-btn {
   display: flex;
-  justify-content: center;
-  align-items: center;
-  color: var(--color-text);
-  font-size: 2.1rem;
   width: 2.5rem;
   height: 2.5rem;
+  justify-content: center;
+  align-items: center;
+  font-size: 2.1rem;
+  color: var(--color-text);
   margin-left: -0.2rem;
   cursor: pointer;
 }
@@ -513,34 +513,34 @@ button:focus {
 }
 
 .o-time-study-selection-btn {
-  border: 0.1rem solid;
-  background-color: black;
-  font-weight: bold;
-  font-family: Typewriter, serif;
   width: 20rem;
   height: 6rem;
+  position: relative;
+  font-family: Typewriter, serif;
+  font-size: 1.65rem;
+  font-weight: bold;
+  background-color: black;
+  border: 0.1rem solid;
+  border-radius: var(--var-border-radius, 0.4rem);
   margin: 1rem;
   transition-duration: 0.2s;
-  border-radius: var(--var-border-radius, 0.4rem);
-  font-size: 1.65rem;
-  position: relative;
 }
 
 /* #region tab buttons */
 
 .o-tab-btn {
+  white-space: nowrap;
+  font-family: Typewriter;
+  font-size: 1.8rem;
+  font-weight: bold;
   color: var(--color-text);
   background-color: var(--color-base);
-  white-space: nowrap;
-  font-weight: bold;
   border: var(--var-border-width, 0.2rem) solid var(--color-accent);
   border-radius: var(--var-border-radius, 0.4rem);
   transition-duration: 0.2s;
-  cursor: pointer;
-  font-family: Typewriter;
-  font-size: 1.8rem;
   -webkit-user-select: none;
   user-select: none;
+  cursor: pointer;
 }
 
 .t-s6 .o-tab-btn,
@@ -600,26 +600,26 @@ button:focus {
 /* #endregion tab buttons */
 
 #loading {
-  height: 100%;
   width: 100%;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
   background: url("../images/loading.png") no-repeat;
-  background-size: cover;
+  background-color: black;
   background-position-x: 50%;
   background-position-y: 50%;
-  position: absolute;
-  background-color: black;
-  z-index: 999;
+  background-size: cover;
 }
 
 #browser-warning {
-  height: 100%;
-  width: 100%;
-  z-index: 9999;
-  align-items: center;
-  justify-content: center;
-  background-color: black;
-  font-size: 7rem;
   display: none;
+  width: 100%;
+  height: 100%;
+  z-index: 9999;
+  justify-content: center;
+  align-items: center;
+  font-size: 7rem;
+  background-color: black;
 }
 
 .l-reality-button {
@@ -640,16 +640,16 @@ button:focus {
 }
 
 .c-reality-button {
-  font-family: Typewriter;
-  border-radius: var(--var-border-radius, 0.4rem);
-  transition-duration: 0.2s;
   width: 100%;
   height: 100%;
+  font-family: Typewriter;
   font-size: 1.2rem;
   font-weight: bold;
   background: black;
-  border-width: var(--var-border-width, 0.2rem);
   border-style: solid;
+  border-width: var(--var-border-width, 0.2rem);
+  border-radius: var(--var-border-radius, 0.4rem);
+  transition-duration: 0.2s;
 }
 
 .c-reality-button--special {
@@ -658,12 +658,12 @@ button:focus {
 
 .c-reality-reminder {
   display: flex;
+  width: calc(100% - 1rem);
   justify-content: center;
   align-items: center;
   font-size: 1.4rem;
   border: 0.1rem solid #b8b8b8;
   border-radius: var(--var-border-radius, 0.5rem);
-  width: calc(100% - 1rem);
   padding: 1rem;
 }
 
@@ -712,18 +712,18 @@ button:focus {
 }
 
 .c-reset-reality-button {
-  font-family: Typewriter;
-  border-radius: var(--var-border-radius, 0.4rem);
-  transition-duration: 0.2s;
-  cursor: pointer;
   height: 35%;
+  font-family: Typewriter;
   font-size: 1.2rem;
   font-weight: bold;
   color: var(--color-bad);
-  border-color: var(--color-bad);
   background: white;
-  border-width: var(--var-border-width, 0.2rem);
+  border-color: var(--color-bad);
   border-style: solid;
+  border-width: var(--var-border-width, 0.2rem);
+  border-radius: var(--var-border-radius, 0.4rem);
+  transition-duration: 0.2s;
+  cursor: pointer;
 }
 
 .c-reset-reality-button:hover,
@@ -762,13 +762,13 @@ button:focus {
 }
 
 .l-reality-amplify-button {
-  border-radius: var(--var-border-radius, 0.5rem);
-  border: var(--var-border-width, 0.2rem) solid sandybrown;
-  box-shadow: 0 0 2rem inset rgba(244, 164, 96, 50%);
-  background-color: #fdd3b0;
-  cursor: pointer;
   font-family: Typewriter;
+  background-color: #fdd3b0;
+  border: var(--var-border-width, 0.2rem) solid sandybrown;
+  border-radius: var(--var-border-radius, 0.5rem);
+  box-shadow: 0 0 2rem inset rgba(244, 164, 96, 50%);
   transition-duration: 0.2s;
+  cursor: pointer;
 }
 
 [draggable] {
@@ -809,36 +809,36 @@ button:focus {
 }
 
 [ach-tooltip]::before {
+  content: attr(ach-tooltip);
+  width: 16rem;
   position: absolute;
   bottom: 100%;
   left: 50%;
-  margin-bottom: 0.5rem;
-  transform: translateX(-50%);
-  padding: 0.7rem;
-  width: 16rem;
-  border-radius: var(--var-border-radius, 0.3rem);
-  background-color: hsla(0deg, 0%, 5%, 90%);
-  color: #ffffff;
-  content: attr(ach-tooltip);
+  z-index: 3;
   text-align: center;
   font-size: 1.4rem;
   line-height: 1.2;
+  color: #ffffff;
+  background-color: hsla(0deg, 0%, 5%, 90%);
+  border-radius: var(--var-border-radius, 0.3rem);
+  margin-bottom: 0.5rem;
+  padding: 0.7rem;
+  transform: translateX(-50%);
   transition-duration: 0.4s;
-  z-index: 3;
 }
 
 [ach-tooltip]::after {
+  content: " ";
+  width: 0;
   position: absolute;
   bottom: 100%;
   left: 50%;
-  margin-left: -0.5rem;
-  width: 0;
+  font-size: 0;
+  line-height: 0;
   border-top: var(--var-border-width, 0.5rem) solid hsla(0deg, 0%, 5%, 90%);
   border-right: var(--var-border-width, 0.5rem) solid transparent;
   border-left: var(--var-border-width, 0.5rem) solid transparent;
-  content: " ";
-  font-size: 0;
-  line-height: 0;
+  margin-left: -0.5rem;
   transition-duration: 0.4s;
 }
 
@@ -885,10 +885,10 @@ a:hover {
 }
 
 a small {
+  display: block;
   font-size: 11px;
   color: #777777;
   margin-top: -0.3rem;
-  display: block;
 }
 
 a:hover small {
@@ -901,10 +901,10 @@ a:hover small {
 }
 
 blockquote {
+  font-style: italic;
   border-left: 0.1rem solid #e5e5e5;
   margin: 0;
   padding: 0 0 0 20px;
-  font-style: italic;
 }
 
 table {
@@ -918,8 +918,8 @@ td {
 }
 
 dt {
-  color: #444444;
   font-weight: 700;
+  color: #444444;
 }
 
 th {
@@ -931,27 +931,27 @@ img {
 }
 
 header {
-  width: 270px;
   float: left;
+  width: 270px;
   position: fixed;
   -webkit-font-smoothing: subpixel-antialiased;
 }
 
 header ul {
   list-style: none;
-  height: 40px;
-  padding: 0;
-  background: #f4f4f4;
-  border-radius: var(--var-border-radius, 5px);
-  border: 0.1rem solid #e0e0e0;
   width: 270px;
+  height: 40px;
+  background: #f4f4f4;
+  border: 0.1rem solid #e0e0e0;
+  border-radius: var(--var-border-radius, 5px);
+  padding: 0;
 }
 
 header li {
-  width: 89px;
   float: left;
-  border-right: 0.1rem solid #e0e0e0;
+  width: 89px;
   height: 40px;
+  border-right: 0.1rem solid #e0e0e0;
 }
 
 header li:first-child a {
@@ -963,13 +963,13 @@ header li:last-child a {
 }
 
 header ul a {
-  line-height: 1;
-  font-size: 11px;
-  color: #999999;
   display: block;
-  text-align: center;
-  padding-top: 6px;
   height: 34px;
+  text-align: center;
+  font-size: 11px;
+  line-height: 1;
+  color: #999999;
+  padding-top: 6px;
 }
 
 header ul a:hover {
@@ -985,19 +985,19 @@ strong {
 }
 
 header ul li + li + li {
-  border-right: none;
   width: 89px;
+  border-right: none;
 }
 
 header ul a strong {
-  font-size: 14px;
   display: block;
+  font-size: 14px;
   color: #222222;
 }
 
 section {
-  width: 500px;
   float: right;
+  width: 500px;
   padding-bottom: 50px;
 }
 
@@ -1006,15 +1006,15 @@ small {
 }
 
 hr {
-  border: 0;
-  background: #e5e5e5;
   height: 1px;
+  background: #e5e5e5;
+  border: 0;
   margin: 0 0 20px;
 }
 
 footer {
-  width: 270px;
   float: left;
+  width: 270px;
   position: fixed;
   bottom: 50px;
   -webkit-font-smoothing: subpixel-antialiased;
@@ -1026,13 +1026,13 @@ br {
 }
 
 .videocontainer {
+  overflow: hidden;
+  width: 100%;
+  height: 100%;
   position: fixed;
   top: 0;
   bottom: 0;
-  width: 100%;
-  height: 100%;
   z-index: 1;
-  overflow: hidden;
   pointer-events: none;
 }
 
@@ -1041,15 +1041,15 @@ br {
 }
 
 #realityanimbg {
-  min-width: 100%;
-  min-height: 100%;
   width: auto;
   height: auto;
+  min-width: 100%;
+  min-height: 100%;
   position: absolute;
-  pointer-events: all;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
+  pointer-events: all;
 }
 
 @media print, screen and (max-width: 960px) {
@@ -1062,8 +1062,8 @@ br {
   section,
   footer {
     float: none;
-    position: static;
     width: auto;
+    position: static;
   }
 
   header {
@@ -1073,8 +1073,8 @@ br {
   section {
     border: 0.1rem solid #e5e5e5;
     border-width: var(--var-border-width, 1px) var(--var-border-width, 0);
-    padding: 20px 0;
     margin: 0 0 20px;
+    padding: 20px 0;
   }
 
   header a small {
@@ -1083,8 +1083,8 @@ br {
 
   header ul {
     position: absolute;
-    right: 50px;
     top: 52px;
+    right: 50px;
   }
 }
 
@@ -1122,11 +1122,11 @@ br {
 
 @media print {
   body {
-    /* stylelint-disable-next-line unit-allowed-list */
-    padding: 0.4in;
     /* stylelint-disable-next-line unit-allowed-list */
     font-size: 12pt;
     color: #444444;
+    /* stylelint-disable-next-line unit-allowed-list */
+    padding: 0.4in;
   }
 }
 
@@ -1222,45 +1222,45 @@ br {
 
 @keyframes dilate {
   0% {
-    transform: scaleX(1);
     opacity: 1;
+    transform: scaleX(1);
   }
 
   50% {
-    transform: scaleX(3);
     opacity: 0;
+    transform: scaleX(3);
   }
 
   60% {
-    transform: scaleX(1);
     opacity: 0;
+    transform: scaleX(1);
   }
 
   100% {
-    transform: scaleX(1);
     opacity: 1;
+    transform: scaleX(1);
   }
 }
 
 @keyframes undilate {
   0% {
-    transform: scaleX(1);
     opacity: 1;
+    transform: scaleX(1);
   }
 
   50% {
-    transform: scaleX(0.5);
     opacity: 0;
+    transform: scaleX(0.5);
   }
 
   60% {
-    transform: scaleX(1);
     opacity: 0;
+    transform: scaleX(1);
   }
 
   100% {
-    transform: scaleX(1);
     opacity: 1;
+    transform: scaleX(1);
   }
 }
 
@@ -1320,21 +1320,21 @@ br {
 }
 
 .infotooltip {
-  position: relative;
   display: inline-block;
+  position: relative;
 }
 
 .infotooltip .infotooltiptext {
   visibility: hidden;
-  background-color: black;
-  color: #ffffff;
-  text-align: left;
-  padding: 0.5rem;
-  border-radius: var(--var-border-radius, 0.5rem);
-  position: absolute;
-  z-index: 2;
   white-space: nowrap;
+  position: absolute;
   left: 105%;
+  z-index: 2;
+  text-align: left;
+  color: #ffffff;
+  background-color: black;
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 0.5rem;
 }
 
 .infotooltip:hover .infotooltiptext {
@@ -1359,15 +1359,15 @@ br {
 .o-primary-btn {
   height: 2.5rem;
   font-family: Typewriter, serif;
-  font-weight: bold;
   font-size: 1.3rem;
+  font-weight: bold;
   color: var(--color-text);
   background-color: var(--color-base);
   border: 0.1rem solid var(--color-good-dark);
   border-radius: var(--var-border-radius, 0.4rem);
+  padding: 0.3rem 1rem;
   transition-duration: 0.2s;
   cursor: pointer;
-  padding: 0.3rem 1rem;
 }
 
 .o-primary-btn:hover {
@@ -1392,9 +1392,9 @@ br {
 }
 
 .o-primary-btn--subtab-option {
+  line-height: 0;
   border: var(--var-border-width, 0.2rem) solid var(--color-accent);
   margin: 0.4rem 0.8rem;
-  line-height: 0;
 }
 
 .o-primary-btn--subtab-option:hover {
@@ -1408,19 +1408,19 @@ br {
 }
 
 .o-primary-btn--buy-max {
-  font-size: 1.2rem;
   width: 12rem;
+  font-size: 1.2rem;
 }
 
 .o-primary-btn--sacrifice {
-  font-size: 1.2rem;
   width: 48rem;
+  font-size: 1.2rem;
   margin-right: 0.8rem;
 }
 
 .o-primary-btn--buy-ad {
-  font-size: 1rem;
   vertical-align: middle;
+  font-size: 1rem;
   line-height: 9px;
 }
 
@@ -1433,21 +1433,21 @@ br {
 }
 
 .o-primary-btn--dimboost {
-  font-size: 0.9rem;
   width: 21rem;
   height: 4.5rem;
+  font-size: 0.9rem;
 }
 
 .o-primary-btn--galaxy {
-  font-size: 0.9rem;
   width: 21rem;
   height: 4.5rem;
+  font-size: 0.9rem;
 }
 
 .o-primary-btn--quick-reset {
-  font-size: 1.2rem;
   width: 20rem;
   height: 7rem;
+  font-size: 1.2rem;
 }
 
 .o-primary-btn--buy-id {
@@ -1457,9 +1457,9 @@ br {
 
 .o-primary-btn--buy-id-max,
 .o-primary-btn--id-autobuyer {
-  font-size: 1rem;
   width: 8rem;
   height: 3rem;
+  font-size: 1rem;
 }
 
 .o-primary-btn--buy-td {
@@ -1469,19 +1469,19 @@ br {
 
 .o-primary-btn--buy-td-max,
 .o-primary-btn--td-autobuyer {
-  font-size: 1rem;
   width: 8rem;
   height: 3rem;
+  font-size: 1rem;
 }
 
 .o-primary-btn--option {
+  display: flex;
+  flex-direction: column;
   width: 22rem;
   height: 5.5rem;
-  box-sizing: border-box;
-  display: flex;
   justify-content: center;
   align-items: center;
-  flex-direction: column;
+  box-sizing: border-box;
 }
 
 .o-primary-btn--option-wide {
@@ -1733,8 +1733,8 @@ br {
 .t-s1 .o-primary-btn--respec-active:hover,
 .t-s6 .o-primary-btn--respec-active:hover,
 .t-s10 .o-primary-btn--respec-active:hover {
-  background-color: #673ab7;
   color: black;
+  background-color: #673ab7;
 }
 
 .s-base--metro .o-primary-btn--discharge-active,
@@ -1748,8 +1748,8 @@ br {
 .t-s1 .o-primary-btn--discharge-active:hover,
 .t-s6 .o-primary-btn--discharge-active:hover,
 .t-s10 .o-primary-btn--discharge-active:hover {
-  background-color: #673ab7;
   color: black;
+  background-color: #673ab7;
 }
 
 /* #endregion t-s6 t-s10 */
@@ -1763,8 +1763,8 @@ br {
 .c-subtab-option-container {
   display: flex;
   flex-flow: row wrap;
-  padding-bottom: 0.8rem;
   justify-content: center;
+  padding-bottom: 0.8rem;
 }
 
 /* #endregion c-subtab-option-container */
@@ -1772,14 +1772,14 @@ br {
 /* #region o-prestige-button */
 
 .o-prestige-button {
+  width: 22rem;
+  height: 7rem;
+  font-family: Typewriter, serif;
+  font-size: 1.1rem;
   border: var(--var-border-width, 0.2rem) solid;
   border-radius: var(--var-border-radius, 0.4rem);
   transition-duration: 0.2s;
   cursor: pointer;
-  width: 22rem;
-  height: 7rem;
-  font-size: 1.1rem;
-  font-family: Typewriter, serif;
 }
 
 .o-prestige-button br {
@@ -1793,10 +1793,10 @@ br {
 /* #region Big Crunch */
 
 .o-infinity-button {
+  font-weight: bold;
   color: var(--color-infinity);
   background-color: black;
   border-color: var(--color-infinity);
-  font-weight: bold;
 }
 
 .o-infinity-button:hover {
@@ -1821,17 +1821,17 @@ br {
 }
 
 .o-infinity-button--unavailable {
-  cursor: default;
   opacity: 0.5;
+  cursor: default;
 }
 
 /* #region Eternity */
 
 .o-eternity-button {
+  font-weight: bold;
   color: var(--color-eternity);
   background-color: black;
   border-color: var(--color-eternity);
-  font-weight: bold;
 }
 
 .o-eternity-button:hover {
@@ -1858,10 +1858,10 @@ br {
 }
 
 .o-eternity-button--dilation {
+  font-weight: bold;
   color: var(--color-dilation);
   background-color: black;
   border-color: var(--color-dilation);
-  font-weight: bold;
 }
 
 .o-eternity-button--dilation:hover {
@@ -1888,8 +1888,8 @@ br {
 }
 
 .o-eternity-button--unavailable {
-  cursor: default;
   opacity: 0.5;
+  cursor: default;
 }
 
 /* #endregion Eternity */
@@ -1950,14 +1950,14 @@ br {
 }
 
 .l-hint-text--reality-upgrade {
-  font-size: 1.25rem;
   top: -1.7rem;
+  font-size: 1.25rem;
 }
 
 .c-hint-text--reality-upgrade {
+  font-weight: bold;
   color: var(--color-text);
   text-shadow: none;
-  font-weight: bold;
 }
 
 .l-hint-text--achievement {
@@ -1966,9 +1966,9 @@ br {
 }
 
 .o-hint-text--alchemy-node {
+  font-size: 1.2rem;
   color: #4f5957;
   text-shadow: none;
-  font-size: 1.2rem;
   transition: opacity 0.2s;
 }
 
@@ -1999,20 +1999,20 @@ br {
 }
 
 .c-game-header__infinity-points {
-  font-size: 1.2rem;
   width: 22rem;
+  font-size: 1.2rem;
 }
 
 .c-game-header__tesseract-available {
-  border-width: var(--var-border-width, 0.2rem) solid;
-  padding: 1rem;
-  margin-bottom: 1.2rem;
   font-family: Typewriter, serif;
-  background: #111117;
   color: #2ebce6;
-  cursor: pointer;
+  background: #111117;
+  border-width: var(--var-border-width, 0.2rem) solid;
+  margin-bottom: 1.2rem;
+  padding: 1rem;
   transition-duration: 0.15s;
   animation: a-tesseract-shift 5s infinite;
+  cursor: pointer;
 }
 
 .s-base--dark .c-game-header__tesseract-available {
@@ -2021,8 +2021,8 @@ br {
 }
 
 .c-infinity-dim-tab__tesseract-available:hover {
-  background: black;
   color: #306d80;
+  background: black;
 }
 
 .s-base--dark .c-infinity-dim-tab__tesseract-available:hover {
@@ -2059,8 +2059,8 @@ br {
 }
 
 .c-game-header__eternity-points {
-  font-size: 1.2rem;
   width: 22rem;
+  font-size: 1.2rem;
 }
 
 .c-game-header__ep-amount {
@@ -2124,10 +2124,10 @@ br {
 
 .l-game-header__challenge-text {
   display: flex;
-  justify-content: center;
-  align-items: center;
   height: 2rem;
   top: 50%;
+  justify-content: center;
+  align-items: center;
   font-size: 1.2rem;
 }
 
@@ -2238,10 +2238,10 @@ br {
 /* #region c-antimatter-dim-row */
 
 .c-antimatter-dim-row {
-  /* relative because floating text is 'position: absolute' */
-  position: relative;
   display: flex;
   flex-direction: row;
+  /* relative because floating text is 'position: absolute' */
+  position: relative;
   align-items: center;
   font-size: 1.5rem;
   margin-top: 1rem;
@@ -2253,34 +2253,34 @@ br {
 
 .c-progress-bar {
   width: 100%;
-  background-color: #a3a3a3;
-  border-radius: var(--var-border-radius, 0.5rem);
-  pointer-events: none;
-  margin-right: auto;
-  margin-left: auto;
 
   /* Start fill from left corner */
   text-align: left;
+  background-color: #a3a3a3;
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin-right: auto;
+  margin-left: auto;
+  pointer-events: none;
 }
 
 .c-progress-bar__fill {
   width: 0;
+
+  /* Align percents on center */
+  text-align: center;
   background-color: #127a20;
   border-radius: inherit;
   transition-duration: 0.1s;
   pointer-events: none;
-
-  /* Align percents on center */
-  text-align: center;
 }
 
 .c-progress-bar__percents {
+  overflow-wrap: normal;
   font-size: 1.6rem;
   color: black;
   pointer-events: all;
   -webkit-user-select: none;
   user-select: none;
-  overflow-wrap: normal;
 }
 
 /* #region themes */
@@ -2339,16 +2339,16 @@ br {
 }
 
 .c-infinity-dim-tab__tesseract-button {
-  padding: 1rem;
-  margin-bottom: 1.2rem;
   font-family: Typewriter, serif;
-  background: #111117;
   color: #2ebce6;
+  background: #111117;
   border: var(--var-border-width, 0.2rem) solid;
   border-radius: var(--var-border-radius, 0.4rem);
-  cursor: pointer;
+  margin-bottom: 1.2rem;
+  padding: 1rem;
   transition-duration: 0.15s;
   animation: a-tesseract-shift 5s infinite;
+  cursor: pointer;
 }
 
 .s-base--dark .c-infinity-dim-tab__tesseract-button {
@@ -2357,8 +2357,8 @@ br {
 }
 
 .c-infinity-dim-tab__tesseract-button:hover {
-  background: black;
   color: #00c5ff;
+  background: black;
 }
 
 .s-base--dark .c-infinity-dim-tab__tesseract-button:hover {
@@ -2366,27 +2366,27 @@ br {
 }
 
 .c-infinity-dim-tab__tesseract-button--disabled {
-  background: #444040;
   color: #bfdde8;
-  cursor: default;
+  background: #444040;
   animation: none;
+  cursor: default;
 }
 
 .s-base--dark .c-infinity-dim-tab__tesseract-button--disabled {
-  background: #444040;
   color: #bfdde8;
-  cursor: default;
+  background: #444040;
   animation: none;
+  cursor: default;
 }
 
 .c-infinity-dim-tab__tesseract-button--disabled:hover {
-  background: #444040;
   color: #bfdde8;
+  background: #444040;
 }
 
 .s-base--dark .c-infinity-dim-tab__tesseract-button--disabled:hover {
-  background: #444040;
   color: #bfdde8;
+  background: #444040;
 }
 
 @keyframes a-tesseract-shift {
@@ -2434,11 +2434,11 @@ br {
 /* #region c-infinity-dim-row */
 
 .c-infinity-dim-row {
-  margin-top: 1rem;
   display: flex;
   flex-direction: row;
   align-items: center;
   font-size: 1.6rem;
+  margin-top: 1rem;
 }
 
 /* #endregion c-infinity-dim-row */
@@ -2488,11 +2488,11 @@ br {
 /* #region c-time-dim-row */
 
 .c-time-dim-row {
-  margin-top: 1rem;
   display: flex;
   flex-direction: row;
   align-items: center;
   font-size: 1.6rem;
+  margin-top: 1rem;
 }
 
 /* #endregion c-time-dim-row */
@@ -2509,9 +2509,9 @@ br {
 }
 
 .c-options-tab__hotkeys-link {
-  cursor: pointer;
   width: 22rem;
   align-self: center;
+  cursor: pointer;
 }
 
 .c-file-import-button {
@@ -2519,18 +2519,18 @@ br {
 }
 
 .c-file-import {
-  position: absolute;
   width: 20rem;
   height: 5.5rem;
-  margin: -1.9rem -2rem;
+  position: absolute;
   opacity: 0;
+  margin: -1.9rem -2rem;
 }
 
 .c-file-import::before {
-  cursor: pointer;
+  content: " ";
   font-size: 100rem;
   padding: 10rem 20rem;
-  content: " ";
+  cursor: pointer;
 }
 
 /* #region l-options-grid */
@@ -2557,9 +2557,9 @@ br {
 
 .l-options-grid__notations-header {
   display: flex;
-  align-items: center;
-  justify-content: center;
   flex-direction: row;
+  justify-content: center;
+  align-items: center;
 }
 
 .c-options-grid__notations {
@@ -2602,14 +2602,14 @@ br {
 .l-select-notation__item,
 .l-select-theme__item {
   display: flex;
-  align-items: center;
   justify-content: center;
+  align-items: center;
 }
 
 .o-primary-btn.c-select-notation__item,
 .o-primary-btn.c-select-theme__item {
-  box-shadow: none;
   border-top: none;
+  box-shadow: none;
 }
 
 /* #endregion Options */
@@ -2622,8 +2622,8 @@ br {
   display: flex;
   flex-direction: column;
   align-items: center;
-  color: var(--color-text);
   font-size: 1.2rem;
+  color: var(--color-text);
 }
 
 .t-dark .c-stats-tab {
@@ -2644,9 +2644,9 @@ br {
 }
 
 .c-stats-tab-general {
-  color: var(--color-text);
   font-size: 2rem;
   font-weight: bold;
+  color: var(--color-text);
 }
 
 .c-stats-tab-subheader {
@@ -2670,21 +2670,21 @@ br {
 /* #region Past Prestige Runs */
 
 .c-past-runs-header {
-  cursor: pointer;
-  -webkit-user-select: none;
-  user-select: none;
   display: flex;
+  resize: none;
+  flex: auto;
   flex-direction: row;
   justify-content: center;
-  flex: auto;
-  resize: none;
   align-items: baseline;
+  -webkit-user-select: none;
+  user-select: none;
+  cursor: pointer;
 }
 
 .o-run-drop-down-icon {
   font-size: 1.5rem;
-  margin-left: 2rem;
   margin-right: 2rem;
+  margin-left: 2rem;
 }
 
 /* #endregion Past Prestige Runs */
@@ -2709,23 +2709,23 @@ br {
 
 .l-speedrun-milestone-tab {
   display: flex;
-  margin: auto;
-  width: 100%;
   flex-flow: row wrap;
+  width: 100%;
   justify-content: center;
   align-items: center;
+  margin: auto;
 }
 
 .l-speedrun-milestone-entry {
   display: flex;
   flex-direction: column;
-  color: var(--color-text);
   width: 25rem;
   height: 8rem;
   justify-content: space-between;
+  color: var(--color-text);
+  border: var(--var-border-width, 0.2rem) solid var(--color-text);
   margin: 0.2rem;
   padding: 0.2rem;
-  border: var(--var-border-width, 0.2rem) solid var(--color-text);
 }
 
 .l-speedrun-milestone-entry--completed {
@@ -2739,18 +2739,18 @@ br {
 /* #region o-achievement */
 
 .o-achievement {
-  position: relative;
   width: 10.6rem;
   height: 10.6rem;
-  border-radius: var(--var-border-radius, 0.8rem);
-  margin: 0 auto;
+  position: relative;
   text-align: center;
   font-family: Typewriter, serif;
-  color: black;
   font-size: 0.8rem;
+  color: black;
+  border: var(--var-border-width, 0.2rem) solid;
+  border-radius: var(--var-border-radius, 0.8rem);
+  margin: 0 auto;
   -webkit-user-select: none;
   user-select: none;
-  border: var(--var-border-width, 0.2rem) solid;
 }
 
 .o-achievement--normal {
@@ -2786,8 +2786,8 @@ br {
 }
 
 .o-achievement--hidden {
-  background-image: url("../images/achhidden.png");
   background-color: #555555;
+  background-image: url("../images/achhidden.png");
   border-color: black;
 }
 
@@ -2802,8 +2802,8 @@ br {
 }
 
 .o-achievement:hover .o-achievement__tooltip {
-  opacity: 1;
   bottom: 11rem;
+  opacity: 1;
 }
 
 .o-achievement:hover .o-achievement__tooltip::after {
@@ -2812,40 +2812,40 @@ br {
 }
 
 .o-achievement__tooltip {
-  opacity: 0;
-  transition-duration: 0.3s;
-  font-size: 1.4rem;
-  border: 0.1rem solid black;
-  border-radius: var(--var-border-radius, 0.8rem);
-  color: var(--color-text);
-  background: var(--color-base);
   width: 20rem;
-  margin-left: -5rem;
-  padding: 0.4rem;
-  z-index: 2;
-  pointer-events: none;
   position: absolute;
   bottom: 10.2rem;
+  z-index: 2;
+  font-size: 1.4rem;
+  opacity: 0;
+  color: var(--color-text);
+  background: var(--color-base);
+  border: 0.1rem solid black;
+  border-radius: var(--var-border-radius, 0.8rem);
+  margin-left: -5rem;
+  padding: 0.4rem;
+  transition-duration: 0.3s;
+  pointer-events: none;
 }
 
 .o-achievement__tooltip::after {
+  content: " ";
+  width: 0;
   position: absolute;
   bottom: 0;
   left: 50%;
-  margin-left: -0.7rem;
-  margin-bottom: 0;
-  width: 0;
+  z-index: 0;
   border-top: 0 solid black;
   border-right: 0.7rem solid transparent;
   border-left: 0.7rem solid transparent;
-  content: " ";
+  margin-bottom: 0;
+  margin-left: -0.7rem;
   transition-duration: 0.3s;
-  z-index: 0;
 }
 
 .s-base--dark .o-achievement__tooltip {
-  border-color: var(--color-text);
   background: #111111;
+  border-color: var(--color-text);
 }
 
 .s-base--dark .o-achievement__tooltip::after {
@@ -2862,8 +2862,8 @@ br {
 
 .t-s6 .o-achievement__tooltip,
 .t-s10 .o-achievement__tooltip {
-  border-color: white;
   background: black;
+  border-color: white;
 }
 
 .t-s6 .o-achievement__tooltip::after,
@@ -2887,16 +2887,16 @@ br {
 }
 
 .o-achievement__indicator {
-  position: absolute;
-  bottom: 0;
-  right: 0;
   width: 1.5rem;
   height: 1.5rem;
+  position: absolute;
+  right: 0;
+  bottom: 0;
   font-size: 1rem;
   color: black;
   background: #5ac467;
-  border-left: var(--var-border-width, 0.2rem) solid #127a20;
   border-top: var(--var-border-width, 0.2rem) solid #127a20;
+  border-left: var(--var-border-width, 0.2rem) solid #127a20;
   border-top-left-radius: var(--var-border-radius, 0.8rem);
   border-bottom-right-radius: var(--var-border-radius, 0.6rem);
 }
@@ -3027,8 +3027,8 @@ br {
 }
 
 .t-s5 .o-achievement--locked {
-  border-color: #000000;
   background-color: #222222;
+  border-color: #000000;
 }
 
 /* #endregion t-s5 */
@@ -3069,29 +3069,29 @@ br {
 }
 
 .c-achievements-tab__header {
-  font-size: 1.5rem;
-  margin-top: 0.6rem;
+  display: inline;
   width: 60rem;
   position: relative;
-  display: inline;
   justify-content: center;
+  font-size: 1.5rem;
+  margin-top: 0.6rem;
   -webkit-user-select: none;
   user-select: none;
 }
 
 .t-s4 .c-achievements-tab__header--multipliers::after {
   content: "you can click the colon at the end of this line in any other theme to turn on these achievement images";
-  font-size: 0.8rem;
-  position: absolute;
-  margin-left: 16rem;
-  margin-top: -9rem;
   width: 20rem;
+  position: absolute;
+  font-size: 0.8rem;
+  margin-top: -9rem;
+  margin-left: 16rem;
 }
 
 .c-achievements-tab__timer {
-  color: black;
-  font-size: 1.2rem;
   width: 40%;
+  font-size: 1.2rem;
+  color: black;
   margin: 0.5rem auto;
 }
 
@@ -3151,41 +3151,41 @@ br {
 }
 
 .l-challenges-tab__header {
-  margin: 0.5rem 0;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
+  margin: 0.5rem 0;
 }
 
 .o-challenges-tab__header-toggle {
-  cursor: pointer;
-  -webkit-user-select: none;
-  user-select: none;
   display: inline-flex;
   flex-direction: row;
-  align-items: center;
   justify-content: flex-start;
+  align-items: center;
   margin: 0 1rem;
+  -webkit-user-select: none;
+  user-select: none;
+  cursor: pointer;
 }
 
 .l-challenges-tab__auto-ec-info {
-  left: 100%;
   display: flex;
-  flex-direction: row;
-  align-items: center;
   white-space: nowrap;
+  flex-direction: row;
+  left: 100%;
+  align-items: center;
 }
 
 .c-challenges-tab__auto-ec-info {
-  font-weight: bold;
   text-align: left;
+  font-weight: bold;
 }
 
 .l-challenges-tab__auto-ec-timers {
-  margin-left: 0.4rem;
   display: flex;
   flex-direction: column;
+  margin-left: 0.4rem;
 }
 
 /* #endregion l-challenges-tab */
@@ -3193,9 +3193,9 @@ br {
 /* #region l-challenge-grid */
 
 .l-challenge-grid {
-  width: 90rem;
   display: flex;
   flex-flow: row wrap;
+  width: 90rem;
   justify-content: center;
 }
 
@@ -3214,18 +3214,18 @@ br {
 .c-challenge-box {
   width: 40rem;
   height: 13rem;
-  padding: 0.5rem 0.4rem;
-  box-sizing: border-box;
+  font-size: 1rem;
   font-weight: bold;
   border: var(--var-border-width, 0.2rem) solid black;
   border-radius: var(--var-border-radius, 0.5rem);
-  font-size: 1rem;
+  box-sizing: border-box;
+  padding: 0.5rem 0.4rem;
   transition: all 0.2s, visibility 0s;
 }
 
 .c-challenge-box--normal {
-  color: var(--color-text);
   font-size: 1.05rem;
+  color: var(--color-text);
   background-color: #f2f2f2;
 }
 
@@ -3323,8 +3323,8 @@ br {
 
 .t-s7 .c-challenge-box {
   color: black;
-  border-color: #9b9b9b;
   background: white;
+  border-color: #9b9b9b;
 }
 
 /* #endregion t-s7 */
@@ -3336,14 +3336,14 @@ br {
 /* #region l-challenge-box */
 
 .l-challenge-box {
-  margin-top: 0.5rem;
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
-  align-items: center;
 
   /* because of hint-text */
   position: relative;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 0.5rem;
 }
 
 .l-challenge-box > * {
@@ -3357,9 +3357,9 @@ br {
 .l-challenge-box__bottom--infinity {
   display: flex;
   flex-direction: column;
+  height: 5.5rem;
   justify-content: flex-end;
   align-items: center;
-  height: 5.5rem;
 }
 
 /* #endregion l-challenge-box */
@@ -3370,10 +3370,10 @@ br {
   width: 15rem;
   height: 3rem;
   font-family: Typewriter, serif;
+  font-size: 1.2rem;
   font-weight: bold;
   border: var(--var-border-width, 0.3rem) solid #127a20;
   border-radius: var(--var-border-radius, 1rem);
-  font-size: 1.2rem;
   margin-bottom: 0.5rem;
   transition: all 0.2s, visibility 0s;
   cursor: pointer;
@@ -3424,8 +3424,8 @@ br {
 }
 
 .t-dark .o-challenge-btn--completed {
-  box-shadow: none;
   border-color: #388e3c;
+  box-shadow: none;
 }
 
 .t-dark .o-challenge-btn--running {
@@ -3449,8 +3449,8 @@ br {
 .s-base--metro .o-challenge-btn--unlocked,
 .s-base--metro .o-challenge-btn--completed {
   border: 0.1rem solid #43a047;
-  border-bottom-color: #388e3c;
   border-right-color: #388e3c;
+  border-bottom-color: #388e3c;
 }
 
 .s-base--metro .o-challenge-btn--unlocked:hover,
@@ -3466,8 +3466,8 @@ br {
 .s-base--metro .o-challenge-btn--locked {
   background-color: #9e9e9e;
   border: 0.1rem solid #757575;
-  border-bottom-color: #616161;
   border-right-color: #616161;
+  border-bottom-color: #616161;
 }
 
 .t-metro .o-challenge-btn--redo,
@@ -3475,8 +3475,8 @@ br {
 .t-s8 .o-challenge-btn--redo {
   background-color: #4b8a4e;
   border: 0.1rem solid #757575;
-  border-bottom-color: #616161;
   border-right-color: #616161;
+  border-bottom-color: #616161;
 }
 
 /* #endregion t-metro t-dark-metro t-inverted-metro t-s8 */
@@ -3629,16 +3629,16 @@ br {
 /* #region o-infinity-upgrade-btn */
 
 .o-infinity-upgrade-btn {
-  color: white;
-  background-color: #1f1f1f;
-  font-weight: bold;
-  font-size: 1rem;
-  border: 0.1rem solid black;
   width: 19rem;
   height: 9rem;
-  transition-duration: 0.2s;
-  border-radius: var(--var-border-radius, 0.4rem);
   font-family: Typewriter, serif;
+  font-size: 1rem;
+  font-weight: bold;
+  color: white;
+  background-color: #1f1f1f;
+  border: 0.1rem solid black;
+  border-radius: var(--var-border-radius, 0.4rem);
+  transition-duration: 0.2s;
   cursor: pointer;
 }
 
@@ -3658,13 +3658,13 @@ br {
 }
 
 .o-infinity-upgrade-btn--useless-available {
-  background-color: var(--color-pelle--base);
   color: black;
+  background-color: var(--color-pelle--base);
 }
 
 .o-infinity-upgrade-btn--useless-available:hover {
-  background-color: var(--color-pelle--secondary);
   color: black;
+  background-color: var(--color-pelle--secondary);
 }
 
 .t-dark .o-infinity-upgrade-btn--available:hover,
@@ -3740,8 +3740,8 @@ br {
 }
 
 .o-infinity-upgrade-btn--multiplier.o-infinity-upgrade-btn--useless-available {
-  background-color: var(--color-pelle--base);
   color: black;
+  background-color: var(--color-pelle--base);
 }
 
 .o-infinity-upgrade-btn--multiplier.o-infinity-upgrade-btn--useless-available:hover {
@@ -3783,14 +3783,14 @@ br {
 }
 
 .t-s1 .o-infinity-upgrade-btn--multiplier.o-infinity-upgrade-btn--available {
-  background-color: black;
   color: #d72621;
+  background-color: black;
   border-color: #dbd242;
 }
 
 .t-s1 .o-infinity-upgrade-btn--multiplier.o-infinity-upgrade-btn--available:hover {
-  background-color: white;
   color: black;
+  background-color: white;
 }
 
 /* #endregion o-infinity-upgrade-btn--multiplier */
@@ -3945,8 +3945,8 @@ br {
 }
 
 .l-autobuyers-tab td {
-  padding: 0;
   text-align: center;
+  padding: 0;
 }
 
 /* #endregion l-autobuyers-tab */
@@ -3969,12 +3969,12 @@ br {
 /* #region o-autobuyer-input */
 
 .o-autobuyer-input {
-  font-size: 1.3rem;
-  font-family: typewriter;
-  border: 0.1rem solid #c2c2c2;
-  padding: 0.5rem;
   height: 3rem;
+  font-family: typewriter;
+  font-size: 1.3rem;
+  border: 0.1rem solid #c2c2c2;
   box-sizing: border-box;
+  padding: 0.5rem;
 }
 
 .t-metro .o-autobuyer-input {
@@ -4016,29 +4016,29 @@ br {
 .o-autobuyer-toggle-checkbox {
   display: flex;
   flex-direction: row;
-  align-items: center;
   justify-content: center;
+  align-items: center;
   -webkit-user-select: none;
   user-select: none;
 }
 
 .o-autobuyer-toggle-checkbox__label {
   display: flex;
+  width: 2rem;
+  height: 2rem;
   justify-content: center;
   align-items: center;
-  background: var(--color-gh-purple);
   font-size: 1rem;
-  height: 2rem;
-  width: 2rem;
+  font-weight: bold;
+  color: black;
+  background: var(--color-gh-purple);
   border: var(--var-border-width, 0.2rem) solid #383232;
   border-top-right-radius: var(--var-border-radius, 0.3rem);
   border-bottom-left-radius: var(--var-border-radius, 1rem);
-  color: black;
-  font-weight: bold;
-  cursor: pointer;
+  transition-duration: 0.2s;
   -webkit-user-select: none;
   user-select: none;
-  transition-duration: 0.2s;
+  cursor: pointer;
 }
 
 .s-base--metro .o-autobuyer-toggle-checkbox__label {
@@ -4094,12 +4094,12 @@ br {
 .o-autobuyer-btn {
   width: 17.5rem;
   height: 3.5rem;
+  font-family: Typewriter;
+  font-size: 0.9rem;
+  font-weight: bold;
   color: white;
   background: #1f1f1f;
   border: 0.1rem solid #ed85df;
-  font-family: Typewriter;
-  font-weight: bold;
-  font-size: 0.9rem;
   border-radius: var(--var-border-radius, 0.4rem);
   margin-bottom: -0.1rem;
   transition-duration: 0.2s;
@@ -4120,8 +4120,8 @@ br {
 
 .t-dark .o-autobuyer-btn {
   color: black;
-  border-color: black;
   background: #455a64;
+  border-color: black;
 }
 
 .t-dark .o-autobuyer-btn:hover {
@@ -4169,16 +4169,16 @@ br {
 .c-autobuyer-box {
   width: 23rem;
   height: 17.5rem;
-  padding: 1rem;
+  font-size: 1.1rem;
   border: solid 0.1rem grey;
   border-radius: var(--var-border-radius, 0.4rem);
-  font-size: 1.1rem;
+  padding: 1rem;
 }
 
 .t-s1 .c-autobuyer-box {
   color: black;
-  border-color: black;
   background-color: #dbd242;
+  border-color: black;
 }
 
 .t-s5 .c-autobuyer-box {
@@ -4194,12 +4194,12 @@ br {
 }
 
 .c-autobuyer-box__mode-select {
+  height: 3rem;
+  text-align: center;
+  text-align-last: center;
   font-family: Typewriter, serif;
   font-size: 1.2rem;
   color: black;
-  text-align: center;
-  text-align-last: center;
-  height: 3rem;
 }
 
 .t-metro .c-autobuyer-box__mode-select {
@@ -4235,15 +4235,15 @@ br {
 
 .c-autobuyer-box-row {
   display: flex;
+  width: 90rem;
+  position: relative;
   justify-content: center;
   align-items: center;
-  position: relative;
   color: var(--color-text);
   border: var(--var-border-width, 0.2rem) solid #383232;
   border-radius: var(--var-border-radius, 0.5rem);
   margin: 0.5rem;
   padding: 1rem;
-  width: 90rem;
 }
 
 .s-base--metro .c-autobuyer-box-row {
@@ -4259,14 +4259,14 @@ br {
 }
 
 .t-s1 .c-autobuyer-box-row {
-  border-color: black;
   background: var(--color-base);
+  border-color: black;
 }
 
 .t-s6 .c-autobuyer-box-row,
 .t-s10 .c-autobuyer-box-row {
-  border: 0.1rem solid #cccccc;
   background: black;
+  border: 0.1rem solid #cccccc;
 }
 
 .t-s8 .c-autobuyer-box-row {
@@ -4275,18 +4275,18 @@ br {
 
 .l-autobuyer-singlet-group {
   display: flex;
-  flex-wrap: wrap;
   flex-grow: 1;
+  flex-wrap: wrap;
   width: 91rem;
 }
 
 .c-small-autobuyer-input {
   width: 10rem;
   height: 2rem;
-  margin: 0.2rem 0;
   border-color: var(--color-laitela--accent);
   border-width: var(--var-border-width, 0.2rem);
   border-radius: var(--var-border-radius, 0.5rem);
+  margin: 0.2rem 0;
 }
 
 .c-autobuyer-box-slot {
@@ -4310,14 +4310,14 @@ br {
 }
 
 .t-s1 .c-autobuyer-box-slot {
-  border-color: black;
   background: var(--color-base);
+  border-color: black;
 }
 
 .t-s6 .c-autobuyer-box-slot,
 .t-s10 .c-autobuyer-box-slot {
-  border: 0.1rem solid #cccccc;
   background: black;
+  border: 0.1rem solid #cccccc;
 }
 
 .t-s8 .c-autobuyer-box-slot {
@@ -4339,31 +4339,31 @@ br {
 
 .l-autobuyer-box__autobuyers {
   display: flex;
-  flex-wrap: wrap;
   flex-grow: 1;
+  flex-wrap: wrap;
   width: 80rem;
 }
 
 .l-autobuyer-box__autobuyers-internal {
   display: inline-flex;
-  align-items: center;
-  justify-content: center;
   flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
 
 .l-autobuyer-box__content {
-  flex: 1 0 auto;
   display: flex;
+  flex: 1 0 auto;
   flex-direction: column;
   justify-content: space-evenly;
   align-items: center;
 }
 
 .l-autobuyer-box__footer {
+  width: 0%;
   position: absolute;
   top: -0.2rem;
   right: 1.8rem;
-  width: 0%;
 }
 
 .s-base--metro .l-autobuyer-box__footer,
@@ -4391,10 +4391,10 @@ br {
 .l-replicanti-tab {
   display: flex;
   flex-direction: column;
-  align-items: center;
 
   /* To prevent button jitter */
   width: 100%;
+  align-items: center;
 }
 
 /* #region c-replicanti-description */
@@ -4542,33 +4542,33 @@ br {
 }
 
 .o-eternity-upgrade {
-  font-weight: bold;
-  font-size: 1rem;
-  border: 0.1rem solid var(--color-eternity);
   width: 20rem;
   height: 9rem;
+  font-family: Typewriter, serif;
+  font-size: 1rem;
+  font-weight: bold;
+  border: 0.1rem solid var(--color-eternity);
+  border-radius: var(--var-border-radius, 0.4rem);
   transition-duration: 0.2s;
   cursor: pointer;
-  border-radius: var(--var-border-radius, 0.4rem);
-  font-family: Typewriter, serif;
 }
 
 .o-eternity-upgrade--useless-available {
-  background-color: var(--color-pelle--base);
   color: black;
+  background-color: var(--color-pelle--base);
   border-color: black;
 }
 
 .o-eternity-upgrade--useless-available:hover {
-  background-color: var(--color-pelle--secondary);
   color: black;
+  background-color: var(--color-pelle--secondary);
 }
 
 .o-eternity-upgrade--useless-unavailable {
-  background-color: var(--color-pelle--base);
   color: black;
-  filter: grayscale(90%);
+  background-color: var(--color-pelle--base);
   border-color: black;
+  filter: grayscale(90%);
 }
 
 .o-eternity-upgrade--useless-unavailable:hover {
@@ -4712,20 +4712,20 @@ br {
 }
 
 .o-eternity-milestone__goal {
-  font-size: 2rem;
   text-align: left;
+  font-size: 2rem;
 }
 
 .o-eternity-milestone__reward {
   width: 25rem;
   height: 8rem;
-  color: black;
-  font-weight: bold;
-  border: 0.1rem solid var(--color-eternity);
-  transition-duration: 0.2s;
-  border-radius: var(--var-border-radius, 0.4rem);
   font-family: Typewriter, serif;
   font-size: 1.2rem;
+  font-weight: bold;
+  color: black;
+  border: 0.1rem solid var(--color-eternity);
+  border-radius: var(--var-border-radius, 0.4rem);
+  transition-duration: 0.2s;
 }
 
 .o-eternity-milestone__reward--locked {
@@ -4744,8 +4744,8 @@ br {
 .s-base--metro .o-eternity-milestone__reward--locked,
 .t-s1 .o-eternity-milestone__reward--locked {
   background-color: #9e9e9e;
-  box-shadow: 0.1rem 0.1rem 0.1rem 0 black;
   border: none;
+  box-shadow: 0.1rem 0.1rem 0.1rem 0 black;
 }
 
 .t-dark .o-eternity-milestone__reward--locked,
@@ -4775,28 +4775,28 @@ br {
 /* #region c-dilation-tab */
 
 .c-dilation-tab__tachyons {
-  color: black;
   font-size: 3.5rem;
+  color: black;
 }
 
 .c-dilation-tab__dilated-time {
-  color: black;
   font-size: 3.5rem;
+  color: black;
 }
 
 .c-dilation-tab__dilated-time-income {
-  color: black;
   font-size: 2.5rem;
+  color: black;
 }
 
 .c-dilation-tab__galaxy-threshold {
-  color: black;
   font-size: 2.5rem;
+  color: black;
 }
 
 .c-dilation-tab__galaxies {
-  color: black;
   font-size: 2.5rem;
+  color: black;
 }
 
 .t-metro .c-dilation-tab__tachyons,
@@ -4878,15 +4878,15 @@ br {
 /* #region o-dilation-btn */
 
 .o-dilation-btn {
-  font-weight: bold;
-  font-size: 1.12rem;
-  border: var(--var-border-width, 0.2rem) solid var(--color-dilation);
   width: 19rem;
   height: 9rem;
-  transition-duration: 0.2s;
-  border-radius: var(--var-border-radius, 0.4rem);
   font-family: Typewriter, serif;
+  font-size: 1.12rem;
+  font-weight: bold;
+  border: var(--var-border-width, 0.2rem) solid var(--color-dilation);
+  border-radius: var(--var-border-radius, 0.4rem);
   padding: 1rem;
+  transition-duration: 0.2s;
 }
 
 .o-dilation-btn--locked {
@@ -4898,8 +4898,8 @@ br {
 .o-dilation-btn--unlocked {
   color: var(--color-dilation);
   background-color: black;
-  cursor: pointer;
   animation: a-dilation-btn-glow 10s infinite;
+  cursor: pointer;
 }
 
 .o-dilation-btn--unlocked:hover {
@@ -4931,8 +4931,8 @@ br {
 .t-s1 .o-dilation-btn--locked {
   color: black;
   background-color: #9e9e9e;
-  box-shadow: 0.1rem 0.1rem 0.1rem 0 black;
   border: none;
+  box-shadow: 0.1rem 0.1rem 0.1rem 0 black;
 }
 
 .s-base--metro .o-dilation-btn--locked:hover {
@@ -4958,8 +4958,8 @@ br {
 .t-s6 .o-dilation-btn--locked:hover,
 .t-s10 .o-dilation-btn--locked:hover {
   color: black;
-  border-color: #b84b5f;
   background-color: #b84b5f;
+  border-color: #b84b5f;
 }
 
 @keyframes a-dilation-btn-glow {
@@ -4999,15 +4999,15 @@ br {
 /* #region o-dilation-upgrade */
 
 .o-dilation-upgrade {
-  background: black;
-  font-weight: bold;
-  font-size: 1.05rem;
-  border: 0.1rem solid;
   width: 19rem;
   height: 10rem;
-  transition-duration: 0.2s;
-  border-radius: var(--var-border-radius, 0.4rem);
   font-family: Typewriter, serif;
+  font-size: 1.05rem;
+  font-weight: bold;
+  background: black;
+  border: 0.1rem solid;
+  border-radius: var(--var-border-radius, 0.4rem);
+  transition-duration: 0.2s;
 }
 
 .o-dilation-upgrade--useless-available {
@@ -5024,8 +5024,8 @@ br {
 .o-dilation-upgrade--useless-bought {
   color: black;
   background-color: var(--color-pelle--base) !important;
-  filter: grayscale(50%);
   border-color: black;
+  filter: grayscale(50%);
 }
 
 .o-dilation-upgrade--available {
@@ -5052,10 +5052,10 @@ br {
 }
 
 .o-dilation-upgrade--useless-unavailable {
-  background-color: var(--color-pelle--base) !important;
   color: black;
-  filter: grayscale(90%);
+  background-color: var(--color-pelle--base) !important;
   border-color: black;
+  filter: grayscale(90%);
 }
 
 .o-dilation-upgrade--useless-unavailable:hover {
@@ -5087,8 +5087,8 @@ br {
 .t-s1 .o-dilation-upgrade--unavailable {
   color: black;
   background-color: #9e9e9e;
-  box-shadow: 0.1rem 0.1rem 0.1rem 0 black;
   border: none;
+  box-shadow: 0.1rem 0.1rem 0.1rem 0 black;
 }
 
 .s-base--metro .o-dilation-upgrade--unavailable:hover {
@@ -5136,8 +5136,8 @@ br {
 .t-s6 .o-dilation-upgrade--unavailable:hover,
 .t-s10 .o-dilation-upgrade--unavailable:hover {
   color: black;
-  border-color: var(--color-bad);
   background-color: var(--color-bad);
+  border-color: var(--color-bad);
 }
 
 .t-s4 .o-dilation-upgrade--available {
@@ -5154,11 +5154,11 @@ br {
 /* #endregion o-dilation-upgrade */
 
 .c-tachyon-particle-container {
+  width: 100%;
+  height: 100%;
   position: fixed;
   top: 0;
   left: 0;
-  width: 100%;
-  height: 100%;
   z-index: -1;
 }
 
@@ -5180,13 +5180,13 @@ br {
 }
 
 .l-modal-overlay {
-  position: fixed;
-  left: 0;
-  top: 0;
   /* stylelint-disable-next-line unit-allowed-list */
   width: 100vw;
   /* stylelint-disable-next-line unit-allowed-list */
   height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
   z-index: 6;
   animation-name: a-modal-overlay-fadein;
   animation-duration: 2s;
@@ -5194,24 +5194,24 @@ br {
 }
 
 .l-modal {
+  display: inline-block;
   position: fixed;
   top: 50%;
   left: 50%;
-  transform: translate(-50%, -50%);
   z-index: 7;
-  display: inline-block;
+  transform: translate(-50%, -50%);
 }
 
 /* #region c-modal */
 
 .c-modal {
+  text-align: center;
+  font-family: Typewriter, serif;
+  font-size: 1.4rem;
   color: var(--color-text);
   background-color: var(--color-base);
   border: var(--var-border-width, 0.3rem) solid black;
   border-radius: var(--var-border-radius, 0.6rem);
-  text-align: center;
-  font-family: Typewriter, serif;
-  font-size: 1.4rem;
   padding: 1rem;
   transition-duration: 0.2s;
 }
@@ -5229,9 +5229,9 @@ br {
 }
 
 .c-modal__close-btn--tiny {
-  transform: scale(0.5);
   top: -0.5rem;
   right: -0.5rem;
+  transform: scale(0.5);
 }
 
 .l-modal-buttons {
@@ -5246,20 +5246,20 @@ br {
 
 .c-modal__confirmation-toggle__checkbox {
   display: inline-flex;
-  vertical-align: middle;
+  width: 2rem;
+  height: 2rem;
+  position: relative;
   justify-content: center;
   align-items: center;
-  background: var(--color-gh-purple);
+  vertical-align: middle;
   font-size: 1.3rem;
-  height: 2rem;
-  width: 2rem;
+  color: black;
+  background: var(--color-gh-purple);
   border: var(--var-border-width, 0.3rem) solid black;
   border-radius: var(--var-border-radius, 0.3rem);
-  color: black;
+  transition-duration: 0.2s;
   -webkit-user-select: none;
   user-select: none;
-  transition-duration: 0.2s;
-  position: relative;
 }
 
 .s-base--metro .c-modal__confirmation-toggle {
@@ -5269,14 +5269,14 @@ br {
 
 .t-s6 .c-modal__confirmation-toggle__checkbox,
 .t-s10 .c-modal__confirmation-toggle__checkbox {
-  border: 0.1rem solid #1b5e20;
   top: -0.1rem;
   right: -0.1rem;
+  border: 0.1rem solid #1b5e20;
 }
 
 .t-s11 .c-modal__confirmation-toggle__checkbox {
-  border-color: #e1ae18;
   top: -0.2rem;
+  border-color: #e1ae18;
 }
 
 .c-modal__confirmation-toggle__checkbox--active {
@@ -5288,19 +5288,19 @@ br {
 }
 
 .c-modal__confirmation-toggle__tooltip {
-  opacity: 0;
-  transition-duration: 0.2s;
+  min-width: 20rem;
+  position: absolute;
+  bottom: 100%;
   font-size: 1.4rem;
+  opacity: 0;
   color: var(--color-text);
   background-color: var(--color-base);
   border: var(--var-border-width, 0.3rem) solid black;
   border-radius: var(--var-border-radius, 0.8rem);
-  min-width: 20rem;
   margin-left: 0;
   padding: 0.4rem;
+  transition-duration: 0.2s;
   pointer-events: none;
-  position: absolute;
-  bottom: 100%;
 }
 
 .t-s6 .c-modal__confirmation-toggle__tooltip,
@@ -5309,23 +5309,23 @@ br {
 }
 
 .c-modal__confirmation-toggle__tooltip::after {
+  content: " ";
+  width: 0;
   position: absolute;
   bottom: 0;
   left: 50%;
-  margin-left: -0.7rem;
-  margin-bottom: 0;
-  width: 0;
+  z-index: 0;
   border-top: 0 solid black;
   border-right: 0.7rem solid transparent;
   border-left: 0.7rem solid transparent;
-  content: " ";
+  margin-bottom: 0;
+  margin-left: -0.7rem;
   transition-duration: 0.2s;
-  z-index: 0;
 }
 
 .c-modal__confirmation-toggle:hover .c-modal__confirmation-toggle__tooltip {
-  opacity: 1;
   bottom: calc(100% + 0.8rem);
+  opacity: 1;
 }
 
 .s-base--metro .c-modal__confirmation-toggle:hover .c-modal__confirmation-toggle__tooltip {
@@ -5430,8 +5430,8 @@ br {
 /* #region c-modal-hard-reset */
 
 .c-modal-hard-reset-danger {
-  color: var(--color-bad);
   font-weight: bold;
+  color: var(--color-bad);
 }
 
 .c-modal-hard-reset-btn {
@@ -5453,8 +5453,8 @@ br {
 .c-modal-away-progress {
   display: flex;
   flex-direction: column;
-  align-items: center;
   min-width: 40rem;
+  align-items: center;
 }
 
 .t-dark .c-modal-away-progress {
@@ -5473,9 +5473,9 @@ br {
 }
 
 .c-modal-away-progress__resources div {
+  border-bottom: 0.1rem solid var(--color-text);
   margin-bottom: 0.2rem;
   padding-bottom: 0.2rem;
-  border-bottom: 0.1rem solid var(--color-text);
   cursor: pointer;
 }
 
@@ -5598,10 +5598,10 @@ br {
 
 .c-modal-away-progress__disabled b,
 .c-modal-away-progress__disabled {
-  text-decoration: line-through;
-  color: #303030;
   font-style: italic;
+  color: #303030;
   text-shadow: 0 0 0.3rem #303030;
+  text-decoration: line-through;
   animation: none;
 }
 
@@ -5626,8 +5626,8 @@ br {
 /* #region c-modal-import-tree */
 
 .c-modal-import-tree {
-  width: 48rem;
   word-break: break-word;
+  width: 48rem;
 }
 
 .l-modal-import-tree__tree-info-line {
@@ -5649,10 +5649,10 @@ br {
 /* #endregion c-modal-import-tree */
 
 .c-modal-input {
-  border: 0.1rem solid black;
-  background-color: #f2f2f2;
-  border-radius: var(--var-border-radius, 0.3rem);
   text-align: center;
+  background-color: #f2f2f2;
+  border: 0.1rem solid black;
+  border-radius: var(--var-border-radius, 0.3rem);
 }
 
 .c-modal-options {
@@ -5665,8 +5665,8 @@ br {
 
 .c-modal-options .o-primary-btn--option,
 .o-primary-btn--option-wide {
-  padding: 0.5rem;
   margin: 0.5rem;
+  padding: 0.5rem;
 }
 
 .c-modal-options .o-primary-btn--width-medium {
@@ -5684,8 +5684,8 @@ br {
 .l-modal-options {
   display: flex;
   flex-direction: column;
-  align-items: center;
   justify-content: space-evenly;
+  align-items: center;
 }
 
 .l-modal-options__save-record {
@@ -5719,26 +5719,26 @@ br {
 }
 
 .o-modal-store-label {
-  margin-right: 1.5rem;
-  font-family: Typewriter;
-  font-size: 2rem;
   min-width: 10rem;
   text-align: right;
+  font-family: Typewriter;
+  font-size: 2rem;
+  margin-right: 1.5rem;
 }
 
 .o-modal-store-btn {
-  padding: 0.8rem;
-  border: none;
-  background: burlywood;
-  border-radius: var(--var-border-radius, 0.5rem);
+  display: flex;
+  min-width: 12rem;
+  justify-content: center;
+  align-items: center;
   font-family: Typewriter;
   font-size: 2rem;
-  cursor: pointer;
+  background: burlywood;
+  border: none;
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 0.8rem;
   transition-duration: 0.15s;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  min-width: 12rem;
+  cursor: pointer;
 }
 
 .o-modal-store-btn:hover {
@@ -5762,9 +5762,9 @@ br {
 }
 
 .l-modal-hotkeys__column {
-  width: 25rem;
   display: flex;
   flex-direction: column;
+  width: 25rem;
 }
 
 .l-modal-hotkeys__column--right {
@@ -5792,26 +5792,26 @@ br {
 }
 
 kbd {
+  display: inline-block;
+  vertical-align: middle;
+  font: 1.1rem SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  line-height: 1rem;
+  color: #444d56;
   background-color: #fafbfc;
   border: 0.1rem solid #d1d5da;
   border-bottom-color: #c6cbd1;
   border-radius: var(--var-border-radius, 0.3rem);
   box-shadow: inset 0 -0.1rem 0 #c6cbd1;
-  color: #444d56;
-  display: inline-block;
-  font: 1.1rem SFMono-Regular, Consolas, "Liberation Mono", Menlo, Courier, monospace;
-  line-height: 1rem;
   padding: 0.3rem 0.5rem;
-  vertical-align: middle;
 }
 
 .t-dark kbd,
 .t-dark-metro kbd {
+  color: #a9b3bc;
   background-color: #212b36;
   border-color: #464e58;
   border-bottom-color: #4f5863;
   box-shadow: inset 0 -0.1rem 0 #4f5863;
-  color: #a9b3bc;
 }
 
 /* #endregion c-modal-hotkeys */
@@ -5823,32 +5823,32 @@ kbd {
 }
 
 .l-modal-celestial-quote {
-  position: fixed;
-  z-index: 3;
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  /* stylelint-disable-next-line unit-allowed-list */
-  left: 50vw;
-  /* stylelint-disable-next-line unit-allowed-list */
-  top: 50vh;
   width: 30rem;
   height: 30rem;
+  position: fixed;
+  /* stylelint-disable-next-line unit-allowed-list */
+  top: 50vh;
+  /* stylelint-disable-next-line unit-allowed-list */
+  left: 50vw;
+  z-index: 3;
+  justify-content: space-between;
+  align-items: center;
   transform: translate(-50%, -50%);
 }
 
 .c-modal-cestial-quote__symbol {
-  position: absolute;
   display: flex;
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0;
   justify-content: center;
   align-items: center;
-  left: 0;
   font-size: 25rem;
   opacity: 0.2;
   text-shadow: 0 0 2rem;
-  width: 100%;
-  height: 100%;
   pointer-events: none;
 }
 
@@ -5909,24 +5909,24 @@ kbd {
 
 .c-modal-celestial-quote__end {
   position: absolute;
+  bottom: 1.5rem;
+  left: calc(50% - 1rem);
   font-size: 150%;
   cursor: pointer;
-  left: calc(50% - 1rem);
-  bottom: 1.5rem;
 }
 
 .l-modal-celestial-quote__text {
   display: flex;
   flex-direction: column;
-  justify-content: center;
   height: 100%;
+  justify-content: center;
 }
 
 .l-modal-celestial-quote__buttons {
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
   height: 100%;
+  justify-content: space-between;
 }
 
 /* #endregion Modals */
@@ -5934,27 +5934,27 @@ kbd {
 .l-notification-container {
   display: flex;
   flex-direction: column-reverse;
-  align-items: flex-end;
   position: fixed;
   top: 0;
   right: 0;
+  z-index: 1000;
+  align-items: flex-end;
   margin-top: 0.5rem;
   margin-right: 1rem;
-  z-index: 1000;
 }
 
 /* #region o-notification */
 
 .o-notification {
-  padding: 0.8rem 1.5rem;
-  margin-top: 0.3rem;
+  white-space: nowrap;
+  font-family: Typewriter, serif;
+  font-size: 1.3rem;
+  font-weight: bold;
   color: black;
   background-color: white;
-  font-size: 1.3rem;
-  font-family: Typewriter, serif;
-  font-weight: bold;
-  white-space: nowrap;
   border: 0.1rem solid;
+  margin-top: 0.3rem;
+  padding: 0.8rem 1.5rem;
   cursor: pointer;
 }
 
@@ -6039,24 +6039,24 @@ kbd {
 .o-celestial-quote-history {
   display: flex;
   flex-direction: row;
-  align-items: stretch;
-  justify-content: space-evenly;
-  margin: 1rem 0;
   width: 70rem;
+  justify-content: space-evenly;
+  align-items: stretch;
+  margin: 1rem 0;
 }
 
 .l-celestial-quote-history__lines {
-  font-size: 1.9rem;
-  line-height: 2.4rem;
   display: flex;
+  flex-grow: 1;
   flex-direction: column;
   align-items: center;
-  flex-grow: 1;
+  font-size: 1.9rem;
+  line-height: 2.4rem;
 }
 
 .c-celestial-quote-history__line {
-  font-weight: bold;
   font-style: italic;
+  font-weight: bold;
 }
 
 .l-celestial-quote-history__buttons {
@@ -6104,20 +6104,20 @@ kbd {
 }
 
 .c-rm-store {
-  border: 0.1rem solid black;
-  height: 50rem;
   width: 13rem;
-  margin: auto;
+  height: 50rem;
   position: relative;
+  border: 0.1rem solid black;
   border-radius: var(--var-border-radius, 0.4rem);
+  margin: auto;
 }
 
 .c-rm-store-inner {
+  width: 100%;
   position: absolute;
-  background: var(--color-teresa--base);
   bottom: 0;
   left: 0;
-  width: 100%;
+  background: var(--color-teresa--base);
 }
 
 .c-rm-store-inner--light {
@@ -6125,26 +6125,26 @@ kbd {
 }
 
 .c-rm-store-label {
+  width: 100%;
   position: absolute;
   bottom: 0;
-  width: 100%;
-  color: black;
   font-weight: bold;
+  color: black;
 }
 
 .c-teresa-unlock-description {
-  color: var(--color-text);
-  position: absolute;
+  display: flex;
   width: 100%;
   height: 3rem;
-  display: flex;
+  position: absolute;
   align-items: center;
+  color: var(--color-text);
 }
 
 .c-teresa-milestone-line {
+  width: 100%;
   height: 0.2rem;
   background-color: var(--color-teresa--base);
-  width: 100%;
 }
 
 .c-teresa-milestone-line--attained {
@@ -6153,56 +6153,56 @@ kbd {
 
 .o-teresa-quotes {
   display: inline-block;
-  margin: 1.5rem;
   font-size: 1.9rem;
-  font-weight: bold;
   font-style: italic;
+  font-weight: bold;
+  margin: 1.5rem;
 }
 
 .o-quote-button {
+  font-size: 3rem;
+  font-weight: bold;
   background: transparent;
   border: none;
-  font-weight: bold;
-  font-size: 3rem;
   cursor: pointer;
 }
 
 .c-teresa-unlock {
   width: 20rem;
+  font-weight: bold;
+  color: var(--color-teresa--accent);
+  background-color: var(--color-teresa--base);
+  border: none;
   border-radius: var(--var-border-radius, 0.5rem);
-  padding: 1rem;
   margin: 0 10rem 1rem;
+  padding: 1rem;
   transition-duration: 0.15s;
   -webkit-user-select: none;
   user-select: none;
-  background-color: var(--color-teresa--base);
-  font-weight: bold;
-  border: none;
-  color: var(--color-teresa--accent);
 }
 
 .c-teresa-run-button {
-  color: var(--color-teresa--base);
-  border: var(--var-border-width, 0.2rem) solid var(--color-teresa--base);
-  background-color: var(--color-teresa--accent);
   font-weight: bold;
+  color: var(--color-teresa--base);
+  background-color: var(--color-teresa--accent);
+  border: var(--var-border-width, 0.2rem) solid var(--color-teresa--base);
 }
 
 .c-teresa-run-button__icon {
-  color: var(--color-teresa--base);
-  font-weight: bold;
-  font-size: 7rem;
-  text-shadow: 0.1rem 0.1rem 0.5rem;
-  cursor: pointer;
-  height: 12rem;
   width: 12rem;
-  border-radius: 50%;
-  background-color: var(--color-teresa--accent);
+  height: 12rem;
   align-items: center;
-  margin: 1.5rem auto;
+  font-size: 7rem;
+  font-weight: bold;
+  color: var(--color-teresa--base);
+  text-shadow: 0.1rem 0.1rem 0.5rem;
+  background-color: var(--color-teresa--accent);
   border: var(--var-border-width, 0.4rem) solid var(--color-teresa--base);
-  animation: a-teresa-run-button__icon--glow 3s infinite;
+  border-radius: 50%;
+  margin: 1.5rem auto;
   transition-duration: 0.2s;
+  animation: a-teresa-run-button__icon--glow 3s infinite;
+  cursor: pointer;
 }
 
 .c-teresa-run-button__icon:hover {
@@ -6258,20 +6258,20 @@ kbd {
   display: flex;
   flex-direction: column;
   width: 20rem;
-  margin-left: 18rem;
   margin-right: 2rem;
+  margin-left: 18rem;
 }
 
 .o-teresa-shop-button {
-  color: black;
-  background-color: var(--color-disabled);
-  padding: 1rem;
-  border: var(--var-border-width, 0.2rem) solid var(--color-teresa--base);
-  border-radius: var(--var-border-radius, 0.5rem);
-  margin-bottom: 1rem;
   font-family: Typewriter, serif;
   font-size: 1rem;
   font-weight: bold;
+  color: black;
+  background-color: var(--color-disabled);
+  border: var(--var-border-width, 0.2rem) solid var(--color-teresa--base);
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin-bottom: 1rem;
+  padding: 1rem;
   transition-duration: 0.15s;
 }
 
@@ -6292,10 +6292,10 @@ kbd {
 }
 
 .c-teresa-pour {
-  font-size: 2rem;
   width: 13rem;
-  padding: 0.5rem;
+  font-size: 2rem;
   margin-bottom: 1rem;
+  padding: 0.5rem;
 }
 
 .c-teresa-pour--unlock-available {
@@ -6313,8 +6313,8 @@ kbd {
 }
 
 .c-effarig-relics {
-  padding: 20px;
   font-size: 1.5rem;
+  padding: 20px;
 }
 
 /* #endregion Teresa tab */
@@ -6323,27 +6323,27 @@ kbd {
 
 .c-effarig-shop-button {
   display: flex;
-  align-items: center;
-  justify-content: center;
   flex-direction: column;
-  line-height: 1.5;
   width: 35rem;
-  padding: 1rem;
+  justify-content: center;
+  align-items: center;
   font-size: 2rem;
-  background: var(--color-disabled);
+  line-height: 1.5;
   color: black;
+  background: var(--color-disabled);
   border: none;
   border-radius: var(--var-border-radius, 0.5rem);
   margin: 1rem;
+  padding: 1rem;
   transition-duration: 0.2s;
 }
 
 .c-effarig-shop-button--bought {
-  background-color: var(--color-effarig--base);
   color: black;
-  cursor: default;
+  background-color: var(--color-effarig--base);
   border: var(--var-border-width, 0.2rem) solid black;
   box-shadow: 0.1rem 0.1rem 0.3rem rgba(0, 0, 0, 70%);
+  cursor: default;
 }
 
 .c-effarig-shop-button--available {
@@ -6354,42 +6354,42 @@ kbd {
 }
 
 .c-effarig-shop-button--available:hover {
-  background-color: black;
   color: var(--color-effarig--base);
+  background-color: black;
 }
 
 .l-effarig-run-button {
   display: flex;
-  align-items: center;
-  justify-content: center;
   flex-direction: column;
   width: 15rem;
   height: 15rem;
-  border-radius: 50%;
-  border-style: none;
   position: relative;
+  justify-content: center;
+  align-items: center;
+  border-style: none;
+  border-radius: 50%;
   margin: 2rem;
 }
 
 .c-effarig-run-button {
   font-size: 10rem;
   font-weight: bold;
+  transition-duration: 0.2s;
   -webkit-user-select: none;
   user-select: none;
   cursor: pointer;
-  transition-duration: 0.2s;
 }
 
 .c-effarig-run-button--not-running {
-  background-color: var(--color-effarig--base);
-  color: white;
   z-index: 0;
+  color: white;
+  background-color: var(--color-effarig--base);
   animation: a-effarig-run-button--not-running-glow 2s ease-in-out infinite alternate;
 }
 
 .c-effarig-run-button--not-running:hover {
-  background-color: black;
   color: var(--color-effarig--base);
+  background-color: black;
 }
 
 @keyframes a-effarig-run-button--not-running-glow {
@@ -6419,8 +6419,8 @@ kbd {
 }
 
 .c-effarig-run-button--running {
-  background: black;
   z-index: 0;
+  background: black;
   animation: a-effarig-run-button--running-glow 2s infinite alternate;
 }
 
@@ -6434,22 +6434,23 @@ kbd {
 }
 
 .c-effarig-run-button__inner--running {
-  background-image: url("../images/noise.png");
+  position: relative;
   -webkit-background-clip: text;
   background-clip: text;
-  -webkit-text-fill-color: rgba(255, 0, 0, 50%);
+  background-image: url("../images/noise.png");
   animation: a-effarig-run-button--running-noise 15s infinite alternate;
-  position: relative;
+
+  -webkit-text-fill-color: rgba(255, 0, 0, 50%);
 }
 
 .c-effarig-run-button__inner--running::after {
-  background: none;
   content: attr(button-symbol);
-  z-index: -1;
   position: absolute;
-  animation: a-effarig-run-button__inner--running-glow 2s infinite alternate;
-  left: 0;
   top: 0;
+  left: 0;
+  z-index: -1;
+  background: none;
+  animation: a-effarig-run-button__inner--running-glow 2s infinite alternate;
 }
 
 @keyframes a-effarig-run-button--running-noise {
@@ -6458,63 +6459,75 @@ kbd {
   }
 
   20% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: -50px 0;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   22% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
     background-position: 100px -10px;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
   }
 
   24% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 0 -150px;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   50% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: -50px 0;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   51% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
     background-position: 100px -10px;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
   }
 
   52% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 0 -150px;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   54% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 50px 0;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   56% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
     background-position: -100px 10px;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
   }
 
   58% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 0 50px;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   90% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 50px 50px;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   91% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
     background-position: 100px -110px;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 50%);
   }
 
   92% {
-    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
     background-position: 0 70px;
+
+    -webkit-text-fill-color: rgba(255, 0, 0, 100%);
   }
 
   100% {
@@ -6557,9 +6570,9 @@ kbd {
 }
 
 .l-effarig-run-button__bg {
-  position: absolute;
   width: 80%;
   height: 80%;
+  position: absolute;
 }
 
 .l-effarig-run-button__fg {
@@ -6581,9 +6594,9 @@ kbd {
 .l-effarig-run {
   display: inline-flex;
   flex-direction: column;
+  width: 520px;
   align-items: center;
   margin-left: 3rem;
-  width: 520px;
 }
 
 .c-effarig-run-description {
@@ -6594,14 +6607,14 @@ kbd {
 .l-effarig-tab__reward {
   display: flex;
   flex-direction: row;
-  align-items: left;
   width: 100%;
+  align-items: left;
   margin: 0.5rem;
 }
 
 .c-effarig-tab__reward-label {
-  padding-right: 1rem;
   font-weight: bold;
+  padding-right: 1rem;
 }
 
 .c-effarig-tab__reward-symbol {
@@ -6662,32 +6675,32 @@ kbd {
 .l-enslaved-top-container__half {
   display: flex;
   flex-direction: column;
-  align-items: stretch;
   width: 24rem;
+  align-items: stretch;
   margin: 1rem;
 }
 
 .o-enslaved-stored-time,
 .o-enslaved-gained-infinities {
-  font-size: 1.6rem;
   min-width: 18rem;
+  font-size: 1.6rem;
   padding-bottom: 0.5rem;
 }
 
 .o-enslaved-mechanic-button {
-  padding: 0.5rem;
-  border-radius: var(--var-border-radius, 0.5rem);
-  border: var(--var-border-width, 0.2rem) solid sandybrown;
-  box-shadow: 0 0 2rem inset rgba(244, 164, 96, 50%);
-  background-color: #fdd3b0;
-  cursor: pointer;
-  margin: 1rem 0.5rem;
   min-width: 18rem;
   min-height: 7rem;
-  padding-bottom: 1rem;
-  padding-top: 1rem;
   font-family: Typewriter;
+  background-color: #fdd3b0;
+  border: var(--var-border-width, 0.2rem) solid sandybrown;
+  border-radius: var(--var-border-radius, 0.5rem);
+  box-shadow: 0 0 2rem inset rgba(244, 164, 96, 50%);
+  margin: 1rem 0.5rem;
+  padding: 0.5rem;
+  padding-top: 1rem;
+  padding-bottom: 1rem;
   transition-duration: 0.2s;
+  cursor: pointer;
 }
 
 .o-enslaved-mechanic-button:hover {
@@ -6702,24 +6715,24 @@ kbd {
 .l-enslaved-shop-container {
   display: flex;
   flex-wrap: wrap;
-  justify-content: center;
   width: 65rem;
+  justify-content: center;
   margin: auto;
   margin-top: 2rem;
   margin-bottom: 2rem;
 }
 
 .o-enslaved-shop-button {
+  width: 30rem;
+  height: 12rem;
+  font-family: Typewriter;
   color: var(--color-text-inverted);
-  padding: 1.7rem;
   background-color: var(--color-disabled);
   border: var(--var-border-width, 0.2rem) solid var(--color-bad);
   border-radius: var(--var-border-radius, 0.5rem);
   margin: 1rem;
+  padding: 1.7rem;
   transition-duration: 0.2s;
-  width: 30rem;
-  height: 12rem;
-  font-family: Typewriter;
 }
 
 .o-enslaved-shop-button--available {
@@ -6744,45 +6757,45 @@ kbd {
 }
 
 .c-enslaved-run-button {
-  width: 40rem;
-  padding: 2rem;
-  border-radius: var(--var-border-radius, 0.5rem);
-  border: var(--var-border-width, 0.2rem) solid #cd945c;
-  background: none;
-  font-family: Typewriter;
-  font-size: 1.2rem;
-  margin-bottom: 1rem;
-  margin-top: 1rem;
   display: flex;
   flex-direction: column;
+  width: 40rem;
   align-items: center;
+  font-family: Typewriter;
+  font-size: 1.2rem;
+  background: none;
+  border: var(--var-border-width, 0.2rem) solid #cd945c;
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin-top: 1rem;
+  margin-bottom: 1rem;
+  padding: 2rem;
   -webkit-user-select: none;
   user-select: none;
 }
 
 .c-enslaved-run-button__title {
-  font-weight: bold;
   font-size: larger;
+  font-weight: bold;
   margin-bottom: 0.5rem;
 }
 
 .c-enslaved-run-button__icon {
-  border-radius: 50%;
-  background: black;
+  display: flex;
+  overflow: hidden;
+  flex-direction: column;
   width: 16rem;
   height: 16rem;
-  margin: 1.5rem;
-  color: var(--color-enslaved--base);
-  cursor: pointer;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
   position: relative;
-  overflow: hidden;
+  justify-content: center;
+  align-items: center;
+  color: var(--color-enslaved--base);
+  background: black;
   border: var(--var-border-width, 0.4rem) solid var(--color-enslaved--base);
+  border-radius: 50%;
+  margin: 1.5rem;
   transition-duration: 0.2s;
   animation: a-enslaved-run-button--spin 120s infinite linear;
+  cursor: pointer;
 }
 
 .c-enslaved-run-button__icon:hover {
@@ -6801,6 +6814,7 @@ kbd {
 }
 
 .c-enslaved-run-button__icon__glitch {
+  width: 0.1rem;
   position: absolute;
   background-image:
     linear-gradient(
@@ -6810,7 +6824,6 @@ kbd {
       rgba(0, 0, 0, 0%) 100%
     );
   border: none;
-  width: 0.1rem;
 }
 
 .c-enslaved-run-button__icon:hover .c-enslaved-run-button__icon__glitch {
@@ -6818,8 +6831,8 @@ kbd {
 }
 
 .o-enslaved-release-header-button {
-  font-size: 1rem;
   width: 20rem;
+  font-size: 1rem;
 }
 
 @keyframes a-enslaved-run-button--spin {
@@ -6829,13 +6842,13 @@ kbd {
 
 .c-enslaved-hint-modal {
   display: flex;
-  flex-direction: column;
   overflow-y: scroll;
-  padding: 0.25rem 1rem;
+  flex-direction: column;
   width: 60rem;
   height: 57rem;
-  font-size: 1.2rem;
   text-align: left;
+  font-size: 1.2rem;
+  padding: 0.25rem 1rem;
 }
 
 .c-enslaved-hint-modal::-webkit-scrollbar {
@@ -6862,24 +6875,24 @@ kbd {
 
 .l-v-unlocks-container {
   display: flex;
+  overflow: hidden;
   flex-wrap: wrap;
-  justify-content: center;
   width: 97.5rem;
+  justify-content: center;
+  box-sizing: border-box;
   margin: auto;
   margin-top: 1rem;
   margin-bottom: 1rem;
-  box-sizing: border-box;
-  overflow: hidden;
 }
 
 .l-v-unlocks-container li {
-  position: relative;
-  width: 27rem;
-  padding: 0 0 31.2rem;
-  list-style-type: none;
-  transform: rotate(-60deg) skewY(30deg);
-  overflow: hidden;
   visibility: visible;
+  overflow: hidden;
+  list-style-type: none;
+  width: 27rem;
+  position: relative;
+  padding: 0 0 31.2rem;
+  transform: rotate(-60deg) skewY(30deg);
 }
 
 /* required for hex structure */
@@ -6910,8 +6923,8 @@ kbd {
 }
 
 .o-v-unlock-name {
-  font-weight: bold;
   font-size: 1.8rem;
+  font-weight: bold;
 }
 
 .o-v-unlock-desc {
@@ -6919,8 +6932,8 @@ kbd {
 }
 
 .o-v-unlock-amount {
-  font-weight: bold;
   font-size: 1.3rem;
+  font-weight: bold;
 }
 
 .l-v-milestones-grid {
@@ -6938,35 +6951,35 @@ kbd {
 
 .c-v-unlock-bar {
   width: 40rem;
-  padding: 0.6rem;
-  margin-bottom: 1rem;
-  border-radius: var(--var-border-radius, 0.5rem);
-  border: var(--var-border-width, 0.2rem) solid;
   position: relative;
   z-index: 0;
+  border: var(--var-border-width, 0.2rem) solid;
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin-bottom: 1rem;
+  padding: 0.6rem;
 }
 
 .c-v-unlock-bar__progress {
+  height: 100%;
   position: absolute;
   top: 0;
   left: 0;
-  height: 100%;
   z-index: -1;
 }
 
 .o-v-milestone {
-  color: black;
-  background: #6b5f2e;
-  width: 25rem;
-  height: 10rem;
-  padding: 1rem;
-  border: var(--var-border-width, 0.2rem) solid #473f1f;
-  margin: 0 0.5rem;
-  border-radius: var(--var-border-radius, 0.5rem);
-  font-size: 1.2rem;
   display: flex;
   flex-direction: column;
+  width: 25rem;
+  height: 10rem;
   justify-content: space-around;
+  font-size: 1.2rem;
+  color: black;
+  background: #6b5f2e;
+  border: var(--var-border-width, 0.2rem) solid #473f1f;
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin: 0 0.5rem;
+  padding: 1rem;
   -webkit-user-select: none;
   user-select: none;
 }
@@ -6981,39 +6994,39 @@ kbd {
 }
 
 .l-v-hexagon {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
   position: absolute;
   top: 0;
   left: 0;
-  height: 100%;
-  width: 100%;
-  transform: skewY(-30deg) rotate(60deg);
-  display: flex;
   justify-content: center;
   align-items: center;
-  flex-direction: column;
+  transform: skewY(-30deg) rotate(60deg);
 }
 
 .l-v-reduction {
   width: 3rem;
   height: 3rem;
-  border-radius: var(--var-border-radius, 50%);
   font-size: 1.5rem;
+  border-radius: var(--var-border-radius, 50%);
   padding: 0;
 }
 
 .c-v-info-text {
-  color: var(--color-text);
   font-size: 1.2rem;
+  color: var(--color-text);
 }
 
 .c-v-run-button {
-  color: black;
-  background: var(--color-v--base);
   font-family: Typewriter;
   font-size: 1.3rem;
-  cursor: pointer;
+  color: black;
+  background: var(--color-v--base);
   padding: 0.5rem;
   transition-duration: 0.2s;
+  cursor: pointer;
 }
 
 .c-v-run-button:hover,
@@ -7025,8 +7038,8 @@ kbd {
   width: 12rem;
   height: 2.4rem;
   position: absolute;
-  background: #e3c759;
   z-index: -1;
+  background: #e3c759;
   transition-duration: 0.2s;
 }
 
@@ -7149,10 +7162,10 @@ kbd {
 
 .c-ra-pet-header {
   width: 35rem;
-  padding: 1rem;
-  margin: 2rem auto;
   background: linear-gradient(#2f2f2f, #464646);
   border-radius: var(--var-border-radius, 1.5rem);
+  margin: 2rem auto;
+  padding: 1rem;
 }
 
 .s-base--metro .c-ra-pet-header {
@@ -7165,20 +7178,20 @@ kbd {
 
 .l-ra-bar-container {
   display: flex;
-  margin: 0 0 2rem;
   width: 100%;
   height: 4rem;
+  margin: 0 0 2rem;
   margin-top: 1rem;
   margin-left: -0.2rem;
 }
 
 .l-ra-lvl-chevron {
+  height: 1.75rem;
   position: absolute;
   top: 0;
-  font-size: 1.2rem;
   z-index: 2;
+  font-size: 1.2rem;
   color: white;
-  height: 1.75rem;
   border-left: 0.1rem solid white;
   padding: 0 0.2rem;
   -webkit-user-select: none;
@@ -7191,44 +7204,44 @@ kbd {
 }
 
 .c-important-chevron {
-  font-weight: bold;
-  font-size: 1.5rem;
   height: 4.6rem;
-  border-left-width: var(--var-border-width, 0.2rem);
+  z-index: 3;
+  font-size: 1.5rem;
+  font-weight: bold;
   text-shadow:
     0.1rem 0.1rem 0.1rem black,
     -0.1rem 0.1rem 0.1rem black,
     0.1rem -0.1rem 0.1rem black,
     -0.1rem -0.1rem 0.1rem black,
     0.1rem -0.1rem 0 black;
-  z-index: 3;
+  border-left-width: var(--var-border-width, 0.2rem);
 }
 
 .o-ra-unlock-hover-text {
-  background-color: black;
-  color: #ffffff;
-  text-align: center;
-  border-radius: var(--var-border-radius, 5px);
-  position: absolute;
-  z-index: 3;
-  font-size: 1rem;
-  left: -6.25rem;
-  bottom: 6rem;
+  display: flex;
   width: 12.5rem;
   height: fit-content;
-  display: flex;
-  padding: 1rem;
+  position: absolute;
+  bottom: 6rem;
+  left: -6.25rem;
+  z-index: 3;
   justify-content: center;
+  text-align: center;
+  font-size: 1rem;
+  color: #ffffff;
+  background-color: black;
+  border-radius: var(--var-border-radius, 5px);
+  padding: 1rem;
 }
 
 .c-ra-exp-bar {
+  width: 100%;
+  height: 5rem;
   position: relative;
+  z-index: 1;
   border: var(--var-border-width, 0.2rem) solid black;
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  width: 100%;
-  height: 5rem;
-  z-index: 1;
 }
 
 .s-base--metro .c-ra-exp-bar {
@@ -7242,10 +7255,10 @@ kbd {
 
 .c-ra-upgrade-bar {
   display: flex;
+  width: 5rem;
+  height: 2.6rem;
   justify-content: flex-end;
   border: var(--var-border-width, 0.2rem) solid black;
-  height: 2.6rem;
-  width: 5rem;
 }
 
 .s-base--metro .c-ra-upgrade-bar {
@@ -7272,19 +7285,19 @@ kbd {
 
 .c-ra-upgrade-icon {
   display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 2.3rem;
-  box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 70%);
   width: 4rem;
   height: 4rem;
+  position: relative;
+  justify-content: center;
+  align-items: center;
+  font-size: 2.3rem;
   background: #222222;
-  border-radius: var(--var-border-radius, 50%);
   border: 0.1rem solid #111111;
+  border-radius: var(--var-border-radius, 50%);
+  box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 70%);
   margin: 0 0.3rem;
   -webkit-user-select: none;
   user-select: none;
-  position: relative;
 }
 
 .s-base--metro .c-ra-upgrade-icon {
@@ -7303,35 +7316,35 @@ kbd {
 .c-ra-run-button {
   display: flex;
   flex-direction: column;
-  align-items: center;
-  justify-content: center;
+  width: 30rem;
   height: 33rem;
+  justify-content: center;
+  align-items: center;
+  font-family: Typewriter;
   color: #9575cd;
   background: black;
   border: var(--var-border-width, 0.2rem) solid #9575cd;
   border-radius: var(--var-border-radius, 2rem);
-  width: 30rem;
   margin: 2rem;
   padding: 1rem;
-  font-family: Typewriter;
 }
 
 .c-ra-run-button__icon {
   display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #9575cd;
-  font-size: 3rem;
-  text-shadow: 0 0 1rem;
-  cursor: pointer;
-  height: 12rem;
   width: 12rem;
-  border-radius: 50%;
+  height: 12rem;
+  justify-content: center;
+  align-items: center;
+  font-size: 3rem;
+  color: #9575cd;
+  text-shadow: 0 0 1rem;
   background-color: black;
-  margin: 1.5rem 0;
   border: var(--var-border-width, 0.4rem) solid #9575cd;
+  border-radius: 50%;
   box-shadow: 0 0 0.7rem #9575cd, 0 0 0.7rem #9575cd inset;
+  margin: 1.5rem 0;
   transition-duration: 0.2s;
+  cursor: pointer;
 }
 
 .c-ra-run-button__icon:hover {
@@ -7368,11 +7381,11 @@ kbd {
 }
 
 .c-ra-rewards {
-  font-size: 1.5rem;
-  margin: 1rem;
   display: flex;
   flex-direction: row;
   justify-content: center;
+  font-size: 1.5rem;
+  margin: 1rem;
 }
 
 .c-ra-rewards-inner {
@@ -7382,13 +7395,13 @@ kbd {
 .c-ra-recollection-unlock {
   display: flex;
   flex-direction: column;
+  width: 30rem;
+  height: 25rem;
   justify-content: center;
   align-items: center;
-  height: 25rem;
   color: white;
   background: linear-gradient(#333333, #464646);
   border-radius: var(--var-border-radius, 2rem);
-  width: 30rem;
   margin: 2rem;
   padding: 1rem;
 }
@@ -7405,14 +7418,14 @@ kbd {
 }
 
 .c-ra-pet-recollection-button {
-  font-size: 1.2rem;
-  text-align: center;
-  font-family: Typewriter;
   width: 10rem;
   height: 6rem;
-  margin: 0.2rem;
-  border-radius: var(--var-border-radius, 1rem);
+  text-align: center;
+  font-family: Typewriter;
+  font-size: 1.2rem;
   border: 0.1rem solid #222222;
+  border-radius: var(--var-border-radius, 1rem);
+  margin: 0.2rem;
   -webkit-user-select: none;
   user-select: none;
 }
@@ -7424,15 +7437,15 @@ kbd {
 .c-ra-laitela-unlock {
   display: flex;
   flex-direction: column;
+  width: 30rem;
+  height: 33rem;
   justify-content: center;
   align-items: center;
   font-family: Typewriter;
   color: black;
-  height: 33rem;
-  width: 30rem;
+  border-radius: var(--var-border-radius, 2rem);
   margin: 2rem;
   padding: 1rem;
-  border-radius: var(--var-border-radius, 2rem);
   animation: a-ra-color-shift 10s infinite;
 }
 
@@ -7451,41 +7464,41 @@ kbd {
 .l-ra-all-pets-container {
   display: flex;
   flex-wrap: wrap;
+  width: 80rem;
+  height: 100%;
   justify-content: center;
   align-items: center;
   margin: auto;
-  width: 80rem;
-  height: 100%;
 }
 
 .l-ra-unlock {
-  position: relative;
+  display: flex;
+  flex-direction: column;
+  width: 15%;
   height: 10rem;
+  position: relative;
   top: -10rem;
   left: 82.5%;
-  border: var(--var-border-width, 0.2rem) solid gainsboro;
-  background: #35d035;
-  width: 15%;
-  border-radius: var(--var-border-radius, 0.5rem);
-  flex-direction: column;
-  display: flex;
   justify-content: center;
+  background: #35d035;
+  border: var(--var-border-width, 0.2rem) solid gainsboro;
+  border-radius: var(--var-border-radius, 0.5rem);
 }
 
 .l-ra-unlock-inner {
+  display: flex;
+  flex: 1 0;
+  flex-direction: column;
+  justify-content: center;
   color: black;
   margin: auto 0.5rem;
-  display: flex;
-  flex-direction: column;
-  flex: 1 0;
-  justify-content: center;
 }
 
 .l-ra-alchemy-tab {
   display: flex;
   flex-direction: column;
-  align-items: center;
   position: relative;
+  align-items: center;
 }
 
 .l-ra-pet-upgrade-container {
@@ -7499,18 +7512,18 @@ kbd {
 
 .c-ra-pet-upgrade {
   display: flex;
+  width: 2.5rem;
+  height: 2.6rem;
+  position: relative;
   justify-content: center;
   align-items: center;
-  height: 2.6rem;
-  width: 2.5rem;
-  background: grey;
+  font-size: 1.3rem;
   color: black;
+  background: grey;
   border: var(--var-border-width, 0.2rem) solid black;
   border-right: 0;
   border-radius: var(--var-border-radius, 1rem);
-  font-size: 1.3rem;
   transition-duration: 0.2s;
-  position: relative;
 }
 
 .s-base--metro .c-ra-pet-upgrade {
@@ -7533,46 +7546,46 @@ kbd {
 }
 
 .c-ra-pet-upgrade__tooltip {
-  opacity: 0;
-  transition-duration: 0.3s;
-  font-size: 1.4rem;
-  border: 0.1rem solid black;
-  border-radius: var(--var-border-radius, 0.8rem);
-  color: white;
-  background: #222222;
   width: 24rem;
-  margin-left: 0;
-  padding: 0.4rem;
-  z-index: 2;
-  pointer-events: none;
   position: absolute;
   bottom: 100%;
+  z-index: 2;
+  font-size: 1.4rem;
+  opacity: 0;
+  color: white;
+  background: #222222;
+  border: 0.1rem solid black;
+  border-radius: var(--var-border-radius, 0.8rem);
   box-shadow: 0.1rem 0.1rem 0.1rem rgba(0, 0, 0, 70%);
+  margin-left: 0;
+  padding: 0.4rem;
+  transition-duration: 0.3s;
+  pointer-events: none;
 }
 
 .c-ra-pet-upgrade__tooltip::after {
+  content: " ";
+  width: 0;
   position: absolute;
   bottom: 0;
   left: 50%;
-  margin-left: -0.7rem;
-  margin-bottom: 0;
-  width: 0;
+  z-index: 0;
   border-top: 0 solid black;
   border-right: var(--var-border-width, 0.7rem) solid transparent;
   border-left: var(--var-border-width, 0.7rem) solid transparent;
-  content: " ";
+  margin-bottom: 0;
+  margin-left: -0.7rem;
   transition-duration: 0.3s;
-  z-index: 0;
 }
 
 .c-ra-pet-upgrade:hover .c-ra-pet-upgrade__tooltip {
-  opacity: 1;
   bottom: calc(100% + 0.8rem);
+  opacity: 1;
 }
 
 .s-base--metro .c-ra-pet-upgrade:hover .c-ra-pet-upgrade__tooltip {
-  opacity: 1;
   bottom: calc(100% + 0.7rem);
+  opacity: 1;
 }
 
 .c-ra-pet-upgrade:hover .c-ra-pet-upgrade__tooltip::after {
@@ -7581,13 +7594,13 @@ kbd {
 }
 
 .c-ra-level-up-btn:hover .c-ra-pet-upgrade__tooltip {
-  opacity: 1;
   bottom: calc(100% + 0.8rem);
+  opacity: 1;
 }
 
 .s-base--metro .c-ra-level-up-btn:hover .c-ra-pet-upgrade__tooltip {
-  opacity: 1;
   bottom: calc(100% + 0.7rem);
+  opacity: 1;
 }
 
 .c-ra-level-up-btn:hover .c-ra-pet-upgrade__tooltip::after {
@@ -7596,8 +7609,8 @@ kbd {
 }
 
 .c-ra-upgrade-icon:hover .c-ra-pet-upgrade__tooltip {
-  opacity: 1;
   bottom: calc(100% + 0.7rem);
+  opacity: 1;
 }
 
 .c-ra-upgrade-icon:hover .c-ra-pet-upgrade__tooltip::after {
@@ -7645,20 +7658,20 @@ kbd {
 
 .c-ra-level-up-btn {
   display: flex;
+  width: 3rem;
+  height: 5rem;
+  position: relative;
   justify-content: center;
   align-items: center;
-  height: 5rem;
-  width: 3rem;
-  background: grey;
+  font-size: 2rem;
   color: black;
+  background: grey;
   border: var(--var-border-width, 0.2rem) solid black;
   border-left: none;
   border-radius: var(--var-border-radius, 1rem);
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
-  font-size: 2rem;
   transition-duration: 0.2s;
-  position: relative;
 }
 
 .s-base--metro .c-ra-level-up-btn {
@@ -7666,8 +7679,8 @@ kbd {
 }
 
 .c-ra-pet-btn--available {
-  cursor: pointer;
   background: #222222;
+  cursor: pointer;
 }
 
 .c-ra-pet-btn--available:hover {
@@ -7715,30 +7728,30 @@ kbd {
 }
 
 .c-ra-pet-btn--available__capped {
-  cursor: default;
   color: black;
+  cursor: default;
 }
 
 .l-ra-pet-middle-container {
   display: flex;
-  align-items: center;
-  justify-content: center;
-  margin: 1.5rem 0;
   height: 4rem;
+  justify-content: center;
+  align-items: center;
+  margin: 1.5rem 0;
   padding: 0 1rem;
 }
 
 .c-alchemy-resource-info {
   display: flex;
   flex-direction: column;
-  justify-content: center;
-  text-align: center;
-  border: 0.1rem solid black;
-  padding: 0.25rem 1rem;
   width: 60rem;
   height: 10rem;
+  justify-content: center;
+  text-align: center;
   font-size: 1.2rem;
+  border: 0.1rem solid black;
   margin-top: 0.5rem;
+  padding: 0.25rem 1rem;
 }
 
 .c-alchemy-resource-info--locked {
@@ -7754,25 +7767,25 @@ kbd {
 .c-reality-glyph-creation {
   display: flex;
   flex-direction: column;
-  padding: 0.25rem 1rem;
   width: 60rem;
-  font-size: 1.2rem;
   text-align: left;
+  font-size: 1.2rem;
+  padding: 0.25rem 1rem;
 }
 
 .l-alchemy-orbit-canvas {
-  position: absolute;
   overflow: visible;
   width: 100%;
   height: 100%;
+  position: absolute;
   left: 0;
 }
 
 .l-alchemy-arrow-canvas {
-  position: absolute;
   overflow: visible;
   width: 100%;
   height: 100%;
+  position: absolute;
   left: 0;
 }
 
@@ -7846,35 +7859,35 @@ kbd {
 }
 
 .o-alchemy-node {
-  color: black;
-  position: absolute;
   width: 3rem;
   height: 3rem;
-  margin-left: -1.5rem;
-  margin-top: -1.5rem;
-  -webkit-user-select: none;
-  user-select: none;
+  position: absolute;
+  z-index: 1;
   font-size: 2rem;
+  line-height: 1.9rem;
+  color: black;
+  background-color: white;
   border: 0.1rem solid black;
   border-radius: var(--var-border-radius, 50%);
-  background-color: white;
+  margin-top: -1.5rem;
+  margin-left: -1.5rem;
   transition: all 0.2s, z-index 0s;
-  z-index: 1;
-  line-height: 1.9rem;
+  -webkit-user-select: none;
+  user-select: none;
 }
 
 .o-alchemy-node-mask {
-  position: absolute;
   width: 2.4rem;
   height: 2.4rem;
-  left: 50%;
+  position: absolute;
   top: 50%;
-  margin-left: -1.2rem;
-  margin-top: -1.2rem;
+  left: 50%;
+  z-index: 4;
   background-color: #bbbbbb;
   border: 0.1rem solid black;
   border-radius: var(--var-border-radius, 50%);
-  z-index: 4;
+  margin-top: -1.2rem;
+  margin-left: -1.2rem;
 }
 
 .o-alchemy-resource-arc-wrapper {
@@ -7893,36 +7906,36 @@ kbd {
 }
 
 .o-alchemy-resource-arc-spinner {
-  border-radius: var(--var-border-radius, 1.4rem 0 0 1.4rem);
   z-index: 2;
+  border-radius: var(--var-border-radius, 1.4rem 0 0 1.4rem);
   transform-origin: 100% 50%;
 }
 
 .o-alchemy-resource-arc-filler {
-  border-radius: var(--var-border-radius, 0 1.4rem 1.4rem 0);
-  z-index: 1;
   left: 50%;
+  z-index: 1;
   opacity: 0;
+  border-radius: var(--var-border-radius, 0 1.4rem 1.4rem 0);
 }
 
 .o-alchemy-resource-arc-mask {
   width: 50%;
   height: 100%;
-  border-radius: var(--var-border-radius, 1.4rem 0 0 1.4rem);
   position: absolute;
   z-index: 3;
   opacity: 1;
   background: inherit;
+  border-radius: var(--var-border-radius, 1.4rem 0 0 1.4rem);
 }
 
 .o-alchemy-node--unfocused {
-  opacity: 0.5;
   z-index: 4;
+  opacity: 0.5;
 }
 
 .o-alchemy-node--locked {
-  opacity: 0.25;
   z-index: 4;
+  opacity: 0.25;
 }
 
 .o-alchemy-node--base {
@@ -7948,19 +7961,19 @@ kbd {
 }
 
 .o-ra-teresa-switch {
-  border: var(--var-border-width, 0.2rem) solid #292929;
-  width: 5rem;
-  margin-left: -0.2rem;
-  height: 2rem;
   display: flex;
+  width: 5rem;
+  height: 2rem;
   justify-content: center;
   align-items: center;
-  font-weight: bold;
   font-size: 1.1rem;
-  cursor: pointer;
+  font-weight: bold;
   color: black;
+  border: var(--var-border-width, 0.2rem) solid #292929;
+  margin-left: -0.2rem;
   -webkit-user-select: none;
   user-select: none;
+  cursor: pointer;
 }
 
 .o-ra-teresa-switch-active {
@@ -7991,15 +8004,15 @@ kbd {
 
 .o-laitela-run-button {
   width: 22rem;
-  padding: 2rem;
-  border-radius: var(--var-border-radius, 0.5rem);
-  color: var(--color-laitela--accent);
-  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
-  background: var(--color-laitela--base);
+  height: 84rem;
   font-family: Typewriter;
   font-size: 1.2rem;
-  height: 84rem;
+  color: var(--color-laitela--accent);
+  background: var(--color-laitela--base);
+  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
+  border-radius: var(--var-border-radius, 0.5rem);
   margin-right: 1rem;
+  padding: 2rem;
 }
 
 .o-laitela-run-button--large {
@@ -8014,15 +8027,15 @@ kbd {
 .c-dark-matter-dimension-container {
   display: flex;
   flex-direction: column;
-  color: var(--color-laitela--accent);
-  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
-  background: var(--color-laitela--base);
   width: 50rem;
-  margin: auto;
-  padding: 0.5rem;
-  border-radius: var(--var-border-radius, 0.5rem);
-  margin-bottom: 1rem;
   height: 15rem;
+  color: var(--color-laitela--accent);
+  background: var(--color-laitela--base);
+  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin: auto;
+  margin-bottom: 1rem;
+  padding: 0.5rem;
 }
 
 .o-dark-matter-dimension-amount {
@@ -8033,30 +8046,30 @@ kbd {
 .c-dark-matter-dimension-buttons {
   display: flex;
   flex-direction: row;
-  justify-content: space-between;
   width: 47.5rem;
   height: 6rem;
+  justify-content: space-between;
 }
 
 .o-dark-matter-dimension-button {
   width: 15rem;
   height: 5rem;
-  margin-bottom: 1rem;
   font-family: Typewriter;
   color: var(--color-laitela--accent);
   background: var(--color-laitela--base);
   border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
   border-radius: var(--var-border-radius, 0.5rem);
+  margin-bottom: 1rem;
   transition-duration: 0.15s;
 }
 
 .o-dark-matter-dimension-button--available {
+  font-weight: bold;
   color: var(--color-laitela--base);
   background: var(--color-laitela--accent);
   border-color: var(--color-laitela--accent);
   box-shadow: 0 0 0.5rem 0.1rem inset, 0 0 0.3rem 0;
   cursor: pointer;
-  font-weight: bold;
 }
 
 .o-dark-matter-dimension-button--available:hover {
@@ -8066,13 +8079,13 @@ kbd {
 }
 
 .o-dark-matter-dimension-button--ascend {
+  font-weight: bold;
   color: var(--color-laitela--base);
   background: var(--color-laitela--accent);
   border-color: var(--color-laitela--accent);
   box-shadow: 0 0 0.5rem 0.1rem inset, 0 0 0.3rem 0;
-  cursor: pointer;
-  font-weight: bold;
   animation: 3s a-laitela-flash infinite;
+  cursor: pointer;
 }
 
 .o-dark-matter-dimension-button--accent {
@@ -8121,49 +8134,49 @@ kbd {
 
 .l-laitela-mechanics-container {
   display: flex;
-  align-items: flex-start;
   justify-content: center;
+  align-items: flex-start;
 }
 
 .c-laitela-milestone {
   display: flex;
   flex-direction: column;
-  justify-content: center;
-  height: 16%;
   width: 22rem;
-  background: var(--color-laitela--base);
-  padding: 0.6rem;
-  margin: 1rem 0 0;
-  border-radius: var(--var-border-radius, 0.5rem);
-  border: 0.1rem solid;
+  height: 16%;
   position: relative;
   z-index: 0;
+  justify-content: center;
   color: var(--color-laitela--accent);
+  background: var(--color-laitela--base);
+  border: 0.1rem solid;
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin: 1rem 0 0;
+  padding: 0.6rem;
 }
 
 .c-laitela-milestone > span {
-  height: 100%;
   display: flex;
   flex-direction: column;
+  height: 100%;
   justify-content: space-around;
 }
 
 .c-laitela-milestone__progress {
+  height: 100%;
   position: absolute;
   top: 0;
   left: 0;
-  height: 100%;
   z-index: -1;
 }
 
 .c-laitela-milestone--bar-border-fix {
-  position: absolute;
-  height: calc(100% + 0.2rem);
   width: calc(100% + 0.2rem);
-  border-radius: var(--var-border-radius, 0.5rem);
-  border: var(--var-border-width, 0.2rem) solid;
+  height: calc(100% + 0.2rem);
+  position: absolute;
   z-index: 1;
   color: var(--color-laitela--accent);
+  border: var(--var-border-width, 0.2rem) solid;
+  border-radius: var(--var-border-radius, 0.5rem);
   margin: -0.7rem;
 }
 
@@ -8172,54 +8185,54 @@ kbd {
 }
 
 .c-laitela-milestone-mask {
+  z-index: 0;
   background-color: white;
   mix-blend-mode: difference;
-  z-index: 0;
 }
 
 .c-laitela-milestone--completed {
-  filter: brightness(10%);
-  left: 1.5rem;
-  top: -1.5rem;
-  height: 21.8rem;
   width: 18.8rem;
-  transform: rotate(90deg);
+  height: 21.8rem;
+  top: -1.5rem;
+  left: 1.5rem;
+  background-color: transparent;
   background-image: url("../images/laitela-icon.svg");
   background-position: center;
   background-repeat: repeat-y;
-  background-color: transparent;
+  transform: rotate(90deg);
+  filter: brightness(10%);
 }
 
 .c-laitela-singularity-container {
-  color: var(--color-laitela--accent);
-  background: var(--color-laitela--base);
-  width: 96rem;
-  margin: auto;
-  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
-  border-radius: var(--var-border-radius, 0.5rem);
-  margin-bottom: 1rem;
   display: flex;
+  width: 96rem;
   justify-content: space-around;
   align-items: center;
-  padding: 1rem;
+  color: var(--color-laitela--accent);
+  background: var(--color-laitela--base);
+  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin: auto;
   margin-top: 1rem;
+  margin-bottom: 1rem;
+  padding: 1rem;
 }
 
 .c-laitela-singularity {
-  color: white;
-  background: black;
-  padding: 2rem;
   width: 40rem;
   height: 11rem;
+  color: white;
+  background: black;
   border: var(--var-border-width, 0.2rem) solid white;
   border-radius: var(--var-border-radius, 0.5rem);
+  padding: 2rem;
   transition-duration: 0.15s;
 }
 
 .c-laitela-singularity h2 {
-  margin: 0;
   font-family: Typewriter;
   font-size: 1.5rem;
+  margin: 0;
 }
 
 .c-laitela-singularity--active {
@@ -8233,16 +8246,16 @@ kbd {
 }
 
 .c-laitela-singularity__cap-control {
-  color: var(--color-laitela--accent);
-  background: var(--color-laitela--base);
-  padding: 1rem;
   width: 20rem;
-  margin-bottom: 1rem;
-  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
-  border-radius: var(--var-border-radius, 0.5rem);
   font-family: Typewriter;
   font-size: 1.1rem;
   font-weight: bold;
+  color: var(--color-laitela--accent);
+  background: var(--color-laitela--base);
+  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin-bottom: 1rem;
+  padding: 1rem;
   transition-duration: 0.15s;
 }
 
@@ -8260,9 +8273,9 @@ kbd {
 }
 
 .l-singularity-milestone-modal-container-outer {
-  height: 50rem;
-  overflow-y: scroll;
   overflow-x: hidden;
+  overflow-y: scroll;
+  height: 50rem;
 }
 
 .l-singularity-milestone-modal-container-outer::-webkit-scrollbar {
@@ -8280,8 +8293,8 @@ kbd {
 .l-singularity-milestone-modal-container-inner {
   display: flex;
   flex-wrap: wrap;
-  height: 120rem;
   width: 93rem;
+  height: 120rem;
   justify-content: space-evenly;
   padding-bottom: 2rem;
 }
@@ -8291,28 +8304,28 @@ kbd {
 }
 
 .l-singularity-milestone-sort-container {
-  position: relative;
-  left: -0.5rem;
   display: flex;
   flex-direction: row;
-  margin-top: 0.5rem;
+  position: relative;
+  left: -0.5rem;
   border: 0.1rem solid var(--color-laitela--accent);
+  margin-top: 0.5rem;
   padding: 1rem 0.5rem;
 }
 
 .c-singularity-milestone-modal-sort-button {
-  height: 6rem;
   width: 22rem;
+  height: 6rem;
   font-family: Typewriter, serif;
-  font-weight: bold;
   font-size: 1.3rem;
+  font-weight: bold;
   color: var(--color-laitela--accent);
   background-color: var(--color-laitela--base);
   border: 0.1rem solid var(--color-laitela--accent);
   border-radius: var(--var-border-radius, 0.5rem);
-  cursor: pointer;
   margin: 0 0.5rem;
   transition-duration: 0.15s;
+  cursor: pointer;
 }
 
 .c-singularity-milestone-modal-sort-button:hover {
@@ -8321,17 +8334,17 @@ kbd {
 }
 
 .o-laitela-singularity-modal-button {
-  color: var(--color-laitela--accent);
-  background: var(--color-laitela--base);
-  padding: 0.6rem;
-  margin: 0;
-  font-weight: bold;
   width: 22rem;
   height: 4%;
-  border-radius: var(--var-border-radius, 0.5rem);
+  font-weight: bold;
+  color: var(--color-laitela--accent);
+  background: var(--color-laitela--base);
   border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
-  cursor: pointer;
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin: 0;
+  padding: 0.6rem;
   transition-duration: 0.15s;
+  cursor: pointer;
 }
 
 .o-laitela-singularity-modal-button:hover {
@@ -8340,24 +8353,24 @@ kbd {
 }
 
 .o-laitela-singularity-locked {
-  color: var(--color-laitela--accent);
-  background: var(--color-laitela--base);
-  padding: 0.6rem;
-  margin: 0;
-  font-weight: bold;
   width: 22rem;
   height: 4%;
-  border-radius: var(--var-border-radius, 0.5rem);
-  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
   font-size: 20px;
+  font-weight: bold;
+  color: var(--color-laitela--accent);
+  background: var(--color-laitela--base);
+  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin: 0;
+  padding: 0.6rem;
   padding-top: 10rem;
 }
 
 .c-laitela-next-milestones {
-  margin-left: 1rem;
   display: flex;
   flex-direction: column;
   height: 84rem;
+  margin-left: 1rem;
 }
 
 @keyframes a-dark-energy-glow {
@@ -8367,25 +8380,25 @@ kbd {
 }
 
 .o-laitela-run-button__icon {
-  height: 12rem;
   width: 12rem;
-  border-radius: 50%;
+  height: 12rem;
+  align-items: center;
   background-color: black;
   background-image: url("../images/laitela-icon.svg");
   background-position: center;
   background-repeat: repeat-y;
   background-size: 4.95rem;
-  align-items: center;
-  margin: 1.5rem auto;
   border: var(--var-border-width, 0.4rem) solid var(--color-laitela--accent);
-  animation: a-laitela-run-button__icon--scroll 15s infinite linear;
+  border-radius: 50%;
+  margin: 1.5rem auto;
   transition-duration: 0.2s;
+  animation: a-laitela-run-button__icon--scroll 15s infinite linear;
   cursor: pointer;
 }
 
 .o-laitela-run-button__icon:hover {
-  background-image: url("../images/laitela-icon-dark.svg");
   background-color: white;
+  background-image: url("../images/laitela-icon-dark.svg");
 }
 
 .o-laitela-run-button__icon--running {
@@ -8398,31 +8411,31 @@ kbd {
 }
 
 .l-laitela-annihilation-container {
-  color: var(--color-laitela--accent);
-  background: var(--color-laitela--base);
-  padding: 1rem;
   width: 50rem;
   height: 20rem;
-  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
-  border-radius: var(--var-border-radius, 0.5rem);
   font-family: Typewriter, serif;
   font-size: 1.2rem;
+  color: var(--color-laitela--accent);
+  background: var(--color-laitela--base);
+  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 1rem;
 }
 
 .l-laitela-annihilation-button {
-  color: var(--color-laitela--accent);
-  background: var(--color-laitela--base);
-  padding: 0.5rem;
   width: 35rem;
   height: 3rem;
+  font-family: Typewriter, serif;
+  color: var(--color-laitela--accent);
+  background: var(--color-laitela--base);
   border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
   border-radius: var(--var-border-radius, 0.5rem);
-  font-family: Typewriter, serif;
+  padding: 0.5rem;
 }
 
 .c-laitela-annihilation-button {
-  cursor: pointer;
   transition-duration: 0.3s;
+  cursor: pointer;
 }
 
 .c-laitela-annihilation-button h2 {
@@ -8434,8 +8447,8 @@ kbd {
 }
 
 .c-laitela-annihilation-button:hover {
-  background: var(--color-laitela--accent);
   color: var(--color-laitela--base) !important; /* h2 color overrides this */
+  background: var(--color-laitela--accent);
 }
 
 .c-laitela-annihilation-input {
@@ -8443,18 +8456,18 @@ kbd {
 }
 
 .c-laitela-automation-toggle {
-  color: var(--color-laitela--accent);
-  background: var(--color-laitela--base);
-  padding: 0.5rem;
   width: 20rem;
   height: 3rem;
-  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
-  border-radius: var(--var-border-radius, 0.5rem);
-  cursor: pointer;
   font-family: Typewriter;
   font-size: 1.1rem;
   font-weight: bold;
+  color: var(--color-laitela--accent);
+  background: var(--color-laitela--base);
+  border: var(--var-border-width, 0.2rem) solid var(--color-laitela--accent);
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 0.5rem;
   transition-duration: 0.15s;
+  cursor: pointer;
 }
 
 .c-laitela-automation-toggle:hover {
@@ -8470,21 +8483,21 @@ kbd {
 
 .c-performance-stats {
   width: 25rem;
-  padding: 0.3rem;
   position: fixed;
   top: 0;
   left: 0;
-  border: 0.1rem solid black;
+  z-index: 999;
   text-align: left;
   background-color: whitesmoke;
-  z-index: 999;
+  border: 0.1rem solid black;
+  padding: 0.3rem;
 }
 
 .c-glyph-level-factors-dropdown-header {
-  color: var(--color-reality-light);
   width: calc(100% - 1rem);
-  font-weight: bold;
   text-align: center;
+  font-weight: bold;
+  color: var(--color-reality-light);
   background: black;
   border: var(--var-border-width, 0.2rem) solid var(--color-reality);
   border-radius: var(--var-border-radius, 0.5rem);
@@ -8504,74 +8517,77 @@ kbd {
 }
 
 .l-glyph-levels-and-weights__adjust-label {
-  grid-column: 4;
-  -ms-grid-column-span: 2;
-  grid-row: 5;
   white-space: nowrap;
+  grid-row: 5;
+  grid-column: 4;
+  z-index: 2;
   font-weight: bold;
   padding: 0.25rem 0 0.25rem 1rem;
-  z-index: 2;
+
+  -ms-grid-column-span: 2;
 }
 
 .l-glyph-levels-and-weights__adjust-auto {
-  grid-column: 4;
-  -ms-grid-column-span: 2;
-  grid-row: 6;
   white-space: nowrap;
+  grid-row: 6;
+  grid-column: 4;
+  z-index: 2;
   font-weight: bold;
   padding: 0.25rem 0 0.25rem 1rem;
-  z-index: 2;
+
+  -ms-grid-column-span: 2;
 }
 
 .l-glyph-levels-and-weights__adjust-outline {
+  grid-row: 1;
   grid-column: 4 / 5;
   grid-column: 4;
-  -ms-grid-column-span: 1;
-  grid-row: 1;
   position: relative;
+
+  -ms-grid-column-span: 1;
 }
 
 .l-glyph-levels-and-weights__adjust-outline::after {
   content: "";
   position: absolute;
-  border: var(--var-border-width, 0.2rem) solid var(--color-reality-light);
-  border-radius: var(--var-border-radius, 0.5rem);
   top: -0.5rem;
+  right: -0.5rem;
   bottom: -0.5rem;
   left: -0.5rem;
-  right: -0.5rem;
+  border: var(--var-border-width, 0.2rem) solid var(--color-reality-light);
+  border-radius: var(--var-border-radius, 0.5rem);
 }
 
 .l-glyph-levels-and-weights__factor {
+  display: flex;
   grid-column: 1;
+  align-items: center;
   text-align: left;
-  padding-left: 1rem;
   padding-top: 0.3rem;
   padding-bottom: 0.3rem;
-  display: flex;
-  align-items: center;
+  padding-left: 1rem;
 }
 
 .l-glyph-levels-and-weights__operator {
-  grid-column: 2;
   display: flex;
+  grid-column: 2;
   align-items: center;
   padding-left: 1rem;
 }
 
 .l-glyph-levels-and-weights__factor-val {
-  grid-column: 3;
-  text-align: right;
-  padding-left: 1rem;
   display: flex;
-  align-items: center;
+  grid-column: 3;
   justify-content: flex-end;
+  align-items: center;
+  text-align: right;
   padding-right: 2rem;
+  padding-left: 1rem;
 }
 
 .l-glyph-levels-and-weights__slider {
-  grid-column: 4;
   display: flex;
+  grid-column: 4;
   align-items: center;
   margin-top: 0.4rem;
   margin-bottom: 0.4rem;
@@ -8588,8 +8604,8 @@ kbd {
 .c-glyph-levels-and-weights__slider-handle {
   color: var(--color-reality-light);
   background-color: black;
-  box-shadow: 0 0 0 0.1rem var(--color-reality-light);
   border-radius: var(--var-border-radius, 0.8rem);
+  box-shadow: 0 0 0 0.1rem var(--color-reality-light);
   transition-duration: 0.2s;
 }
 
@@ -8605,8 +8621,8 @@ kbd {
 .c-glyph-levels-and-weights__reset-btn {
   color: var(--color-reality-light);
   background-color: black;
-  border-radius: var(--var-border-radius, 0.5rem);
   border: 0.1rem solid var(--color-reality-light);
+  border-radius: var(--var-border-radius, 0.5rem);
   padding: 0.2rem 0.5rem;
   transition-duration: 0.2s;
   cursor: pointer;
@@ -8618,14 +8634,14 @@ kbd {
 }
 
 .c-glyph-levels-and-weights__auto-btn {
-  font-size: 1rem;
+  height: 2.5rem;
   font-family: Typewriter;
+  font-size: 1rem;
   font-weight: bold;
   color: var(--color-reality-light);
   background-color: black;
-  height: 2.5rem;
-  border-radius: var(--var-border-radius, 0.5rem);
   border: 0.1rem solid var(--color-reality-light);
+  border-radius: var(--var-border-radius, 0.5rem);
   padding: 0.2rem 0.5rem;
   transition-duration: 0.2s;
   cursor: pointer;
@@ -8637,15 +8653,15 @@ kbd {
 }
 
 .o-questionmark {
-  border-radius: var(--var-border-radius, 50%);
-  border: 0.1rem solid;
+  display: inline-flex;
   width: 1.2rem;
   height: 1.2rem;
-  font-size: 1rem;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
   z-index: 2;
+  justify-content: center;
+  align-items: center;
+  font-size: 1rem;
+  border: 0.1rem solid;
+  border-radius: var(--var-border-radius, 50%);
   -webkit-user-select: none;
   user-select: none;
 }
@@ -8659,8 +8675,8 @@ kbd {
 .l-reality-button-column {
   display: flex;
   flex-direction: column;
-  align-items: center;
   width: 44rem;
+  align-items: center;
   margin-right: 2rem;
 }
 
@@ -8676,25 +8692,25 @@ kbd {
 .l-reality-button-group-half {
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
   width: 50%;
+  justify-content: space-between;
   padding: 0.5rem;
 }
 
 .l-player-glyphs-column {
   display: flex;
   flex-direction: column;
-  padding-top: 1rem;
-  justify-content: flex-start;
   width: 65rem;
+  justify-content: flex-start;
+  padding-top: 1rem;
 }
 
 .l-reality-upgrade-grid {
   display: flex;
   flex-direction: column;
-  margin-top: 1.2rem;
   width: 100%;
   align-items: center;
+  margin-top: 1.2rem;
 }
 
 .l-reality-upgrade-grid__row {
@@ -8703,27 +8719,27 @@ kbd {
 }
 
 .l-reality-upgrade-btn {
-  height: 10rem;
-  padding: 0 0.5rem;
   display: flex;
+  flex-direction: column;
+  width: 20.5rem;
+  height: 10rem;
+  position: relative;
   justify-content: center;
   align-items: center;
-  flex-direction: column;
-  position: relative;
-  width: 20.5rem;
   margin: 1.2rem;
+  padding: 0 0.5rem;
 }
 
 .c-reality-upgrade-btn {
+  text-align: center;
+  font-family: Typewriter, serif;
+  font-size: 1rem;
+  color: var(--color-reality-light);
   background-color: black;
   border: var(--var-border-width, 0.2rem) solid var(--color-reality);
   border-radius: var(--var-border-radius, 0.5rem);
-  color: var(--color-reality-light);
-  cursor: pointer;
   transition-duration: 0.15s;
-  text-align: center;
-  font-size: 1rem;
-  font-family: Typewriter, serif;
+  cursor: pointer;
 }
 
 .c-reality-upgrade-btn__requirement {
@@ -8741,15 +8757,15 @@ kbd {
 }
 
 .c-reality-upgrade-btn--unavailable:hover {
-  background-color: #656565;
   color: var(--color-reality-light);
+  background-color: #656565;
 }
 
 .c-reality-upgrade-btn--useless {
   background-color: var(--color-pelle--base);
   border-color: #4a110b;
-  cursor: default;
   filter: grayscale(50%);
+  cursor: default;
 }
 
 .c-reality-upgrade-btn--useless:hover {
@@ -8770,14 +8786,14 @@ kbd {
 }
 
 .c-reality-upgrade-btn--possible {
-  background-color: #8b8529;
   color: black;
+  background-color: #8b8529;
   cursor: default;
 }
 
 .c-reality-upgrade-btn--possible:hover {
-  background-color: #8b8529;
   color: black;
+  background-color: #8b8529;
 }
 
 .c-reality-upgrade-btn--locked {
@@ -8786,13 +8802,13 @@ kbd {
 }
 
 .c-reality-upgrade-btn--locked:hover {
-  background-color: #a53939;
   color: var(--color-reality-light);
+  background-color: #a53939;
 }
 
 .c-reality-upgrade-btn--black-hole-unlock {
-  margin: auto;
   text-shadow: -0.1rem 0.1rem 0.3rem var(--color-reality-light);
+  margin: auto;
 }
 
 .t-dark .c-reality-upgrade-btn--unavailable {
@@ -8812,8 +8828,8 @@ kbd {
 
 .t-s6.c-reality-upgrade-btn--unavailable:hover,
 .t-s10.c-reality-upgrade-btn--unavailable:hover {
-  background-color: #656565;
   color: var(--color-reality-light);
+  background-color: #656565;
 }
 
 .t-s6.c-reality-upgrade-btn--bought,
@@ -8851,9 +8867,9 @@ kbd {
 }
 
 .c-black-hole-canvas {
-  margin-top: 0.5rem;
   border: 0.1rem solid black;
   border-radius: var(--var-border-radius, 0.4rem);
+  margin-top: 0.5rem;
 }
 
 .t-s1 .c-black-hole-canvas {
@@ -8916,21 +8932,21 @@ kbd {
 }
 
 .o-automator-command {
-  border: 0.1rem solid #353535;
-  padding: 0.5rem;
   display: inline-block;
-  background: #000115;
-  color: #c080ff;
-  border-radius: var(--var-border-radius, 0.5rem);
   width: 8.5rem;
+  color: #c080ff;
+  background: #000115;
+  border: 0.1rem solid #353535;
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 0.5rem;
   -webkit-user-select: none;
   user-select: none;
   cursor: grab;
 }
 
 .c-automator-docs .o-automator-command {
-  margin-bottom: 0.5rem;
   margin-right: 0.5rem;
+  margin-bottom: 0.5rem;
 }
 
 .o-automator-command--ghost {
@@ -8939,8 +8955,8 @@ kbd {
 
 .c-automator-command-list {
   display: flex;
-  align-items: center;
   flex-wrap: wrap;
+  align-items: center;
 }
 
 .c-automator-block-row {
@@ -8960,19 +8976,19 @@ kbd {
 .c-automator-block-row-ghost {
   display: block;
   margin: auto;
-  margin-left: 0;
   margin-bottom: 0.5rem;
+  margin-left: 0;
 }
 
 .c-automator-block-editor {
   overflow-y: scroll;
+  tab-size: 1.5rem;
   height: 100%;
   background-color: black;
   border-top-left-radius: var(--var-border-radius, 1rem);
   border-bottom-left-radius: var(--var-border-radius, 1rem);
   box-sizing: border-box;
   padding: 0.5rem;
-  tab-size: 1.5rem;
 }
 
 .s-base--metro .c-automator-block-editor::-webkit-scrollbar-thumb {
@@ -8980,14 +8996,14 @@ kbd {
 }
 
 .o-automator-block-input {
-  border: 0.1rem solid #353535;
-  padding: 0.5rem;
   display: inline-block;
-  background: #000115;
-  color: #007f7f;
-  border-radius: var(--var-border-radius, 0.5rem);
-  font-size: 1.1rem;
   font-family: Typewriter, serif;
+  font-size: 1.1rem;
+  color: #007f7f;
+  background: #000115;
+  border: 0.1rem solid #353535;
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 0.5rem;
 }
 
 input.o-automator-block-input {
@@ -8996,26 +9012,26 @@ input.o-automator-block-input {
 
 .l-automator-nested-block {
   width: fit-content;
-  padding: 1rem;
-  border: var(--var-border-width, 2px) dotted #55ff55;
-  margin-left: 3rem;
-  margin-top: 0.5rem;
   min-width: 30rem;
+  border: var(--var-border-width, 2px) dotted #55ff55;
+  margin-top: 0.5rem;
+  margin-left: 3rem;
+  padding: 1rem;
 }
 
 .o-automator-block-delete {
-  color: #ff3333;
   font-size: 1.7rem;
+  color: #ff3333;
   cursor: pointer;
 }
 
 .c-automator-template-container {
   display: flex;
   flex-direction: column;
+  width: 70rem;
+  height: 65rem;
   justify-content: space-between;
   margin: 1rem;
-  height: 65rem;
-  width: 70rem;
 }
 
 .c-automator-template-description {
@@ -9035,9 +9051,9 @@ input.o-automator-block-input {
 }
 
 .c-automator-template-textbox {
+  text-align: center;
   border: 0.1rem solid black;
   border-radius: var(--var-border-radius, 0.3rem);
-  text-align: center;
 }
 
 .c-automator-template-textbox--preset {
@@ -9051,33 +9067,35 @@ input.o-automator-block-input {
 .c-perk-tab {
   display: flex;
   flex-direction: column;
-  align-items: center;
   position: relative;
+  align-items: center;
 }
 
 .c-perk-network {
-  position: relative;
   overflow: hidden;
-  touch-action: pan-y;
-  -webkit-user-select: none;
-  user-select: none;
-  -webkit-user-drag: none;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
   width: 60rem;
   height: 60rem;
+  position: relative;
   border: var(--var-border-width, 0.2rem) solid black;
   border-radius: var(--var-border-radius, 0.4rem);
+  -webkit-user-select: none;
+  user-select: none;
+
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
+  touch-action: pan-y;
+  -webkit-user-drag: none;
 }
 
 .c-perk-network__canvas {
-  position: relative;
-  touch-action: none;
-  -webkit-user-select: none;
-  user-select: none;
-  -webkit-user-drag: none;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
   width: 100%;
   height: 100%;
+  position: relative;
+  -webkit-user-select: none;
+  user-select: none;
+
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0%);
+  touch-action: none;
+  -webkit-user-drag: none;
 }
 
 /* #startregion h2p tab */
@@ -9085,17 +9103,17 @@ input.o-automator-block-input {
 .l-h2p-modal {
   display: flex;
   flex-direction: column;
-  margin: 0.5rem;
   /* stylelint-disable-next-line unit-allowed-list */
   width: calc(100vw - 20vh);
   /* stylelint-disable-next-line unit-allowed-list */
   height: calc(100vh - 20vh);
+  margin: 0.5rem;
 }
 
 .l-h2p-container {
   display: flex;
-  flex-direction: row;
   flex: 1 1 50rem;
+  flex-direction: row;
   margin: 2rem 0;
 }
 
@@ -9111,15 +9129,15 @@ input.o-automator-block-input {
 }
 
 .l-h2p-info {
-  flex: 1 1 50rem;
   display: flex;
+  flex: 1 1 50rem;
   flex-direction: column;
 }
 
 .c-h2p-title {
+  font-size: 3rem;
   -webkit-user-select: none;
   user-select: none;
-  font-size: 3rem;
 }
 
 .c-h2p-body {
@@ -9128,8 +9146,8 @@ input.o-automator-block-input {
 }
 
 .l-h2p-body {
-  flex: 1 1 30rem;
   overflow-y: scroll;
+  flex: 1 1 30rem;
   margin: 1rem 1rem 0;
   padding: 0.5rem;
 }
@@ -9151,19 +9169,19 @@ input.o-automator-block-input {
 }
 
 .c-h2p-search-bar {
-  font-size: 1.5rem;
   width: calc(100% - 1rem);
+  font-size: 1.5rem;
   padding: 0.2rem;
 }
 
 .l-h2p-tab-list {
   display: flex;
-  justify-content: flex-start;
-  flex-direction: column;
   overflow-y: auto;
-  margin: 0.5rem 0.5rem 0;
   flex: 1 0.8 40rem;
+  flex-direction: column;
+  justify-content: flex-start;
   scrollbar-width: thin;
+  margin: 0.5rem 0.5rem 0;
 }
 
 .l-h2p-tab-list::-webkit-scrollbar {
@@ -9180,10 +9198,10 @@ input.o-automator-block-input {
 
 .o-h2p-tab-button {
   font-size: 1.25rem;
-  cursor: pointer;
   border-bottom: 0.1rem solid black;
   padding: 0.3rem 0.5rem 0.3rem 0;
   transition: all 0.2s;
+  cursor: pointer;
 }
 
 .o-h2p-tab-button:hover,
@@ -9196,17 +9214,17 @@ input.o-automator-block-input {
 }
 
 .l-help-me {
+  width: 2rem;
+  height: 2rem;
   position: absolute;
   top: 1rem;
-  width: 2rem;
   right: 2rem;
-  height: 2rem;
-  border-radius: var(--var-border-radius, 50%);
-  line-height: 1.9rem;
-  font-size: 1.5rem;
-  cursor: pointer;
-  font-weight: 500;
   z-index: 1;
+  font-size: 1.5rem;
+  font-weight: 500;
+  line-height: 1.9rem;
+  border-radius: var(--var-border-radius, 50%);
+  cursor: pointer;
 }
 
 .l-information {
@@ -9221,35 +9239,35 @@ input.o-automator-block-input {
   display: flex;
   flex-wrap: wrap;
   width: 61rem;
-  justify-content: center;
   position: relative;
+  justify-content: center;
 }
 
 .c-hide-modal-all-subtab-container {
-  border-radius: var(--var-border-radius, 0.8rem);
   border: 0.1rem solid black;
+  border-radius: var(--var-border-radius, 0.8rem);
   padding: 0.2rem;
   cursor: pointer;
 }
 
 .c-hide-modal-tab-button {
-  color: var(--color-text);
-  background-color: var(--color-base);
-  font: 1rem Typewriter, serif;
   display: flex;
+  white-space: normal;
+  width: 12rem;
+  height: 3.4rem;
   justify-content: center;
   align-items: center;
-  height: 3.4rem;
-  width: 12rem;
-  margin: 0.2rem;
+  font: 1rem Typewriter, serif;
+  font-weight: bold;
+  color: var(--color-text);
+  background-color: var(--color-base);
   border: 0.1rem solid black;
   border-radius: var(--var-border-radius, 0.4rem);
   box-shadow: none;
-  white-space: normal;
-  font-weight: bold;
-  cursor: pointer;
-  transition-duration: 0.2s;
+  margin: 0.2rem;
   padding: 0.3rem 1rem;
+  transition-duration: 0.2s;
+  cursor: pointer;
 }
 
 .c-hide-modal-tab-button:hover {
@@ -9339,14 +9357,14 @@ input.o-automator-block-input {
 
 .tutorial--glow::after {
   content: "";
-  position: absolute;
   width: 100%;
   height: 100%;
-  background: gold;
-  animation: opacity 3s infinite;
+  position: absolute;
   top: 0;
   left: 0;
+  background: gold;
   border-radius: var(--var-border-radius, inherit);
+  animation: opacity 3s infinite;
 }
 
 .o-celestial-nav__hoverable .tooltiptext {
@@ -9363,9 +9381,9 @@ input.o-automator-block-input {
 }
 
 .c-celestial-nav__test-ring:hover {
-  fill: red;
   stroke: black;
   stroke-width: 2;
+  fill: red;
 }
 
 .c-celestial-nav__test-complete {
@@ -9382,15 +9400,15 @@ input.o-automator-block-input {
 
 .o-celestial-nav__symbol {
   text-anchor: middle;
-  font-weight: bold;
   font-family: "Font Awesome";
+  font-weight: bold;
 }
 
 .o-celestial-nav__legend-arrow {
   stroke: #cccccc;
-  fill: none;
-  stroke-linecap: butt;
   stroke-width: 2;
+  stroke-linecap: butt;
+  fill: none;
 }
 
 .o-celestial-nav__hoverable:hover .o-celestial-nav__legend-arrow {
@@ -9399,9 +9417,9 @@ input.o-automator-block-input {
 
 .o-celestial-nav__legend-outline {
   stroke: none;
-  fill: none;
-  stroke-linecap: butt;
   stroke-width: 2;
+  stroke-linecap: butt;
+  fill: none;
 }
 
 .o-celestial-nav__hoverable:hover .o-celestial-nav__legend-outline {
@@ -9410,8 +9428,8 @@ input.o-automator-block-input {
 
 .o-celestial-nav__node-overlay {
   stroke: transparent;
-  fill: transparent;
   stroke-width: 12;
+  fill: transparent;
 }
 
 .o-celestial-nav__legend-text {
@@ -9425,36 +9443,36 @@ input.o-automator-block-input {
 }
 
 .o-no-mouse {
+  pointer-events: none;
   -webkit-user-select: none;
   user-select: none;
-  pointer-events: none;
 }
 
 .tooltiptext {
+  pointer-events: none;
   -webkit-user-select: none;
   user-select: none;
-  pointer-events: none;
 }
 
 .l-celestial-navigation {
-  margin: auto;
   border: var(--var-border-width, 0.2rem) solid black;
   border-radius: var(--var-border-radius, 5px);
+  margin: auto;
 
   /* background: #1a1a1a; */
 }
 
 .c-autobuyer-buy-box {
   display: flex;
+  width: 90rem;
+  height: 6.4rem;
   justify-content: center;
   align-items: center;
-  height: 6.4rem;
   font-size: 1.5rem;
-  border-radius: var(--var-border-radius, 0.5rem);
   border-width: var(--var-border-width, 0.2rem);
+  border-radius: var(--var-border-radius, 0.5rem);
   margin: 0.5rem;
   padding: 1rem;
-  width: 90rem;
 }
 
 .t-s6 .c-autobuyer-buy-box,
diff --git a/public/stylesheets/theme-Dark Metro.css b/public/stylesheets/theme-Dark Metro.css
index 5aa679df3..d4d1e1810 100644
--- a/public/stylesheets/theme-Dark Metro.css	
+++ b/public/stylesheets/theme-Dark Metro.css	
@@ -1,12 +1,12 @@
 body.t-dark-metro {
+  color: #757575;
   background-image: url("../images/dark-bg.png");
   background-position: center;
-  color: #757575;
 }
 
 .t-dark-metro .c-tt-buy-button--unlocked {
-  background: #212121;
   color: #00bcd4;
+  background: #212121;
   border: 0.1rem solid #00bcd4;
 }
 
diff --git a/public/stylesheets/theme-Dark.css b/public/stylesheets/theme-Dark.css
index 56016fecd..f6e973a82 100644
--- a/public/stylesheets/theme-Dark.css
+++ b/public/stylesheets/theme-Dark.css
@@ -1,7 +1,7 @@
 body.t-dark {
+  color: #888888;
   background-image: url("../images/dark-bg.png");
   background-position: center;
-  color: #888888;
 }
 
 input.t-dark {
diff --git a/public/stylesheets/theme-Inverted Metro.css b/public/stylesheets/theme-Inverted Metro.css
index e29caa5f5..f25881cdd 100644
--- a/public/stylesheets/theme-Inverted Metro.css	
+++ b/public/stylesheets/theme-Inverted Metro.css	
@@ -24,8 +24,8 @@ body.t-inverted-metro {
 }
 
 .t-inverted-metro .c-tt-buy-button--unlocked {
-  background: #212121;
   color: #00bcd4;
+  background: #212121;
   border: 0.1rem solid #00bcd4;
 }
 
diff --git a/public/stylesheets/theme-Metro.css b/public/stylesheets/theme-Metro.css
index 4279a1295..97e8ab2f3 100644
--- a/public/stylesheets/theme-Metro.css
+++ b/public/stylesheets/theme-Metro.css
@@ -1,6 +1,6 @@
 .t-metro .c-tt-buy-button--unlocked {
-  background: #212121;
   color: #00bcd4;
+  background: #212121;
   border: 0.1rem solid #00bcd4;
 }
 
diff --git a/public/stylesheets/theme-S1.css b/public/stylesheets/theme-S1.css
index b8269f381..74b170e0a 100644
--- a/public/stylesheets/theme-S1.css
+++ b/public/stylesheets/theme-S1.css
@@ -1,10 +1,10 @@
 html {
-  background: url("../images/s1-bg.svg") no-repeat;
   align-content: center;
-  background-size: 100%;
-  background-color: #d72621;
+  background: url("../images/s1-bg.svg") no-repeat;
   background-attachment: fixed;
+  background-color: #d72621;
   background-position: center bottom;
+  background-size: 100%;
 }
 
 body.t-s1 {
@@ -37,16 +37,16 @@ body.t-s1 {
 
 #snow {
   display: block !important;
-  background-image: url("../images/snow1.png"), url("../images/snow2.png"), url("../images/snow3.png");
-  height: 100%;
   width: 100%;
-  left: 0;
-  top: 0;
+  height: 100%;
   position: fixed;
+  top: 0;
+  left: 0;
   z-index: 0;
   opacity: 1;
-  pointer-events: none;
+  background-image: url("../images/snow1.png"), url("../images/snow2.png"), url("../images/snow3.png");
   animation: snow 10s linear infinite, snowFade 10s cubic-bezier(0, 0.3, 1, 0.7) infinite;
+  pointer-events: none;
 }
 
 @keyframes snow {
diff --git a/public/stylesheets/theme-S10.css b/public/stylesheets/theme-S10.css
index 30708b75f..2b33276ba 100644
--- a/public/stylesheets/theme-S10.css
+++ b/public/stylesheets/theme-S10.css
@@ -1,14 +1,14 @@
 .t-s10 #stars {
   display: block;
 
-  /* Make video to at least 100% wide and tall */
-  min-width: 100%;
-  min-height: 100%;
-
   /* Setting width & height to auto prevents the browser from stretching or squishing the video */
   width: auto;
   height: auto;
 
+  /* Make video to at least 100% wide and tall */
+  min-width: 100%;
+  min-height: 100%;
+
   /* Center the video */
   position: absolute;
   top: 50%;
@@ -21,8 +21,8 @@ body.t-s10 {
   color: #999999;
   background: black;
   background-image: url("../images/stars-bg.png");
-  background-size: 100%;
   background-position: center;
+  background-size: 100%;
 }
 
 .t-s10 .c-tt-amount {
diff --git a/public/stylesheets/theme-S11.css b/public/stylesheets/theme-S11.css
index 20523ae39..06e482ea4 100644
--- a/public/stylesheets/theme-S11.css
+++ b/public/stylesheets/theme-S11.css
@@ -6,8 +6,8 @@
 body.t-s11 {
   color: #999999;
   background: black;
-  background-size: 100%;
   background-position: center;
+  background-size: 100%;
 }
 
 .t-s11 .c-tt-amount {
@@ -52,9 +52,9 @@ body.t-s11 {
 }
 
 .o-tachyon-particle {
+  fill: orange !important;
   font-family: Typewriter;
   font-size: 20px;
-  fill: orange !important;
   pointer-events: none;
   -webkit-user-select: none;
   user-select: none;
diff --git a/public/stylesheets/theme-S2.css b/public/stylesheets/theme-S2.css
index 4b26ae090..f9145f2fd 100644
--- a/public/stylesheets/theme-S2.css
+++ b/public/stylesheets/theme-S2.css
@@ -1,9 +1,9 @@
 html {
   background: url("../images/s2-bg.svg") no-repeat;
+  background-color: white;
   background-position-x: 50%;
   background-position-y: 50%;
   background-size: 50%;
-  background-color: white;
 }
 
 body {
diff --git a/public/stylesheets/theme-S4.css b/public/stylesheets/theme-S4.css
index e2862942e..a64422f09 100644
--- a/public/stylesheets/theme-S4.css
+++ b/public/stylesheets/theme-S4.css
@@ -1,6 +1,4 @@
 * {
-  border-radius: 40% !important;
-  box-shadow: 1px 1px 1px 0 #9e9e9e;
   font-family:
     "Comic Sans MS",
     cursive,
@@ -10,12 +8,14 @@
     fab,
     "Font Awesome 6 Brands",
     "Font Awesome 6 Free" !important;
+  border-radius: 40% !important;
+  box-shadow: 1px 1px 1px 0 #9e9e9e;
 }
 
 html {
-  background-color: #ff00ff;
   color: black !important;
   background-attachment: fixed;
+  background-color: #ff00ff;
   background-position: center bottom;
   border: 0.1rem solid white !important;
 }
diff --git a/public/stylesheets/theme-S6.css b/public/stylesheets/theme-S6.css
index 30c44098b..641c497c4 100644
--- a/public/stylesheets/theme-S6.css
+++ b/public/stylesheets/theme-S6.css
@@ -1,14 +1,14 @@
 .t-s6 #stars {
   display: block;
 
-  /* Make video to at least 100% wide and tall */
-  min-width: 100%;
-  min-height: 100%;
-
   /* Setting width & height to auto prevents the browser from stretching or squishing the video */
   width: auto;
   height: auto;
 
+  /* Make video to at least 100% wide and tall */
+  min-width: 100%;
+  min-height: 100%;
+
   /* Center the video */
   position: absolute;
   top: 50%;
@@ -21,8 +21,8 @@ body.t-s6 {
   color: #999999;
   background: black;
   background-image: url("../images/stars-bg.png");
-  background-size: 100%;
   background-position: center;
+  background-size: 100%;
 }
 
 .t-s6 .c-tt-amount {
diff --git a/public/stylesheets/theme-S7.css b/public/stylesheets/theme-S7.css
index 00e38f142..f4dabe64b 100644
--- a/public/stylesheets/theme-S7.css
+++ b/public/stylesheets/theme-S7.css
@@ -1,9 +1,9 @@
 * {
   font-family: Arial, Typewriter;
-  transition-duration: 1ms !important;
   border-width: 1px !important;
   border-radius: 0 !important;
   box-shadow: none !important;
+  transition-duration: 1ms !important;
   animation: none !important;
 }
 
@@ -12,21 +12,21 @@
 }
 
 button {
-  border-radius: 0 !important;
-  background-image: linear-gradient(to top, rgb(222, 222, 222) 0%, rgb(246, 246, 246) 100%) !important;
-  padding: 3px !important;
-  border: 0.1rem solid #9b9b9b !important;
   color: black !important;
   text-decoration: none !important;
+  background-image: linear-gradient(to top, rgb(222, 222, 222) 0%, rgb(246, 246, 246) 100%) !important;
+  border: 0.1rem solid #9b9b9b !important;
+  border-radius: 0 !important;
+  padding: 3px !important;
 }
 
 .o-primary-btn {
-  border-radius: 0 !important;
-  background-image: linear-gradient(to top, rgb(222, 222, 222) 0%, rgb(246, 246, 246) 100%) !important;
-  padding: 3px !important;
-  border: 0.1rem solid #9b9b9b !important;
   color: black !important;
   text-decoration: none !important;
+  background-image: linear-gradient(to top, rgb(222, 222, 222) 0%, rgb(246, 246, 246) 100%) !important;
+  border: 0.1rem solid #9b9b9b !important;
+  border-radius: 0 !important;
+  padding: 3px !important;
 }
 
 button:hover {
@@ -34,8 +34,8 @@ button:hover {
 }
 
 .c-glyph-tooltip {
-  filter: saturate(0);
   text-shadow: none !important;
+  filter: saturate(0);
 }
 
 .c-glyph-tooltip__effect span {
diff --git a/public/stylesheets/theme-S8.css b/public/stylesheets/theme-S8.css
index de5ad7dd3..7663ebd6f 100644
--- a/public/stylesheets/theme-S8.css
+++ b/public/stylesheets/theme-S8.css
@@ -1,14 +1,14 @@
 body.t-s8 {
-  background: url("../images/s8-bg.jpg") no-repeat;
-  color: black;
-  background-color: white;
   height: 100%;
+  color: black;
+  background: url("../images/s8-bg.jpg") no-repeat;
+  background-attachment: fixed;
+  background-color: white;
 
   /* Center and scale the image nicely */
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
-  background-attachment: fixed;
 }
 
 .t-s8 .container {
@@ -23,8 +23,8 @@ body.t-s8 {
 }
 
 .t-s8 .c-tt-buy-button--unlocked {
-  background: #212121;
   color: #00bcd4;
+  background: #212121;
   border: 0.1rem solid #00bcd4;
 }
 
diff --git a/public/stylesheets/time-studies.css b/public/stylesheets/time-studies.css
index 43fd97edf..5d233438a 100644
--- a/public/stylesheets/time-studies.css
+++ b/public/stylesheets/time-studies.css
@@ -1,8 +1,8 @@
 .l-time-studies-tab {
   display: flex;
   flex-direction: column;
-  align-items: center;
   position: relative;
+  align-items: center;
 }
 
 .l-time-studies-tab__tree {
@@ -30,23 +30,23 @@
 
 .l-time-study-connection {
   position: absolute;
-  left: 0;
   top: 0;
+  left: 0;
   z-index: 0;
 }
 
 /* #region o-time-study */
 
 .c-pelle-useless {
-  border: 0.1rem solid;
-  background-color: crimson;
-  font-weight: bold;
-  font-family: Typewriter, serif;
   width: 18rem;
   height: 10rem;
-  transition-duration: 0.2s;
-  border-radius: var(--var-border-radius, 0.4rem);
+  font-family: Typewriter, serif;
   font-size: 1rem;
+  font-weight: bold;
+  background-color: crimson;
+  border: 0.1rem solid;
+  border-radius: var(--var-border-radius, 0.4rem);
+  transition-duration: 0.2s;
 }
 
 .c-pelle-useless-available {
@@ -55,15 +55,15 @@
 }
 
 .c-pelle-useless--unavailable {
-  animation: none;
   color: black;
   filter: grayscale(90%);
+  animation: none;
 }
 
 .c-pelle-useless--unavailable:hover {
-  cursor: default;
   background-color: var(--color-bad);
   filter: grayscale(0%);
+  cursor: default;
 }
 
 .c-pelle-useless--bought {
@@ -72,15 +72,15 @@
 }
 
 .o-time-study {
-  border: 0.1rem solid;
-  background-color: black;
-  font-weight: bold;
-  font-family: Typewriter, serif;
   width: 18rem;
   height: 10rem;
-  transition-duration: 0.2s;
-  border-radius: var(--var-border-radius, 0.4rem);
+  font-family: Typewriter, serif;
   font-size: 1rem;
+  font-weight: bold;
+  background-color: black;
+  border: 0.1rem solid;
+  border-radius: var(--var-border-radius, 0.4rem);
+  transition-duration: 0.2s;
 }
 
 .o-time-study--available {
@@ -89,8 +89,8 @@
 }
 
 .o-time-study--available:hover {
-  animation: none;
   background-color: #00bcd4;
+  animation: none;
 }
 
 .o-time-study--unavailable {
@@ -123,8 +123,8 @@
 .o-time-study--small {
   width: 12rem;
   font-size: 0.9rem;
-  padding-left: 0.5rem;
   padding-right: 0.5rem;
+  padding-left: 0.5rem;
 }
 
 .o-time-study-normal--available {
@@ -248,9 +248,9 @@
 }
 
 .o-time-study-triad--available {
-  border-color: black;
   color: var(--color-v--base);
   background: black;
+  border-color: black;
   animation: a-time-study 1.5s infinite;
 }
 
@@ -328,44 +328,44 @@
 
 .o-time-study-normal--bought {
   color: black;
-  border-color: black;
   background-color: var(--color-eternity);
+  border-color: black;
 }
 
 .o-time-study-antimatter-dim--bought {
   color: black;
-  border-color: black;
   background-color: #22aa48;
+  border-color: black;
 }
 
 .o-time-study-infinity-dim--bought {
   color: black;
-  border-color: black;
   background-color: #b67f33;
+  border-color: black;
 }
 
 .o-time-study-time-dim--bought {
   color: black;
-  border-color: black;
   background-color: #b241e3;
+  border-color: black;
 }
 
 .o-time-study-active--bought {
   color: black;
-  border-color: black;
   background-color: #e60000;
+  border-color: black;
 }
 
 .o-time-study-passive--bought {
   color: black;
-  border-color: black;
   background-color: #5e33b6;
+  border-color: black;
 }
 
 .o-time-study-idle--bought {
   color: black;
-  border-color: black;
   background-color: #0080ff;
+  border-color: black;
 }
 
 .o-time-study-dark--bought {
@@ -389,8 +389,8 @@
 .o-time-study-eternity-challenge--running {
   color: var(--color-eternity);
   background-color: black;
-  animation: a-eternity-challenge-running 6s infinite;
   border: 0.1rem solid var(--color-eternity);
+  animation: a-eternity-challenge-running 6s infinite;
 }
 
 @keyframes a-eternity-challenge-running {
@@ -456,15 +456,15 @@
 }
 
 .o-time-study--secret {
+  opacity: 0;
   transition: opacity 1s;
   transition-delay: 1s;
-  opacity: 0;
   cursor: pointer;
 }
 
 .o-time-study--secret-unlocked {
-  transition: opacity 1s;
   opacity: 1;
+  transition: opacity 1s;
   transition-delay: 0s;
   cursor: pointer;
 }
@@ -473,8 +473,8 @@
   opacity: 0.02;
   background: #f1aa7f;
   transition: opacity 2s 0.5s;
-  cursor: pointer;
   animation: a-time-study 0.5s infinite;
+  cursor: pointer;
 }
 
 .o-time-study--secret-enslaved-unlocked {
@@ -484,9 +484,9 @@
 /* #endregion o-time-study */
 
 .o-time-study-connection {
+  stroke: #444444;
   /* This one should be px, because it rem svg behaves weirdly under scale */
   stroke-width: 16px;
-  stroke: #444444;
   transition: stroke 0.3s;
 }
 
@@ -563,12 +563,12 @@
 }
 
 .o-time-study-connection--secret {
-  transition: opacity 1s;
   opacity: 0;
+  transition: opacity 1s;
 }
 
 .o-time-study-connection--secret-unlocked {
+  opacity: 1;
   transition: opacity 1s;
   transition-delay: 1s;
-  opacity: 1;
 }
diff --git a/public/stylesheets/tooltips.css b/public/stylesheets/tooltips.css
index 55f24c714..0811bc179 100644
--- a/public/stylesheets/tooltips.css
+++ b/public/stylesheets/tooltips.css
@@ -5,31 +5,31 @@
 }
 
 .general-tooltip .tooltip-inner {
-  background: rgba(0, 0, 0, 90%);
-  color: white;
-  border-radius: var(--var-border-radius, 3px);
   width: 160px;
   text-align: center;
-  padding: 5px 10px 4px;
   font-family: Typewriter, serif;
   font-size: 14px;
   line-height: 1.2;
+  color: white;
+  background: rgba(0, 0, 0, 90%);
+  border-radius: var(--var-border-radius, 3px);
+  padding: 5px 10px 4px;
   -webkit-user-select: none;
   user-select: none;
 }
 
 .tooltip-inner.automator-tooltip {
+  display: inline-block !important;
   overflow: auto;
   width: unset;
   height: 100%;
-  display: inline-block !important;
   text-align: left;
 }
 
 .automator-tooltip-header {
   white-space: nowrap;
-  font-weight: bold;
   min-width: 16rem;
+  font-weight: bold;
   padding-bottom: 1rem;
 }
 
@@ -39,17 +39,17 @@
 }
 
 .automator-tooltip-content div {
-  width: 0;
   flex-grow: 1;
+  width: 0;
 }
 
 .general-tooltip .tooltip-arrow {
   width: 0;
   height: 0;
   position: absolute;
-  margin: 5px;
-  border: solid rgba(0, 0, 0, 90%);
   z-index: 1;
+  border: solid rgba(0, 0, 0, 90%);
+  margin: 5px;
 }
 
 .general-tooltip[x-placement^="top"] {
@@ -57,12 +57,12 @@
 }
 
 .general-tooltip[x-placement^="top"] .tooltip-arrow {
-  border-width: 5px 5px 0 !important;
-  border-left-color: transparent !important;
-  border-right-color: transparent !important;
-  border-bottom-color: transparent !important;
   bottom: -5px;
   left: calc(50% - 5px);
+  border-width: 5px 5px 0 !important;
+  border-right-color: transparent !important;
+  border-bottom-color: transparent !important;
+  border-left-color: transparent !important;
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -72,12 +72,12 @@
 }
 
 .general-tooltip[x-placement^="bottom"] .tooltip-arrow {
-  border-width: 0 5px 5px;
-  border-left-color: transparent !important;
-  border-right-color: transparent !important;
-  border-top-color: transparent !important;
   top: -5px;
   left: calc(50% - 5px);
+  border-width: 0 5px 5px;
+  border-top-color: transparent !important;
+  border-right-color: transparent !important;
+  border-left-color: transparent !important;
   margin-top: 0;
   margin-bottom: 0;
 }
@@ -87,14 +87,14 @@
 }
 
 .general-tooltip[x-placement^="right"] .tooltip-arrow {
+  top: calc(50% - 5px);
+  left: -5px;
   border-width: 5px 5px 5px 0;
-  border-left-color: transparent !important;
   border-top-color: transparent !important;
   border-bottom-color: transparent !important;
-  left: -5px;
-  top: calc(50% - 5px);
-  margin-left: 0;
+  border-left-color: transparent !important;
   margin-right: 0;
+  margin-left: 0;
 }
 
 .general-tooltip[x-placement^="left"] {
@@ -102,22 +102,22 @@
 }
 
 .general-tooltip[x-placement^="left"] .tooltip-arrow {
+  top: calc(50% - 5px);
+  right: -5px;
   border-width: 5px 0 5px 5px;
   border-top-color: transparent !important;
   border-right-color: transparent !important;
   border-bottom-color: transparent !important;
-  right: -5px;
-  top: calc(50% - 5px);
-  margin-left: 0;
   margin-right: 0;
+  margin-left: 0;
 }
 
 .general-tooltip.popover .popover-inner {
-  background: #f9f9f9;
   color: black;
-  padding: 24px;
+  background: #f9f9f9;
   border-radius: var(--var-border-radius, 5px);
   box-shadow: 0 5px 30px rgba(0, 0, 0, 10%);
+  padding: 24px;
 }
 
 .general-tooltip.popover .popover-arrow {
diff --git a/public/stylesheets/vue-sfc-classes.css b/public/stylesheets/vue-sfc-classes.css
index d6c6c7167..593eab77c 100644
--- a/public/stylesheets/vue-sfc-classes.css
+++ b/public/stylesheets/vue-sfc-classes.css
@@ -40,11 +40,11 @@
 
 .c-news-line {
   display: inline-block;
+  white-space: nowrap;
+  text-align: left;
   font-family: Typewriter, serif;
   font-size: 1.5rem;
-  white-space: nowrap;
   font-weight: bold;
-  text-align: left;
   -webkit-user-select: none;
   user-select: none;
 }
@@ -55,9 +55,9 @@
 
 .new-ui .c-news-ticker {
   width: 100%;
+  height: 3.9rem;
   border-bottom: 0.1rem solid var(--color-accent);
   padding: 0.8rem 0;
-  height: 3.9rem;
 }
 
 .new-ui .c-news-line {
@@ -65,10 +65,10 @@
 }
 
 .old-ui .c-news-ticker {
+  height: 3rem;
   border: var(--var-border-width, 0.2rem) solid black;
   border-radius: var(--var-border-radius, 0.4rem);
   padding: 0.2rem 0;
-  height: 3rem;
 }
 
 .old-ui .s-base--metro .c-news-ticker,
@@ -78,8 +78,8 @@
 }
 
 .old-ui .t-dark .c-news-ticker {
-  border-color: #546e7a;
   background-color: #455a64;
+  border-color: #546e7a;
 }
 
 .old-ui .t-dark-metro .c-news-ticker {
diff --git a/src/components/BlobBackground.vue b/src/components/BlobBackground.vue
index 327470a65..ead7f4563 100644
--- a/src/components/BlobBackground.vue
+++ b/src/components/BlobBackground.vue
@@ -45,13 +45,13 @@ export default {
 
 <style scoped>
 .o-blob-background {
+  overflow: visible;
   fill: #fbc21b;
+  opacity: 0.3;
   text-shadow:
     0 0 5px #000000,
     0 0 5px #000000,
     0 0 5px #000000;
-  opacity: 0.3;
-  overflow: visible;
   pointer-events: none;
   -webkit-user-select: none;
   user-select: none;
diff --git a/src/components/BlobSnowflake.vue b/src/components/BlobSnowflake.vue
index a7240c736..9ecb6e72f 100644
--- a/src/components/BlobSnowflake.vue
+++ b/src/components/BlobSnowflake.vue
@@ -97,13 +97,13 @@ export default {
 
 <style scoped>
 .o-blob-snowflake {
+  overflow: visible;
   fill: #fbc21b;
+  opacity: 0.9;
   text-shadow:
     0 0 5px #000000,
     0 0 5px #000000,
     0 0 5px #000000;
-  opacity: 0.9;
-  overflow: visible;
   pointer-events: none;
   -webkit-user-select: none;
   user-select: none;
diff --git a/src/components/BlobSnowflakes.vue b/src/components/BlobSnowflakes.vue
index 78a228f8d..e45a2d87c 100644
--- a/src/components/BlobSnowflakes.vue
+++ b/src/components/BlobSnowflakes.vue
@@ -67,13 +67,13 @@ export default {
 
 <style scoped>
 .c-blob-snowflake-container {
+  overflow: visible;
+  width: 100%;
+  height: 100%;
   position: fixed;
   top: 0;
   left: 0;
-  width: 100%;
-  height: 100%;
   z-index: 9999;
-  overflow: visible;
   pointer-events: none;
   -webkit-user-select: none;
   user-select: none;
@@ -81,13 +81,13 @@ export default {
 }
 
 .c-blob-background-container {
+  overflow: visible;
+  width: 100%;
+  height: 100%;
   position: fixed;
   top: 0;
   left: 0;
-  width: 100%;
-  height: 100%;
   z-index: -9999;
-  overflow: visible;
   pointer-events: none;
   -webkit-user-select: none;
   user-select: none;
diff --git a/src/components/CustomizeableTooltip.vue b/src/components/CustomizeableTooltip.vue
index 5e81325e0..b9a946d20 100644
--- a/src/components/CustomizeableTooltip.vue
+++ b/src/components/CustomizeableTooltip.vue
@@ -141,38 +141,38 @@ export default {
 .c-tooltip-arrow {
   visibility: hidden;
   opacity: 0;
-  pointer-events: none;
   transition: 0.4s linear;
   transition-property: opacity, visibility;
+  pointer-events: none;
 }
 
 .c-tooltip-content {
-  position: absolute;
-  padding: 0.7rem;
-  width: 16rem;
-  border-radius: var(--var-border-radius, 0.3rem);
-  background-color: hsla(0deg, 0%, 5%, 90%);
-  color: #ffffff;
   content: attr(ach-tooltip);
+  width: 16rem;
+  position: absolute;
+  z-index: 4;
   text-align: center;
   font-size: 1.4rem;
   line-height: 1.2;
-  z-index: 4;
+  color: #ffffff;
+  background-color: hsla(0deg, 0%, 5%, 90%);
+  border-radius: var(--var-border-radius, 0.3rem);
+  padding: 0.7rem;
 }
 
 .c-tooltip-arrow {
-  position: absolute;
-  transform: translate(-50%, -100%);
+  content: " ";
   width: 0;
+  position: absolute;
+  z-index: 4;
+  font-size: 0;
+  line-height: 0;
   border-top: 0.55rem solid transparent;
   border-right: 0.55rem solid transparent;
   border-bottom: 0.55rem solid transparent;
   border-left: 0.55rem solid transparent;
-  content: " ";
-  font-size: 0;
-  line-height: 0;
+  transform: translate(-50%, -100%);
   transition-duration: 0.4s;
-  z-index: 4;
 }
 
 .c-tooltip--top.c-tooltip-content {
@@ -189,8 +189,8 @@ export default {
 }
 
 .c-tooltip--bottom.c-tooltip-arrow {
-  border-bottom: 0.55rem solid hsla(0deg, 0%, 5%, 90%);
   border-top: 0;
+  border-bottom: 0.55rem solid hsla(0deg, 0%, 5%, 90%);
 }
 
 .c-tooltip--right.c-tooltip-content {
@@ -207,8 +207,8 @@ export default {
 }
 
 .c-tooltip--left.c-tooltip-arrow {
-  border-left: 0.55rem solid hsla(0deg, 0%, 5%, 90%);
   border-right: 0;
+  border-left: 0.55rem solid hsla(0deg, 0%, 5%, 90%);
 }
 
 .c-tooltip-show {
diff --git a/src/components/ExpandingControlBox.vue b/src/components/ExpandingControlBox.vue
index 6dbb5976c..a0da7d9eb 100644
--- a/src/components/ExpandingControlBox.vue
+++ b/src/components/ExpandingControlBox.vue
@@ -201,11 +201,11 @@ export default {
 }
 
 .l-expanding-control-box__container {
-  position: absolute;
   display: block;
-  height: auto;
   overflow: hidden;
   width: 100%;
+  height: auto;
+  position: absolute;
   left: 50%;
   transform: translateX(-50%);
 }
@@ -215,16 +215,16 @@ export default {
 }
 
 .l-expanding-control-box__button {
-  cursor: pointer;
   display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
   white-space: nowrap;
-  border: none !important;
+  width: 100%;
   height: 2.5rem;
   position: relative;
   top: -0.5rem;
+  justify-content: center;
+  align-items: center;
+  border: none !important;
+  cursor: pointer;
 }
 
 .c-indicator-arrow--flipped {
diff --git a/src/components/SaveTimer.vue b/src/components/SaveTimer.vue
index 2059859a8..8285d9e02 100644
--- a/src/components/SaveTimer.vue
+++ b/src/components/SaveTimer.vue
@@ -38,19 +38,19 @@ export default {
 
 <style scoped>
 .o-save-timer {
-  color: var(--color-text);
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  background-color: var(--color-base);
   white-space: nowrap;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  z-index: 5;
+  color: var(--color-text);
+  background-color: var(--color-base);
   border-top: 0.1rem solid var(--color-accent);
   border-right: 0.1rem solid var(--color-accent);
-  cursor: pointer;
+  padding: 0 0.5rem;
   -webkit-user-select: none;
   user-select: none;
-  padding: 0 0.5rem;
-  z-index: 5;
+  cursor: pointer;
 }
 
 .t-inverted .o-save-timer,
diff --git a/src/components/SpeedrunStatus.vue b/src/components/SpeedrunStatus.vue
index 91b00a228..aed928061 100644
--- a/src/components/SpeedrunStatus.vue
+++ b/src/components/SpeedrunStatus.vue
@@ -106,22 +106,22 @@ export default {
 
 <style scoped>
 .speedrun-status {
-  font-size: 1.2rem;
-  color: var(--color-text);
+  white-space: nowrap;
   position: fixed;
   right: 1rem;
   bottom: 1rem;
+  z-index: 5;
+  font-size: 1.2rem;
+  color: var(--color-text);
   background-color: var(--color-base);
-  white-space: nowrap;
   border: var(--var-border-width, 0.2rem) solid var(--color-accent);
+  padding: 0.8rem 2rem;
   -webkit-user-select: none;
   user-select: none;
-  padding: 0.8rem 2rem;
-  z-index: 5;
 }
 
 .speedrun-collapse {
-  cursor: pointer;
   padding: 0.2rem;
+  cursor: pointer;
 }
 </style>
diff --git a/src/components/modals/InformationModal.vue b/src/components/modals/InformationModal.vue
index 2e9b805f2..d253fd9b1 100644
--- a/src/components/modals/InformationModal.vue
+++ b/src/components/modals/InformationModal.vue
@@ -105,10 +105,10 @@ export default {
 }
 
 .c-info-body {
-  margin: 1rem;
-  padding: 0.5rem;
   text-align: left;
   font-size: 2rem;
+  margin: 1rem;
+  padding: 0.5rem;
 }
 
 .c-socials {
@@ -117,8 +117,8 @@ export default {
 
 .l-socials {
   display: flex;
-  align-items: center;
   justify-content: space-evenly;
+  align-items: center;
 }
 
 .c-socials--icon {
diff --git a/src/components/modals/ModalProgressBar.vue b/src/components/modals/ModalProgressBar.vue
index 07cf78a5d..b9c753ad4 100644
--- a/src/components/modals/ModalProgressBar.vue
+++ b/src/components/modals/ModalProgressBar.vue
@@ -74,17 +74,17 @@ export default {
 }
 
 .modal-progress-bar {
-  position: fixed;
-  z-index: 3;
   display: flex;
   flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
   width: 40rem;
-  /* stylelint-disable-next-line unit-allowed-list */
-  left: 50vw;
+  position: fixed;
   /* stylelint-disable-next-line unit-allowed-list */
   top: 50vh;
+  /* stylelint-disable-next-line unit-allowed-list */
+  left: 50vw;
+  z-index: 3;
+  justify-content: space-between;
+  align-items: center;
   transform: translate(-50%, -50%);
 }
 
@@ -96,10 +96,10 @@ export default {
 
 .modal-progress-bar__bg {
   width: 20rem;
-  margin-left: 1rem;
-  margin-right: 1rem;
   height: 2rem;
   background: black;
+  margin-right: 1rem;
+  margin-left: 1rem;
 }
 
 .modal-progress-bar__fg {
diff --git a/src/components/modals/PelleEffectsModal.vue b/src/components/modals/PelleEffectsModal.vue
index 441824a91..7be61c640 100644
--- a/src/components/modals/PelleEffectsModal.vue
+++ b/src/components/modals/PelleEffectsModal.vue
@@ -80,8 +80,8 @@ export default {
 
 <style scoped>
 .pelle-effects-container {
-  height: 40rem;
   overflow-y: scroll;
+  height: 40rem;
 }
 
 p {
diff --git a/src/components/modals/options/hidden-tabs/HiddenTabGroup.vue b/src/components/modals/options/hidden-tabs/HiddenTabGroup.vue
index c9c7efee5..9b79ac4eb 100644
--- a/src/components/modals/options/hidden-tabs/HiddenTabGroup.vue
+++ b/src/components/modals/options/hidden-tabs/HiddenTabGroup.vue
@@ -107,13 +107,13 @@ export default {
 
 <style scoped>
 .c-indicator-icon {
-  color: black;
-  position: absolute;
-  right: 0;
-  top: 0;
   width: 2rem;
-  padding: 0.2rem;
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: black;
   text-shadow: none;
+  padding: 0.2rem;
 }
 
 .c-hidden-tabs-background__visible {
diff --git a/src/components/tabs/automator/AutomatorBlocks.vue b/src/components/tabs/automator/AutomatorBlocks.vue
index 278721e3d..e9ef43728 100644
--- a/src/components/tabs/automator/AutomatorBlocks.vue
+++ b/src/components/tabs/automator/AutomatorBlocks.vue
@@ -162,18 +162,17 @@ export const automatorBlocksMap = automatorBlocks.mapToObject(b => b.cmd, b => b
 
 <style scoped>
 .block-container {
-  margin: 1rem 0;
   display: flex;
-  align-items: center;
   flex-wrap: wrap;
+  align-items: center;
+  margin: 1rem 0;
 }
 
 .o-automator-block-list {
   display: flex;
-  justify-content: center;
-  text-align: center;
-  align-items: center;
-  height: 5.5rem;
   width: 8.7rem;
+  height: 5.5rem;
+  justify-content: center;
+  align-items: center;
 }
 </style>
diff --git a/src/components/tabs/automator/AutomatorButton.vue b/src/components/tabs/automator/AutomatorButton.vue
index 8c7d1bd34..8323fff27 100644
--- a/src/components/tabs/automator/AutomatorButton.vue
+++ b/src/components/tabs/automator/AutomatorButton.vue
@@ -14,9 +14,9 @@ export default {
 <style scoped>
 .c-automator__button {
   width: 3.3rem;
-  margin: 0.4rem;
-  border-radius: 0.3rem;
   border: 0.2rem solid #767676;
+  border-radius: 0.3rem;
+  margin: 0.4rem;
   cursor: pointer;
 }
 </style>
diff --git a/src/components/tabs/automator/AutomatorDocsTemplateList.vue b/src/components/tabs/automator/AutomatorDocsTemplateList.vue
index de2768e0b..0ce610a61 100644
--- a/src/components/tabs/automator/AutomatorDocsTemplateList.vue
+++ b/src/components/tabs/automator/AutomatorDocsTemplateList.vue
@@ -31,8 +31,8 @@ export default {
 
 <style scoped>
 .c-automator-docs-template--button {
-  margin: 0.4rem;
   border-radius: 0.3rem;
+  margin: 0.4rem;
   cursor: pointer;
 }
 </style>
diff --git a/src/components/tabs/automator/AutomatorEditor.vue b/src/components/tabs/automator/AutomatorEditor.vue
index 4de640555..d3925767b 100644
--- a/src/components/tabs/automator/AutomatorEditor.vue
+++ b/src/components/tabs/automator/AutomatorEditor.vue
@@ -144,17 +144,17 @@ export default {
 
 <style scoped>
 .c-slider-toggle-button {
+  display: flex;
+  overflow: hidden;
+  position: relative;
+  align-items: center;
   color: black;
   background-color: #626262;
   border: 0.2rem solid #767676;
   border-radius: 0.2rem;
   margin: 0.4rem;
-  overflow: hidden;
-  position: relative;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
   padding: 0.3rem 0;
+  cursor: pointer;
 }
 
 .c-slider-toggle-button .fas {
@@ -165,15 +165,15 @@ export default {
 
 .c-slider-toggle-button::before {
   content: "";
+  width: 3rem;
+  height: 100%;
   position: absolute;
   top: 0;
   left: 0;
-  width: 3rem;
-  height: 100%;
+  z-index: 0;
+  background-color: white;
   border-radius: 0.2rem;
   transition: 0.3s ease all;
-  background-color: white;
-  z-index: 0;
 }
 
 .c-slider-toggle-button--right::before {
diff --git a/src/components/tabs/celestial-laitela/SingularityMilestoneComponent.vue b/src/components/tabs/celestial-laitela/SingularityMilestoneComponent.vue
index 94566aaf4..63dbbda12 100644
--- a/src/components/tabs/celestial-laitela/SingularityMilestoneComponent.vue
+++ b/src/components/tabs/celestial-laitela/SingularityMilestoneComponent.vue
@@ -145,11 +145,11 @@ export default {
 
 <style scoped>
 .o-laitela-milestone--glow {
+  font-weight: bold;
   color: var(--color-laitela--base);
   background: var(--color-laitela--accent);
   border-color: var(--color-laitela--accent);
   box-shadow: 0 0 0.5rem 0.1rem inset, 0 0 0.3rem 0;
-  font-weight: bold;
   animation: 3s a-laitela-flash infinite;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/tabs/celestial-pelle/ArmageddonButton.vue b/src/components/tabs/celestial-pelle/ArmageddonButton.vue
index f5405e78b..64f39b309 100644
--- a/src/components/tabs/celestial-pelle/ArmageddonButton.vue
+++ b/src/components/tabs/celestial-pelle/ArmageddonButton.vue
@@ -51,30 +51,30 @@ export default {
 
 <style scoped>
 .c-armageddon-button {
-  width: 100%;
-  padding: 1.5rem;
   display: block;
+  width: 100%;
   font-family: Typewriter;
+  color: var(--color-text);
   background: var(--color-text-inverted);
   border: 0.1rem solid var(--color-pelle--base);
-  color: var(--color-text);
   border-radius: var(--var-border-radius, 0.5rem);
+  padding: 1.5rem;
 }
 
 .c-armageddon-button:hover {
-  cursor: pointer;
   box-shadow: 0.1rem 0.1rem 0.5rem var(--color-pelle--base);
   transition-duration: 0.12s;
+  cursor: pointer;
 }
 
 .c-armageddon-button--unavailable {
-  cursor: default;
   opacity: 0.5;
+  cursor: default;
 }
 
 .c-remnant-gain {
-  font-weight: bold;
   font-size: 1.5rem;
+  font-weight: bold;
   color: var(--color-pelle--base);
 }
 
diff --git a/src/components/tabs/celestial-pelle/CreditsContainer.vue b/src/components/tabs/celestial-pelle/CreditsContainer.vue
index f3e2463a6..2745fd00b 100644
--- a/src/components/tabs/celestial-pelle/CreditsContainer.vue
+++ b/src/components/tabs/celestial-pelle/CreditsContainer.vue
@@ -97,102 +97,6 @@ export default {
 </template>
 
 <style scoped>
-.c-credits-container {
-  position: absolute;
-  left: 0;
-  height: 100%;
-  width: 100%;
-  z-index: 9;
-  color: rgb(185, 185, 185);
-  pointer-events: none;
-  transform: translateY(100%);
-}
-
-.c-credits-header {
-  color: yellow;
-}
-
-.c-credits-section {
-  margin-top: 10rem;
-  margin-bottom: 2rem;
-  color: white;
-  text-shadow: 1px 1px 2px turquoise;
-}
-
-.l-credits--bulk {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  position: relative;
-  width: 76%;
-  left: 12%;
-}
-
-.c-credit-entry {
-  margin-top: 1rem;
-  font-size: 1.3rem;
-}
-
-.c-credits-cel-symbol {
-  position: absolute;
-  font-size: 14rem;
-  text-shadow: 0 0 3rem;
-  transform: translateX(-50%);
-  height: 14rem;
-  width: 14rem;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.c-teresa-credits {
-  left: 65%;
-  top: 130rem;
-  color: var(--color-teresa--base);
-  animation: a-teresa-credits 10s ease-in-out infinite;
-}
-
-.c-effarig-credits {
-  left: 80%;
-  top: 50rem;
-  color: #ff4400;
-  animation: a-effarig-credits 4s ease-in-out infinite;
-}
-
-.c-enslaved-credits {
-  left: 52%;
-  top: 220rem;
-  color: var(--color-enslaved--base);
-  animation: a-enslaved-credits 10s linear infinite;
-}
-
-.c-v-credits {
-  left: 20%;
-  top: 170rem;
-  color: var(--color-v--base);
-  animation: a-v-credits 15s ease-in-out infinite;
-}
-
-.c-ra-credits {
-  left: 44%;
-  top: 300rem;
-  color: var(--color-ra--base);
-  animation: a-ra-credits 10s ease-in-out infinite;
-}
-
-.c-laitela-credits {
-  left: 13%;
-  top: 90rem;
-  color: #ffffff;
-  animation: a-laitela-credits 5s ease-in-out infinite;
-}
-
-.c-pelle-credits {
-  left: 30%;
-  top: 8rem;
-  color: var(--color-pelle--base);
-  animation: a-pelle-credits 5s linear infinite;
-}
-
 @keyframes a-teresa-credits {
   0% { transform: rotate(61deg); }
   10% { transform: rotate(322deg); }
@@ -273,4 +177,100 @@ perfectly the same. */
   75% { transform: translateX(-50%) rotate3d(0, 1, 0, 270deg) scaleY(1.3); }
   100% { transform: translateX(-50%) rotate3d(0, 1, 0, 360deg) scaleY(1); }
 }
+
+.c-credits-container {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  left: 0;
+  z-index: 9;
+  color: rgb(185, 185, 185);
+  transform: translateY(100%);
+  pointer-events: none;
+}
+
+.c-credits-header {
+  color: yellow;
+}
+
+.c-credits-section {
+  color: white;
+  text-shadow: 1px 1px 2px turquoise;
+  margin-top: 10rem;
+  margin-bottom: 2rem;
+}
+
+.l-credits--bulk {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  width: 76%;
+  position: relative;
+  left: 12%;
+}
+
+.c-credit-entry {
+  font-size: 1.3rem;
+  margin-top: 1rem;
+}
+
+.c-credits-cel-symbol {
+  display: flex;
+  width: 14rem;
+  height: 14rem;
+  position: absolute;
+  justify-content: center;
+  align-items: center;
+  font-size: 14rem;
+  text-shadow: 0 0 3rem;
+  transform: translateX(-50%);
+}
+
+.c-teresa-credits {
+  top: 130rem;
+  left: 65%;
+  color: var(--color-teresa--base);
+  animation: a-teresa-credits 10s ease-in-out infinite;
+}
+
+.c-effarig-credits {
+  top: 50rem;
+  left: 80%;
+  color: #ff4400;
+  animation: a-effarig-credits 4s ease-in-out infinite;
+}
+
+.c-enslaved-credits {
+  top: 220rem;
+  left: 52%;
+  color: var(--color-enslaved--base);
+  animation: a-enslaved-credits 10s linear infinite;
+}
+
+.c-v-credits {
+  top: 170rem;
+  left: 20%;
+  color: var(--color-v--base);
+  animation: a-v-credits 15s ease-in-out infinite;
+}
+
+.c-ra-credits {
+  top: 300rem;
+  left: 44%;
+  color: var(--color-ra--base);
+  animation: a-ra-credits 10s ease-in-out infinite;
+}
+
+.c-laitela-credits {
+  top: 90rem;
+  left: 13%;
+  color: #ffffff;
+  animation: a-laitela-credits 5s ease-in-out infinite;
+}
+
+.c-pelle-credits {
+  top: 8rem;
+  left: 30%;
+  color: var(--color-pelle--base);
+  animation: a-pelle-credits 5s linear infinite;
+}
 </style>
diff --git a/src/components/tabs/celestial-pelle/FadeToBlack.vue b/src/components/tabs/celestial-pelle/FadeToBlack.vue
index 751fc1e9a..f200cd4a4 100644
--- a/src/components/tabs/celestial-pelle/FadeToBlack.vue
+++ b/src/components/tabs/celestial-pelle/FadeToBlack.vue
@@ -26,12 +26,12 @@ export default {
 
 <style scoped>
 .black-overlay {
+  width: 100%;
+  height: 100%;
   position: absolute;
   top: 0;
   left: 0;
-  width: 100%;
-  height: 100%;
-  background: black;
   z-index: 8;
+  background: black;
 }
 </style>
diff --git a/src/components/tabs/celestial-pelle/NewGame.vue b/src/components/tabs/celestial-pelle/NewGame.vue
index c17372aed..91311e078 100644
--- a/src/components/tabs/celestial-pelle/NewGame.vue
+++ b/src/components/tabs/celestial-pelle/NewGame.vue
@@ -63,32 +63,32 @@ export default {
 
 <style scoped>
 .c-new-game-container {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 9;
   display: flex;
+  flex-direction: column;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  z-index: 9;
   justify-content: center;
   align-items: center;
-  flex-direction: column;
   background-color: black;
   box-shadow: 0 0 20px 1px black;
+  transform: translate(-50%, -50%);
 }
 
 .c-new-game-button-container {
   display: flex;
-  align-items: stretch;
   flex-direction: column;
+  align-items: stretch;
 }
 
 .c-new-game-button {
-  margin-top: 1rem;
-  padding: 1rem;
   font-family: Typewriter;
   background: grey;
   border: black;
   border-radius: var(--var-border-radius, 0.5rem);
+  margin-top: 1rem;
+  padding: 1rem;
   cursor: pointer;
 }
 </style>
diff --git a/src/components/tabs/celestial-pelle/PelleBarPanel.vue b/src/components/tabs/celestial-pelle/PelleBarPanel.vue
index 7de5ef015..d3c2fcd60 100644
--- a/src/components/tabs/celestial-pelle/PelleBarPanel.vue
+++ b/src/components/tabs/celestial-pelle/PelleBarPanel.vue
@@ -64,25 +64,25 @@ export default {
 
 <style scoped>
 .c-pelle-panel-title {
-  font-weight: bold;
-  font-size: 3rem;
-  color: var(--color-pelle--base);
   position: relative;
+  font-size: 3rem;
+  font-weight: bold;
+  color: var(--color-pelle--base);
 }
 
 .c-collapse-icon-clickable {
   position: absolute;
-  left: 1.5rem;
   top: 50%;
+  left: 1.5rem;
   transform: translateY(-50%);
   cursor: pointer;
 }
 
 .l-pelle-panel-container {
-  padding: 1rem;
-  margin: 1rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.2rem);
+  margin: 1rem;
+  padding: 1rem;
   -webkit-user-select: none;
   user-select: none;
 }
diff --git a/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue b/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue
index 43d7b8270..6f5a1f701 100644
--- a/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue
+++ b/src/components/tabs/celestial-pelle/PelleGalaxyGeneratorPanel.vue
@@ -145,25 +145,25 @@ export default {
 
 <style scoped>
 .c-pelle-panel-title {
-  font-weight: bold;
-  font-size: 3rem;
-  color: var(--color-pelle--base);
   position: relative;
+  font-size: 3rem;
+  font-weight: bold;
+  color: var(--color-pelle--base);
 }
 
 .c-collapse-icon-clickable {
   position: absolute;
-  left: 1.5rem;
   top: 50%;
+  left: 1.5rem;
   transform: translateY(-50%);
   cursor: pointer;
 }
 
 .l-pelle-panel-container {
-  padding: 1rem;
-  margin: 1rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.2rem);
+  margin: 1rem;
+  padding: 1rem;
   -webkit-user-select: none;
   user-select: none;
 }
@@ -175,16 +175,16 @@ export default {
 }
 
 .c-generator-unlock-button {
-  padding: 2rem;
-  border-radius: var(--var-border-radius, 0.5rem);
-  font-family: Typewriter;
-  cursor: pointer;
   width: 25rem;
   height: 10rem;
+  font-family: Typewriter;
   font-size: 2rem;
-  background: linear-gradient(var(--color-pelle--secondary), var(--color-pelle--base));
-  color: black;
   font-weight: bold;
+  color: black;
+  background: linear-gradient(var(--color-pelle--secondary), var(--color-pelle--base));
+  border-radius: var(--var-border-radius, 0.5rem);
+  padding: 2rem;
+  cursor: pointer;
 }
 
 .l-galaxy-generator-upgrades-container {
@@ -194,34 +194,35 @@ export default {
 }
 
 .c-galaxies-amount {
-  font-weight: bold;
   font-size: 2.5rem;
+  font-weight: bold;
   background: linear-gradient(var(--color-pelle--secondary), var(--color-pelle--base));
   background-clip: text;
+
   -webkit-text-fill-color: transparent;
 }
 
 .highlight {
-  font-weight: bold;
   font-size: 2rem;
+  font-weight: bold;
   color: var(--color-pelle--base);
 }
 
 .c-increase-cap {
-  padding: 2rem;
+  overflow: hidden;
+  width: 100%;
+  height: 11.4rem;
+  max-width: 70rem;
+  position: relative;
+  font-family: Typewriter;
+  font-size: 1.1rem;
   color: white;
   background-color: #004b55;
   border: var(--var-border-width, 0.1rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.5rem);
-  font-family: Typewriter;
-  margin: 1rem;
-  font-size: 1.1rem;
-  position: relative;
-  width: 100%;
-  max-width: 70rem;
-  height: 11.4rem;
-  overflow: hidden;
   box-shadow: inset 0 0 0.1rem 0.1rem var(--color-pelle--base);
+  margin: 1rem;
+  padding: 2rem;
 
   /* box-shadow is here to prevent a weird grey border forming around the background */
 }
@@ -241,12 +242,12 @@ export default {
 }
 
 .c-increase-cap-background {
-  background: linear-gradient(black, var(--color-pelle--base));
-  left: 0;
-  top: 0;
   height: 100%;
   position: absolute;
+  top: 0;
+  left: 0;
   z-index: 0;
+  background: linear-gradient(black, var(--color-pelle--base));
   transition: width 0.1s;
 }
 
diff --git a/src/components/tabs/celestial-pelle/PelleRift.vue b/src/components/tabs/celestial-pelle/PelleRift.vue
index 1cf5e8028..a0ee84d16 100644
--- a/src/components/tabs/celestial-pelle/PelleRift.vue
+++ b/src/components/tabs/celestial-pelle/PelleRift.vue
@@ -97,12 +97,12 @@ export default {
   display: flex;
   flex-direction: column;
   align-items: center;
-  margin-top: 1rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.5rem);
 
   /* transparent crimson */
   box-shadow: inset 0 0 1rem 0.1rem rgba(237, 20, 61, 45%), 0 0 1rem 0.1rem rgba(237, 20, 61, 45%);
+  margin-top: 1rem;
 }
 
 .t-s1 .c-pelle-rift {
@@ -123,20 +123,20 @@ export default {
 
 .c-pelle-rift-rift-info-container {
   height: 5rem;
-  color: var(--color-text);
   font-weight: 400;
+  color: var(--color-text);
 }
 
 .c-pelle-rift-status {
   display: flex;
   flex-direction: column;
-  align-items: center;
   width: 26rem;
+  align-items: center;
 }
 
 .c-pelle-rift-name-header {
-  color: var(--color-pelle--base);
   font-weight: bold;
+  color: var(--color-pelle--base);
   padding: 0.2rem;
 }
 </style>
diff --git a/src/components/tabs/celestial-pelle/PelleRiftBar.vue b/src/components/tabs/celestial-pelle/PelleRiftBar.vue
index 7a5259f4c..d2fa67477 100644
--- a/src/components/tabs/celestial-pelle/PelleRiftBar.vue
+++ b/src/components/tabs/celestial-pelle/PelleRiftBar.vue
@@ -180,96 +180,6 @@ export default {
 </template>
 
 <style scoped>
-/* CONTAINER STYLES */
-
-.c-pelle-rift-bar {
-  --color-bar-bg: #1e1e1e;
-
-  height: 5rem;
-  border: var(--var-border-width, 0.2rem) solid var(--color-pelle--secondary);
-  border-radius: var(--var-border-radius, 0.5rem);
-  width: 32rem;
-  position: relative;
-  margin-bottom: 1rem;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: var(--color-bar-bg);
-}
-
-.c-pelle-rift-bar--filling,
-.c-pelle-rift-bar--idle {
-  cursor: pointer;
-}
-
-.l-overflow-hidden {
-  overflow: hidden;
-  border: var(--var-border-width, 0.16rem) solid transparent;
-  width: 32rem;
-  height: 5rem;
-  border-radius: var(--var-border-radius, 0.5rem);
-  position: absolute;
-  top: -0.2rem;
-  left: -0.2rem;
-  z-index: 0;
-}
-
-.o-pelle-rift-bar-overlay {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  height: 100%;
-  width: 100%;
-  z-index: 0;
-  box-shadow: inset 0 0 0.3rem 0.1rem var(--color-bar-bg);
-}
-
-.c-pelle-rift-bar--filling .o-pelle-rift-bar-overlay {
-  box-shadow: inset 0 0 0.3rem 0.1rem var(--color-pelle--secondary);
-}
-
-/* FILLING STYLES */
-.o-pelle-rift-bar-fill {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  height: 100%;
-  background: var(--color-pelle--secondary);
-  z-index: 0;
-  opacity: 0.7;
-}
-
-.o-pelle-rift-bar-reducedto {
-  position: absolute;
-  bottom: 0;
-  right: 0;
-  height: 100%;
-  background: var(--color-pelle--base);
-  z-index: 0;
-  filter: brightness(0.5);
-}
-
-/* SPECIAL BAR OVERLAY STYLES */
-.o-pelle-rift-bar-permanent {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  height: 100%;
-  width: 100%;
-  filter: brightness(50%);
-  background: var(--color-pelle--secondary);
-  z-index: 0;
-}
-
-.o-pelle-rift-bar-overfilled {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  background: var(--color-pelle--base);
-  opacity: 0.5;
-  z-index: 1;
-}
-
 @keyframes a-pelle-bar-overfill-pulse {
   /* #ed143d66 is the base pelle colour except transparent. */
   0% { box-shadow: 0 0 0.7rem 1rem rgba(237, 20, 61, 40%); }
@@ -283,6 +193,126 @@ export default {
   100% { box-shadow: 0 0 0.7rem 1rem rgba(124, 183, 39, 53.3%); }
 }
 
+/* ACTIVE RIFT FILLING STYLES */
+@keyframes a-pelle-bar-filling-sweep {
+  0% {
+    width: 0;
+    left: 0;
+  }
+
+  10% {
+    width: 2rem;
+    left: 0;
+  }
+
+  90% {
+    width: 2rem;
+    left: calc(100% - 2rem);
+  }
+
+  100% {
+    width: 0;
+    left: 100%;
+  }
+}
+
+@keyframes a-pelle-bar-unfinished-milestone-flash {
+  0% { opacity: 1; }
+  20% { opacity: 1; }
+  50% { opacity: 0.3; }
+  80% { opacity: 1; }
+  100% { opacity: 1; }
+}
+
+/* CONTAINER STYLES */
+
+.c-pelle-rift-bar {
+  --color-bar-bg: #1e1e1e;
+  display: flex;
+  width: 32rem;
+  height: 5rem;
+  position: relative;
+  justify-content: center;
+  align-items: center;
+  background: var(--color-bar-bg);
+  border: var(--var-border-width, 0.2rem) solid var(--color-pelle--secondary);
+  border-radius: var(--var-border-radius, 0.5rem);
+  margin-bottom: 1rem;
+}
+
+.c-pelle-rift-bar--filling,
+.c-pelle-rift-bar--idle {
+  cursor: pointer;
+}
+
+.l-overflow-hidden {
+  overflow: hidden;
+  width: 32rem;
+  height: 5rem;
+  position: absolute;
+  top: -0.2rem;
+  left: -0.2rem;
+  z-index: 0;
+  border: var(--var-border-width, 0.16rem) solid transparent;
+  border-radius: var(--var-border-radius, 0.5rem);
+}
+
+.o-pelle-rift-bar-overlay {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 0;
+  box-shadow: inset 0 0 0.3rem 0.1rem var(--color-bar-bg);
+}
+
+.c-pelle-rift-bar--filling .o-pelle-rift-bar-overlay {
+  box-shadow: inset 0 0 0.3rem 0.1rem var(--color-pelle--secondary);
+}
+
+/* FILLING STYLES */
+.o-pelle-rift-bar-fill {
+  height: 100%;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 0;
+  opacity: 0.7;
+  background: var(--color-pelle--secondary);
+}
+
+.o-pelle-rift-bar-reducedto {
+  height: 100%;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  z-index: 0;
+  background: var(--color-pelle--base);
+  filter: brightness(0.5);
+}
+
+/* SPECIAL BAR OVERLAY STYLES */
+.o-pelle-rift-bar-permanent {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 0;
+  background: var(--color-pelle--secondary);
+  filter: brightness(50%);
+}
+
+.o-pelle-rift-bar-overfilled {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  z-index: 1;
+  opacity: 0.5;
+  background: var(--color-pelle--base);
+}
+
 .c-pelle-rift-bar-overfill-container {
   animation: a-pelle-bar-overfill-pulse 1s infinite linear;
 }
@@ -291,44 +321,21 @@ export default {
   animation: a-pelle-bar-overfill-pulse-but-green 1s infinite linear;
 }
 
-/* ACTIVE RIFT FILLING STYLES */
-@keyframes a-pelle-bar-filling-sweep {
-  0% {
-    left: 0;
-    width: 0;
-  }
-
-  10% {
-    left: 0;
-    width: 2rem;
-  }
-
-  90% {
-    left: calc(100% - 2rem);
-    width: 2rem;
-  }
-
-  100% {
-    left: 100%;
-    width: 0;
-  }
-}
-
 .o-pelle-rift-bar-active-fill {
-  position: absolute;
   height: 100%;
-  background: var(--color-pelle--base);
+  position: absolute;
   z-index: 1;
   opacity: 0.3;
+  background: var(--color-pelle--base);
   animation: a-pelle-bar-filling-sweep infinite 2s linear;
 }
 
 /* PERCENTAGE STYLES */
 .o-pelle-rift-bar-percentage {
+  z-index: 2;
   font-size: 1.5rem;
   color: white;
   text-shadow: 0.1rem 0.1rem 0.2rem var(--color-pelle--base);
-  z-index: 2;
 
   /* This keeps the percentage from blocking the hover area */
   pointer-events: none;
@@ -344,20 +351,12 @@ export default {
   height: 100%;
 }
 
-@keyframes a-pelle-bar-unfinished-milestone-flash {
-  0% { opacity: 1; }
-  20% { opacity: 1; }
-  50% { opacity: 0.3; }
-  80% { opacity: 1; }
-  100% { opacity: 1; }
-}
-
 .o-pelle-rift-bar-milestone-line {
-  position: absolute;
   width: 0.25rem;
   height: 100%;
-  background: var(--color-pelle--base);
+  position: absolute;
   z-index: 1;
+  background: var(--color-pelle--base);
   animation: a-pelle-bar-unfinished-milestone-flash infinite 1s linear;
 }
 
@@ -366,8 +365,8 @@ export default {
 }
 
 .o-pelle-rift-bar-milestone-line--disabled {
-  animation: none;
   filter: brightness(0.25);
+  animation: none;
 }
 </style>
 
diff --git a/src/components/tabs/celestial-pelle/PelleStrike.vue b/src/components/tabs/celestial-pelle/PelleStrike.vue
index 51a080fc0..b4097d0f9 100644
--- a/src/components/tabs/celestial-pelle/PelleStrike.vue
+++ b/src/components/tabs/celestial-pelle/PelleStrike.vue
@@ -37,21 +37,21 @@ export default {
 
 <style>
 .c-pelle-strike {
-  background: var(--color-pelle--base);
-  color: black;
-  font-size: 1.3rem;
-  border: var(--var-border-width, 0.2rem) solid black;
-  border-radius: var(--var-border-radius, 0.5rem);
-  font-weight: bold;
   min-height: 3.8rem;
   z-index: 3;
+  font-size: 1.3rem;
+  font-weight: bold;
+  color: black;
+  background: var(--color-pelle--base);
+  border: var(--var-border-width, 0.2rem) solid black;
+  border-radius: var(--var-border-radius, 0.5rem);
 }
 
 .c-pelle-strike-container {
-  padding: 0.5rem 0.5rem 2rem;
+  width: 26rem;
   height: 5rem;
   z-index: 3;
-  width: 26rem;
+  padding: 0.5rem 0.5rem 2rem;
 }
 
 .c-pelle-strike-description {
diff --git a/src/components/tabs/celestial-pelle/PelleTab.vue b/src/components/tabs/celestial-pelle/PelleTab.vue
index 45e8e9244..cc1affb77 100644
--- a/src/components/tabs/celestial-pelle/PelleTab.vue
+++ b/src/components/tabs/celestial-pelle/PelleTab.vue
@@ -106,20 +106,20 @@ export default {
 .l-pelle-all-content-container {
   display: flex;
   flex-direction: column;
-  align-items: stretch;
   width: 100%;
+  align-items: stretch;
 }
 
 .o-pelle-button {
-  background: var(--color-text-inverted);
+  font-family: Typewriter;
   color: var(--color-text);
+  background: var(--color-text-inverted);
   border: 0.1rem solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.5rem);
-  padding: 1rem;
-  font-family: Typewriter;
   margin-bottom: 1rem;
-  cursor: pointer;
+  padding: 1rem;
   transition-duration: 0.12s;
+  cursor: pointer;
 }
 
 .o-pelle-button:hover {
@@ -128,36 +128,36 @@ export default {
 
 .o-pelle-quotes-button {
   display: flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--color-pelle--base);
-  font-size: 5rem;
-  height: 7rem;
   width: 7rem;
+  height: 7rem;
+  justify-content: center;
+  align-items: center;
+  font-size: 5rem;
   font-weight: 900;
+  color: var(--color-pelle--base);
 }
 
 .pelle-unlock-requirements {
+  width: 40rem;
   font-size: 3rem;
-  background: black;
   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);
-  width: 40rem;
 }
 
 .pelle-doom-button {
+  width: 20rem;
+  align-self: center;
   font-family: Typewriter;
-  padding: 1rem;
-  background: black;
-  color: var(--color-pelle--base);
   font-size: 3rem;
+  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);
-  width: 20rem;
-  cursor: pointer;
+  padding: 1rem;
   transition-duration: 0.4s;
-  align-self: center;
+  cursor: pointer;
 }
 
 .pelle-doom-button:hover {
@@ -165,25 +165,25 @@ export default {
 }
 
 .pelle-icon-container {
-  background: white;
-  border-radius: 50%;
-  height: 15rem;
-  width: 15rem;
-  margin: auto;
-  margin-top: 3rem;
   display: flex;
+  width: 15rem;
+  height: 15rem;
   justify-content: center;
   align-items: center;
-  border: var(--var-border-width, 0.4rem) solid var(--color-pelle--base);
   font-size: 10rem;
-  transition-duration: 0.4s;
   text-shadow: 0 0 1.5rem #9b0101;
+  background: white;
+  border: var(--var-border-width, 0.4rem) solid var(--color-pelle--base);
+  border-radius: 50%;
   box-shadow: 0 0 1.5rem #9b0101;
+  margin: auto;
+  margin-top: 3rem;
+  transition-duration: 0.4s;
 }
 
 .pelle-doom-button:hover .pelle-icon-container {
-  background: black;
   color: var(--color-pelle--base);
+  background: black;
 }
 
 @keyframes roll {
diff --git a/src/components/tabs/celestial-pelle/PelleUpgrade.vue b/src/components/tabs/celestial-pelle/PelleUpgrade.vue
index cb79ab615..f8e5038ea 100644
--- a/src/components/tabs/celestial-pelle/PelleUpgrade.vue
+++ b/src/components/tabs/celestial-pelle/PelleUpgrade.vue
@@ -159,24 +159,24 @@ export default {
 
 <style scoped>
 .c-pelle-upgrade {
-  padding: 2rem;
+  display: flex;
+  flex-direction: column;
+  width: 18.5rem;
+  height: 12rem;
+  position: relative;
+  justify-content: center;
+  align-items: center;
+  font-family: Typewriter;
+  font-size: 0.95rem;
+  font-weight: bold;
   color: var(--color-text);
   background: var(--color-text-inverted);
   border: 0.1rem solid var(--color-pelle--secondary);
   border-radius: var(--var-border-radius, 0.5rem);
-  font-family: Typewriter;
-  cursor: pointer;
-  width: 18.5rem;
-  height: 12rem;
-  margin: 0.6rem 0.3rem;
-  font-size: 0.95rem;
-  font-weight: bold;
   box-shadow: inset 0 0 1rem 0.1rem var(--color-pelle--secondary);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  position: relative;
+  margin: 0.6rem 0.3rem;
+  padding: 2rem;
+  cursor: pointer;
 }
 
 .c-pelle-upgrade:hover {
@@ -186,29 +186,29 @@ export default {
 
 /* stylelint-disable-next-line selector-class-pattern */
 .c-pelle-upgrade--galaxyGenerator {
-  background: linear-gradient(var(--color-pelle--secondary), var(--color-pelle--base));
-  color: black;
   font-weight: bold;
+  color: black;
+  background: linear-gradient(var(--color-pelle--secondary), var(--color-pelle--base));
   box-shadow: none;
 }
 
 .c-pelle-upgrade--unavailable {
-  background: #5f5f5f;
   color: black;
-  cursor: default;
+  background: #5f5f5f;
   box-shadow: none;
+  cursor: default;
 }
 
 .c-pelle-upgrade--faded {
   opacity: 0.3;
-  cursor: default;
   box-shadow: none;
+  cursor: default;
 }
 
 .c-pelle-upgrade--bought {
+  color: black;
   background: var(--color-pelle--secondary);
   cursor: default;
-  color: black;
 }
 
 /* stylelint-disable-next-line selector-class-pattern */
@@ -221,14 +221,14 @@ export default {
 }
 
 .l-pelle-upgrade-gap {
-  height: 0.5rem;
   flex-shrink: 0;
+  height: 0.5rem;
 }
 
 .c-improved-effect {
-  color: #00bb00;
-  font-weight: bold;
   font-style: italic;
+  font-weight: bold;
+  color: #00bb00;
 }
 
 .s-base--metro .c-pelle-upgrade--unavailable {
diff --git a/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue b/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue
index 287d845db..c0190099c 100644
--- a/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue
+++ b/src/components/tabs/celestial-pelle/PelleUpgradePanel.vue
@@ -135,25 +135,25 @@ export default {
 
 <style scoped>
 .c-pelle-panel-title {
-  font-weight: bold;
-  font-size: 3rem;
-  color: var(--color-pelle--base);
   position: relative;
+  font-size: 3rem;
+  font-weight: bold;
+  color: var(--color-pelle--base);
 }
 
 .c-collapse-icon-clickable {
   position: absolute;
-  left: 1.5rem;
   top: 50%;
+  left: 1.5rem;
   transform: translateY(-50%);
   cursor: pointer;
 }
 
 .l-pelle-panel-container {
-  padding: 1rem;
-  margin: 1rem;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.5rem);
+  margin: 1rem;
+  padding: 1rem;
   -webkit-user-select: none;
   user-select: none;
 }
@@ -165,15 +165,15 @@ export default {
 }
 
 .o-pelle-button {
-  background: var(--color-text-inverted);
+  font-family: Typewriter;
   color: var(--color-text);
+  background: var(--color-text-inverted);
   border: 0.1rem solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.5rem);
-  padding: 1rem;
-  font-family: Typewriter;
   margin: 1rem 0 0.5rem;
-  cursor: pointer;
+  padding: 1rem;
   transition-duration: 0.12s;
+  cursor: pointer;
 }
 
 .o-pelle-button:hover {
@@ -183,17 +183,17 @@ export default {
 .c-pelle-upgrade-container {
   display: flex;
   flex-wrap: wrap;
-  justify-content: center;
   max-width: 110rem;
+  justify-content: center;
 }
 
 .c-armageddon-container {
-  align-self: center;
   display: flex;
-  align-items: flex-start;
   justify-content: center;
-  border-radius: var(--var-border-radius, 0.5rem);
+  align-items: flex-start;
+  align-self: center;
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
+  border-radius: var(--var-border-radius, 0.5rem);
   padding: 1rem;
 }
 
@@ -207,8 +207,8 @@ export default {
 }
 
 .c-remnants-amount {
-  font-weight: bold;
   font-size: 2rem;
+  font-weight: bold;
   color: var(--color-pelle--base);
 }
 </style>
diff --git a/src/components/tabs/celestial-pelle/RemnantGainFactor.vue b/src/components/tabs/celestial-pelle/RemnantGainFactor.vue
index e0b005a33..77e02fdc3 100644
--- a/src/components/tabs/celestial-pelle/RemnantGainFactor.vue
+++ b/src/components/tabs/celestial-pelle/RemnantGainFactor.vue
@@ -138,13 +138,13 @@ export default {
 }
 
 .c-remnant-factors {
-  background-color: var(--color-text-inverted);
+  z-index: 4;
+  font-weight: bold;
   color: var(--color-text);
+  background-color: var(--color-text-inverted);
   border: var(--var-border-width, 0.2rem) solid var(--color-pelle--base);
   border-radius: var(--var-border-radius, 0.5rem);
   padding: 0.3rem;
-  font-weight: bold;
-  z-index: 4;
 }
 
 .c-remnant-factors-text {
@@ -158,10 +158,10 @@ export default {
 
 .l-remnant-factors-col {
   display: flex;
+  flex-grow: 0;
+  flex-shrink: 0;
   flex-direction: column;
   margin-left: 2rem;
-  flex-shrink: 0;
-  flex-grow: 0;
 }
 
 .l-remnant-factors-col--first {
diff --git a/src/components/tabs/celestial-ra/RaPet.vue b/src/components/tabs/celestial-ra/RaPet.vue
index 93a779eb4..4839ab9ec 100644
--- a/src/components/tabs/celestial-ra/RaPet.vue
+++ b/src/components/tabs/celestial-ra/RaPet.vue
@@ -310,8 +310,8 @@ export default {
 
 .c-ra-pet-upgrade-memory {
   border-top-right-radius: 0;
-  border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
 }
 
 .c-ra-pet-upgrade-chunk {
diff --git a/src/components/tabs/glyphs/sidebar/SelectedEffectToggle.vue b/src/components/tabs/glyphs/sidebar/SelectedEffectToggle.vue
index 4a832972f..c8cc4652e 100644
--- a/src/components/tabs/glyphs/sidebar/SelectedEffectToggle.vue
+++ b/src/components/tabs/glyphs/sidebar/SelectedEffectToggle.vue
@@ -103,23 +103,23 @@ export default {
 
 <style scoped>
 .c-selected-effect-toggle-indicator--active {
-  color: black;
-  font-size: 1rem;
   position: absolute;
 
   /* -0.1rem = -1px, needed because CSS renders a black border between the check and the border of the selector
   otherwise */
   top: -0.1rem;
   right: -0.1rem;
+  font-size: 1rem;
+  color: black;
+  text-shadow: none;
   border-radius: 0 var(--var-border-radius, 0.4rem);
   padding: 0.2rem;
-  text-shadow: none;
 }
 
 .l-dock {
   position: absolute;
-  margin: 0 4rem;
   top: 50%;
+  margin: 0 4rem;
   transform: translateY(-50%);
 }
 
diff --git a/src/components/tabs/shop/ShopButton.vue b/src/components/tabs/shop/ShopButton.vue
index 7c7121382..59be25df0 100644
--- a/src/components/tabs/shop/ShopButton.vue
+++ b/src/components/tabs/shop/ShopButton.vue
@@ -47,36 +47,36 @@ export default {
 <style scoped>
 .c-shop-button-container {
   width: 30rem;
-  padding: 1rem;
+  color: white;
+  background: #3c3c3c;
   border: var(--var-border-width, 0.2rem) solid #1f7d1f;
   border-radius: var(--var-border-radius, 0.5rem);
   margin: 0.5rem;
-  background: #3c3c3c;
-  color: white;
+  padding: 1rem;
 }
 
 .o-shop-button-button {
+  display: flex;
+  align-items: center;
+  font-family: Typewriter;
   background: turquoise;
   border: none;
   border-radius: var(--var-border-radius, 0.5rem);
-  display: flex;
   margin: auto;
-  align-items: center;
-  font-family: Typewriter;
-  padding: 0.5rem 2rem;
   margin-top: 1rem;
+  padding: 0.5rem 2rem;
   cursor: pointer;
 }
 
 .o-shop-button-button__img {
-  margin-left: 1rem;
   height: 40px;
+  margin-left: 1rem;
 }
 
 .o-shop-button-multiplier {
-  font-weight: bold;
-  font-size: 1.5rem;
-  margin: 0.5rem 0;
   display: block;
+  font-size: 1.5rem;
+  font-weight: bold;
+  margin: 0.5rem 0;
 }
 </style>
diff --git a/src/components/tabs/shop/ShopTab.vue b/src/components/tabs/shop/ShopTab.vue
index 843382861..623b45adc 100644
--- a/src/components/tabs/shop/ShopTab.vue
+++ b/src/components/tabs/shop/ShopTab.vue
@@ -107,11 +107,11 @@ export default {
 }
 
 .c-shop-disclaimer {
-  color: black;
-  background: var(--color-bad);
   width: 100rem;
   font-size: 1.8rem;
   font-weight: bold;
+  color: black;
+  background: var(--color-bad);
   border: var(--var-border-width, 0.2rem) solid black;
   border-radius: var(--var-border-radius, 1rem);
   margin-top: 0.8rem;
@@ -139,15 +139,15 @@ export default {
 }
 
 .o-shop-button-button {
+  display: flex;
+  align-items: center;
+  font-family: Typewriter;
   background: turquoise;
   border: none;
   border-radius: var(--var-border-radius, 0.5rem);
-  display: flex;
   margin: auto;
-  align-items: center;
-  font-family: Typewriter;
-  padding: 0.5rem 2rem;
   margin-top: 1rem;
+  padding: 0.5rem 2rem;
   cursor: pointer;
 }
 
diff --git a/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue b/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue
index 85ecfa061..ac1919924 100644
--- a/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue
+++ b/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue
@@ -123,8 +123,8 @@ export default {
 
 <style scoped>
 .l-tt-save-load-btn__wrapper {
-  margin: 0.3rem;
   position: relative;
+  margin: 0.3rem;
 }
 
 .l-tt-save-load-btn {
@@ -135,18 +135,18 @@ export default {
   position: absolute;
   top: -0.5rem;
   left: 50%;
-  transform: translate(-50%, -100%);
   padding: 0.5rem 0;
+  transform: translate(-50%, -100%);
 }
 
 .c-tt-save-load-btn__menu {
+  text-align: left;
+  font-family: Typewriter;
+  font-size: 1.4rem;
+  font-weight: bold;
   color: white;
   background: black;
   border-radius: var(--var-border-radius, 0.5rem);
-  text-align: left;
-  font-weight: bold;
-  font-family: Typewriter;
-  font-size: 1.4rem;
 }
 
 .l-tt-save-load-btn__menu::after {
@@ -154,10 +154,10 @@ export default {
   position: absolute;
   top: 100%;
   left: 50%;
-  margin-left: -0.5rem;
-  border-width: var(--var-border-width, 0.5rem);
-  border-style: solid;
   border-color: black transparent transparent;
+  border-style: solid;
+  border-width: var(--var-border-width, 0.5rem);
+  margin-left: -0.5rem;
 }
 
 .l-tt-save-load-btn__menu-rename {
@@ -166,9 +166,9 @@ export default {
 
 .c-tt-save-load-btn__menu-rename {
   text-align: left;
-  font-weight: bold;
   font-family: Typewriter;
   font-size: 1.4rem;
+  font-weight: bold;
   border: none;
   border-radius: var(--var-border-radius, 0.3rem);
   padding: 0.2rem;
@@ -180,7 +180,7 @@ export default {
 }
 
 .c-tt-save-load-btn__menu-item:hover {
-  background: white;
   color: black;
+  background: white;
 }
 </style>
diff --git a/src/components/ui-modes/HeaderBlackHole.vue b/src/components/ui-modes/HeaderBlackHole.vue
index ae49f0baa..943023efd 100644
--- a/src/components/ui-modes/HeaderBlackHole.vue
+++ b/src/components/ui-modes/HeaderBlackHole.vue
@@ -117,8 +117,8 @@ export default {
 
 <style scoped>
 .c-primary-btn--black-hole-header {
-  margin: 0.2rem;
   vertical-align: middle;
+  margin: 0.2rem;
 }
 
 .c-black-hole-status-text {
diff --git a/src/components/ui-modes/classic/ClassicSubtabButton.vue b/src/components/ui-modes/classic/ClassicSubtabButton.vue
index c96a8fd2b..fe2e0aabb 100644
--- a/src/components/ui-modes/classic/ClassicSubtabButton.vue
+++ b/src/components/ui-modes/classic/ClassicSubtabButton.vue
@@ -47,14 +47,14 @@ export default {
 
 <style scoped>
 .o-tab-btn {
-  padding-top: 0.2rem;
-  vertical-align: middle;
   height: 2.5rem;
+  vertical-align: middle;
+  padding-top: 0.2rem;
 }
 
 .o-subtab-btn--active {
-  border-bottom-width: 0.4rem;
   height: 2.5rem;
+  border-bottom-width: 0.4rem;
 }
 
 .s-base--metro .o-subtab-btn--active {
diff --git a/src/components/ui-modes/classic/ClassicTabButton.vue b/src/components/ui-modes/classic/ClassicTabButton.vue
index 75b75bdb0..1497dcc66 100644
--- a/src/components/ui-modes/classic/ClassicTabButton.vue
+++ b/src/components/ui-modes/classic/ClassicTabButton.vue
@@ -60,15 +60,15 @@ export default {
 
 <style scoped>
 .o-tab-btn {
+  height: 3.1rem;
+  vertical-align: middle;
   margin: 0.2rem;
   margin-bottom: 0.7rem;
-  vertical-align: middle;
-  height: 3.1rem;
 }
 
 .o-tab-btn--active {
-  border-bottom-width: 0.5rem;
   height: 3.1rem;
+  border-bottom-width: 0.5rem;
 }
 
 .s-base--metro .o-tab-btn--active {
diff --git a/src/components/ui-modes/modern/ModernTabButton.vue b/src/components/ui-modes/modern/ModernTabButton.vue
index 39fdfdbeb..712c13670 100644
--- a/src/components/ui-modes/modern/ModernTabButton.vue
+++ b/src/components/ui-modes/modern/ModernTabButton.vue
@@ -109,8 +109,8 @@ export default {
   width: 0;
   height: 100%;
   position: absolute;
-  left: 0;
   right: 0;
+  left: 0;
   background-color: var(--color-accent);
   transition: width 0.15s;
 }

From ea1852d71e9279e554a97ce018e3cdf74313e4e2 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 15 May 2022 12:58:17 +0800
Subject: [PATCH 33/89] Make it clearer that pelle rift bars are hoverable

---
 src/components/tabs/celestial-pelle/PelleRiftBar.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/tabs/celestial-pelle/PelleRiftBar.vue b/src/components/tabs/celestial-pelle/PelleRiftBar.vue
index b2951464c..57db8f273 100644
--- a/src/components/tabs/celestial-pelle/PelleRiftBar.vue
+++ b/src/components/tabs/celestial-pelle/PelleRiftBar.vue
@@ -194,9 +194,16 @@ export default {
   align-items: center;
   background: var(--color-bar-bg);
 }
+
 .c-pelle-rift-bar--filling,
 .c-pelle-rift-bar--idle {
   cursor: pointer;
+  transition: box-shadow 0.5s;
+}
+
+.c-pelle-rift-bar--filling:hover,
+.c-pelle-rift-bar--idle:hover {
+  box-shadow: 0 0 2rem var(--color-pelle--secondary);
 }
 
 .c-pelle-rift-bar--idle .l-overflow-hidden,

From 09f89a83014a3ae4fe92c2c0302d1d4e073dae2b Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 15 May 2022 22:21:41 +0800
Subject: [PATCH 34/89] Fix clampmax not being applied in AMGalaxyRow

---
 .../tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue   | 2 +-
 .../tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue b/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue
index 0355875e5..08f1b8178 100644
--- a/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue
+++ b/src/components/tabs/antimatter-dimensions/ClassicAntimatterGalaxyRow.vue
@@ -34,7 +34,7 @@ export default {
         : this.lockText;
     },
     sumText() {
-      const parts = [this.galaxies.normal];
+      const parts = [Math.max(this.galaxies.normal, 0)];
       if (this.galaxies.replicanti > 0) parts.push(this.galaxies.replicanti);
       if (this.galaxies.dilation > 0) parts.push(this.galaxies.dilation);
       const sum = parts.map(formatInt).join(" + ");
diff --git a/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue b/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue
index a861aa490..c7dfc9629 100644
--- a/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue
+++ b/src/components/tabs/antimatter-dimensions/ModernAntimatterGalaxyRow.vue
@@ -29,7 +29,7 @@ export default {
         : this.lockText;
     },
     sumText() {
-      const parts = [this.galaxies.normal];
+      const parts = [Math.max(this.galaxies.normal, 0)];
       if (this.galaxies.replicanti > 0) parts.push(this.galaxies.replicanti);
       if (this.galaxies.dilation > 0) parts.push(this.galaxies.dilation);
       const sum = parts.map(formatInt).join(" + ");

From a287e3e9847abf89bef883fdeb161904dd5cf66f Mon Sep 17 00:00:00 2001
From: L4R5W <66326188+L4R5W@users.noreply.github.com>
Date: Mon, 16 May 2022 19:09:58 +0200
Subject: [PATCH 35/89] minor cel7 upgrade wording (#2596)

---
 .../celestials/pelle-upgrades.js               | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/javascripts/core/secret-formula/celestials/pelle-upgrades.js b/javascripts/core/secret-formula/celestials/pelle-upgrades.js
index 21e8312ac..b1c51007d 100644
--- a/javascripts/core/secret-formula/celestials/pelle-upgrades.js
+++ b/javascripts/core/secret-formula/celestials/pelle-upgrades.js
@@ -62,37 +62,37 @@ GameDatabase.celestials.pelle.upgrades = (function() {
     }),
     antimatterDimAutobuyers1: {
       id: 0,
-      description: "Gain back autobuyers for Antimatter Dimensions 1-4",
+      description: "Gain back Autobuyers for Antimatter Dimensions 1-4",
       cost: 1e5,
       formatCost,
     },
     dimBoostAutobuyer: {
       id: 1,
-      description: "Gain back autobuyer for Dimension Boosts",
+      description: "Gain back the Autobuyer for Dimension Boosts",
       cost: 5e5,
       formatCost,
     },
     keepAutobuyers: {
       id: 2,
-      description: "Keep your autobuyer upgrades on Armageddon",
+      description: "Keep your Autobuyer upgrades on Armageddon",
       cost: 5e6,
       formatCost,
     },
     antimatterDimAutobuyers2: {
       id: 3,
-      description: "Gain back autobuyers for Antimatter Dimensions 5-8",
+      description: "Gain back Autobuyers for Antimatter Dimensions 5-8",
       cost: 2.5e7,
       formatCost,
     },
     galaxyAutobuyer: {
       id: 4,
-      description: "Gain back autobuyer for Antimatter Galaxies",
+      description: "Gain back the Autobuyer for Antimatter Galaxies",
       cost: 1e8,
       formatCost,
     },
     tickspeedAutobuyer: {
       id: 5,
-      description: "Gain back autobuyer for Tickspeed",
+      description: "Gain back the Autobuyer for Tickspeed",
       cost: 1e9,
       formatCost,
     },
@@ -110,7 +110,7 @@ GameDatabase.celestials.pelle.upgrades = (function() {
     },
     IDAutobuyers: {
       id: 8,
-      description: "Gain Back Infinity Dimension Autobuyers",
+      description: "Gain back Infinity Dimension Autobuyers",
       cost: 1e14,
       formatCost,
     },
@@ -122,7 +122,7 @@ GameDatabase.celestials.pelle.upgrades = (function() {
     },
     replicantiAutobuyers: {
       id: 10,
-      description: "Gain back Replicanti autobuyers",
+      description: "Gain back Replicanti Upgrade Autobuyers",
       cost: 1e17,
       formatCost,
     },
@@ -158,7 +158,7 @@ GameDatabase.celestials.pelle.upgrades = (function() {
     },
     TDAutobuyers: {
       id: 16,
-      description: "Gain Back Time Dimension Autobuyers",
+      description: "Gain back Time Dimension Autobuyers",
       cost: 1e25,
       formatCost,
     },

From 61dd6ff82f5346b68754b6477c1fdcda470680a6 Mon Sep 17 00:00:00 2001
From: L4R5W <66326188+L4R5W@users.noreply.github.com>
Date: Tue, 17 May 2022 13:50:35 +0200
Subject: [PATCH 36/89] fix achievement 182 (#2597)

---
 .../core/secret-formula/achievements/normal-achievements.js    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/javascripts/core/secret-formula/achievements/normal-achievements.js b/javascripts/core/secret-formula/achievements/normal-achievements.js
index be17661e7..07bc75268 100644
--- a/javascripts/core/secret-formula/achievements/normal-achievements.js
+++ b/javascripts/core/secret-formula/achievements/normal-achievements.js
@@ -1305,7 +1305,8 @@ GameDatabase.achievements.normal = [
     id: 182,
     name: "One more time",
     description: "Gain back all Antimatter Dimension autobuyers.",
-    checkRequirement: () => player.celestials.pelle.upgrades.has(4),
+    checkRequirement: () => PelleUpgrade.antimatterDimAutobuyers1.canBeApplied &&
+      PelleUpgrade.antimatterDimAutobuyers2.canBeApplied,
     checkEvent: GAME_EVENT.GAME_TICK_AFTER
   },
   {

From ac561c8fdecfbe279cc7146563c3b4cacaa37dc8 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Tue, 17 May 2022 05:19:00 -0700
Subject: [PATCH 37/89] all keyframes should start with `a-`

---
 .stylelintrc.json                             |  4 +-
 javascripts/core/app/options.js               |  2 +-
 javascripts/core/big_crunch.js                |  2 +-
 javascripts/core/devtools.js                  |  6 +--
 javascripts/core/dilation.js                  |  4 +-
 javascripts/core/eternity.js                  |  2 +-
 javascripts/core/reality.js                   |  4 +-
 javascripts/core/secret-formula/news.js       | 32 +++++++--------
 public/stylesheets/styles.css                 | 40 +++++++++----------
 public/stylesheets/theme-S1.css               |  7 ++--
 public/stylesheets/theme-S3.css               |  4 +-
 src/components/SaveTimer.vue                  |  2 +-
 .../tabs/celestial-pelle/PelleTab.vue         |  4 +-
 13 files changed, 55 insertions(+), 58 deletions(-)

diff --git a/.stylelintrc.json b/.stylelintrc.json
index 2ab809c30..29bcec7e5 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -46,9 +46,9 @@
             }
         ],
         "keyframes-name-pattern": [
-            "^([_a-z][a-z0-9]*)([-_]{1,2}[a-z0-9]+)*$",
+            "^a-([-_]{0,2}[a-z0-9]+)*$",
             {
-                "message": "Expected keyframe name to be kebab-case"
+                "message": "Keyframe name must begin with `a-` and be kebab-case"
             }
         ],
         "selector-id-pattern": [
diff --git a/javascripts/core/app/options.js b/javascripts/core/app/options.js
index 8ceb639c8..c433d5d31 100644
--- a/javascripts/core/app/options.js
+++ b/javascripts/core/app/options.js
@@ -66,7 +66,7 @@ export function isSecretImport(data) {
 export function tryImportSecret(data) {
   const index = secretImportIndex(data);
   if (index === 0 && document.body.style.animation === "") {
-    document.body.style.animation = "barrelRoll 5s 1";
+    document.body.style.animation = "a-barrel-roll 5s 1";
     SecretAchievement(15).unlock();
     setTimeout(() => document.body.style.animation = "", 5000);
     return true;
diff --git a/javascripts/core/big_crunch.js b/javascripts/core/big_crunch.js
index 063572e1c..9a65e91e8 100644
--- a/javascripts/core/big_crunch.js
+++ b/javascripts/core/big_crunch.js
@@ -3,7 +3,7 @@ import { DC } from "./constants";
 import { SpeedrunMilestones } from "./speedrun";
 
 export function bigCrunchAnimation() {
-  document.body.style.animation = "implode 2s 1";
+  document.body.style.animation = "a-implode 2s 1";
   setTimeout(() => {
     document.body.style.animation = "";
   }, 2000);
diff --git a/javascripts/core/devtools.js b/javascripts/core/devtools.js
index 8ac429cbd..3d05cf553 100644
--- a/javascripts/core/devtools.js
+++ b/javascripts/core/devtools.js
@@ -93,17 +93,17 @@ dev.tripleEverything = function() {
 };
 
 dev.barrelRoll = function() {
-  document.body.style.animation = "barrelRoll 5s 1";
+  document.body.style.animation = "a-barrel-roll 5s 1";
   setTimeout(() => document.body.style.animation = "", 5000);
 };
 
 dev.spin3d = function() {
-  if (document.body.style.animation === "") document.body.style.animation = "spin3d 3s infinite";
+  if (document.body.style.animation === "") document.body.style.animation = "a-spin3d 3s infinite";
   else document.body.style.animation = "";
 };
 
 dev.spin4d = function() {
-  if (document.body.style.animation === "") document.body.style.animation = "spin4d 3s infinite";
+  if (document.body.style.animation === "") document.body.style.animation = "a-spin4d 3s infinite";
   else document.body.style.animation = "";
 };
 
diff --git a/javascripts/core/dilation.js b/javascripts/core/dilation.js
index 00e780749..640264410 100644
--- a/javascripts/core/dilation.js
+++ b/javascripts/core/dilation.js
@@ -3,7 +3,7 @@ import { DC } from "./constants";
 import { SpeedrunMilestones } from "./speedrun";
 
 export function animateAndDilate() {
-  document.body.style.animation = "dilate 2s 1 linear";
+  document.body.style.animation = "a-dilate 2s 1 linear";
   setTimeout(() => {
     document.body.style.animation = "";
   }, 2000);
@@ -11,7 +11,7 @@ export function animateAndDilate() {
 }
 
 export function animateAndUndilate() {
-  document.body.style.animation = "undilate 2s 1 linear";
+  document.body.style.animation = "a-undilate 2s 1 linear";
   setTimeout(() => {
     document.body.style.animation = "";
   }, 2000);
diff --git a/javascripts/core/eternity.js b/javascripts/core/eternity.js
index 0475eb0cc..7e9b942cd 100644
--- a/javascripts/core/eternity.js
+++ b/javascripts/core/eternity.js
@@ -57,7 +57,7 @@ function giveEternityRewards(auto) {
 }
 
 export function eternityAnimation() {
-  document.body.style.animation = "eternify 3s 1";
+  document.body.style.animation = "a-eternify 3s 1";
   setTimeout(() => {
     document.body.style.animation = "";
   }, 3000);
diff --git a/javascripts/core/reality.js b/javascripts/core/reality.js
index 1e8c8efce..aa7fa7c6f 100644
--- a/javascripts/core/reality.js
+++ b/javascripts/core/reality.js
@@ -180,8 +180,8 @@ function triggerManualReality(realityProps) {
 
 export function runRealityAnimation() {
   document.getElementById("ui").style.userSelect = "none";
-  document.getElementById("ui").style.animation = "realize 10s 1";
-  document.getElementById("realityanimbg").style.animation = "realizebg 10s 1";
+  document.getElementById("ui").style.animation = "a-realize 10s 1";
+  document.getElementById("realityanimbg").style.animation = "a-realizebg 10s 1";
   document.getElementById("realityanimbg").style.display = "block";
   setTimeout(() => {
     document.getElementById("realityanimbg").play();
diff --git a/javascripts/core/secret-formula/news.js b/javascripts/core/secret-formula/news.js
index e51d6bb06..f4b5311ba 100644
--- a/javascripts/core/secret-formula/news.js
+++ b/javascripts/core/secret-formula/news.js
@@ -915,7 +915,7 @@ GameDatabase.news = [
     id: "a174",
     text:
       `<span style='font-family: runescape; color: yellow; text-shadow: 0.1rem 0.1rem black; letter-spacing: 0.1rem;
-      font-size: 2rem; line-height: 0; animation: text-flash 1s steps(1, end) infinite;'
+      font-size: 2rem; line-height: 0; animation: a-text-flash 1s steps(1, end) infinite;'
       >FREE RUNE ARMOR TRIMMING</span>`,
   },
   {
@@ -992,12 +992,12 @@ GameDatabase.news = [
   {
     id: "a184",
     text:
-      `<span style='animation: text-grow 1s infinite'>R̵̬̙͋͂̀̋͑̈́̇͠Ê̵͇͎͂̂̍̓̌̐̋̋̀̀̔M̶̨̲̯̘͙̬̥̮̣͚̱̫͛̽̃͌̚͝
-      "Ą̴͍̝͐Į̷̛̲̯̫̘͌́̄̏͌̀̈́͝͝Ṅ̶̛̻̠̠̤̦̞̞͗̎̊̌̊͝͠</span><span style='animation: text-shrink 1s infinite'>
+      `<span style='animation: a-text-grow 1s infinite'>R̵̬̙͋͂̀̋͑̈́̇͠Ê̵͇͎͂̂̍̓̌̐̋̋̀̀̔M̶̨̲̯̘͙̬̥̮̣͚̱̫͛̽̃͌̚͝
+      "Ą̴͍̝͐Į̷̛̲̯̫̘͌́̄̏͌̀̈́͝͝Ṅ̶̛̻̠̠̤̦̞̞͗̎̊̌̊͝͠</span><span style='animation: a-text-shrink 1s infinite'>
       Ḁ̷̛͂̈́͗̎̃̓͛́͘ͅW̶̡̖͓̗̦̃̇̌̀͝A̵͇̭͉̓̎̈̿̊́̄̚͜R̶̝͚̲̭͎͇͎͓͖͚͇̀̈́͗̃̏̂̌͝͝Ę̴̡̤͙͈̝̬̰͒͘</span><span style
-      ='animation: text-grow 1s infinite'> ̶̺̈́́̆̓͘͘Ồ̸̢̢̮͓̯̗͙͚̬̉͊̿F̶̠̤̱̱̱͊̂̍̔̃͆̆̑̿͘</span><span style='animation:
-      text-shrink 1s infinite'> ̴̨̞̠̮͚̱͉͋̔͗̽̈́́́̅ͅỴ̶̣̙̹͚̲͔̲̼̬̥̀͌̒̾͘͘O̵̪̠̗̝̗̘̜͚̮̊͒͆̃̀̌̒͝ͅU̸͎͗̍̑̎̅̅͝R̵̗͑̽̏̓͆͒̈́͌͘̕
-      </span><span style='animation: text-grow 1s infinite'> ̸̑̽̇̆͊̔̍̊̈́̈́͘ͅS̸̘͐͝U̴̥̭̚͘R̸̖̜͍͒́̋͆̈́̓
+      ='animation: a-text-grow 1s infinite'> ̶̺̈́́̆̓͘͘Ồ̸̢̢̮͓̯̗͙͚̬̉͊̿F̶̠̤̱̱̱͊̂̍̔̃͆̆̑̿͘</span><span style='animation:
+      a-text-shrink 1s infinite'> ̴̨̞̠̮͚̱͉͋̔͗̽̈́́́̅ͅỴ̶̣̙̹͚̲͔̲̼̬̥̀͌̒̾͘͘O̵̪̠̗̝̗̘̜͚̮̊͒͆̃̀̌̒͝ͅU̸͎͗̍̑̎̅̅͝R̵̗͑̽̏̓͆͒̈́͌͘̕
+      </span><span style='animation: a-text-grow 1s infinite'> ̸̑̽̇̆͊̔̍̊̈́̈́͘ͅS̸̘͐͝U̴̥̭̚͘R̸̖̜͍͒́̋͆̈́̓
       R̸̡̛̛̪̝̟̱̣̹̭̟̣̀̈̀̏̉̌͝͠Õ̶͙͈͖̠͇̬͍̟̰U̵̩̫͉̝͔̼͎̦̔̓̽͌͊̏̇̓̀̓̀Ņ̸͍͇̘̙̥̰͉̲͕͈̥̍͛̃̑͝Ḑ̵̤̻̖̱̘̯̝̖̈̌̄̕͝
       Ī̶̜̱̈́̑̃̉̄̋̔͐͋͠Ṅ̴͎̞͍̽͊͛̈́̅͛̈̅̚͠Ģ̸̢̾͊S̷̫̼̜̼͇̋͛̎͑͆̅̓̇</span>`,
   },
@@ -1014,10 +1014,10 @@ GameDatabase.news = [
   {
     id: "a186",
     text:
-      `<span style='animation: text-shrink 1s infinite'>/(^_^)/</span> <span style='animation: text-grow 1s infinite
-      '>\\(^_^)\\</span> <span style='animation: text-shrink 1s infinite'>/(^_^)/</span> <span style='animation:
-      text-grow 1s infinite'>\\(^_^)\\</span> <span style='animation: text-shrink 1s infinite'>/(^_^)/</span> <span
-      style='animation: text-grow 1s infinite'>\\(^_^)\\</span>`,
+      `<span style='animation: a-text-shrink 1s infinite'>/(^_^)/</span> <span style='animation: a-text-grow 1s infinite
+      '>\\(^_^)\\</span> <span style='animation: a-text-shrink 1s infinite'>/(^_^)/</span> <span style='animation:
+      a-text-grow 1s infinite'>\\(^_^)\\</span> <span style='animation: a-text-shrink 1s infinite'>/(^_^)/</span> <span
+      style='animation: a-text-grow 1s infinite'>\\(^_^)\\</span>`,
   },
   {
     id: "a187",
@@ -1083,7 +1083,7 @@ GameDatabase.news = [
       random *= 255;
       const color = `hsl(${random}, 90%, 60%)`;
       return `<span style='color: ${color}; text-shadow: 0 0 0.5rem ${color};
-        animation: text-grow 0.4s infinite;'>Disco Time!</span>`;
+        animation: a-text-grow 0.4s infinite;'>Disco Time!</span>`;
     },
   },
   {
@@ -1352,8 +1352,8 @@ GameDatabase.news = [
     id: "a238",
     get text() {
       return `AD Player: "How many orders of magnitude are you on?" Normal person: "Like, maybe 5 or 6 right now, my
-      dude." AD Player: "You are like a little baby. Watch this: <span style='animation: text-crunch ${newsAnimSpd(22)}s
-      1; font-size: 0;'>C R O N C H</span>"`;
+      dude." AD Player: "You are like a little baby. Watch this: <span style='animation: a-text-crunch
+      ${newsAnimSpd(22)}s 1; font-size: 0;'>C R O N C H</span>"`;
     },
   },
   {
@@ -1441,7 +1441,7 @@ GameDatabase.news = [
   },
   {
     id: "a246",
-    text: "<span style='animation: fade-out 3s infinite'>OoooOOOOooOOO, it's me, the infamous news ghost!</span>",
+    text: "<span style='animation: a-fade-out 3s infinite'>OoooOOOOooOOO, it's me, the infamous news ghost!</span>",
   },
   (function() {
     let isFlipped = false;
@@ -1505,7 +1505,7 @@ GameDatabase.news = [
   {
     id: "a252",
     get text() {
-      return `<span style='animation: text-stretch ${newsAnimSpd(30)}s 1'>This message is dilated.</span>`;
+      return `<span style='animation: a-text-stretch ${newsAnimSpd(30)}s 1'>This message is dilated.</span>`;
     },
   },
   {
@@ -2256,7 +2256,7 @@ GameDatabase.news = [
   {
     id: "a352",
     get text() {
-      return `<span style='opacity: 0; animation: disappear ${newsAnimSpd(20)}s 1'>
+      return `<span style='opacity: 0; animation: a-disappear ${newsAnimSpd(20)}s 1'>
       This news message is antimemetic. You will forget that it exists shortly.</span>`;
     }
   },
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index 1eb4d4f27..c9c366e52 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -509,7 +509,6 @@ button:focus {
   position: absolute;
   right: 0.5rem;
   bottom: 0.5rem;
-  animation: weee 4s infinite;
 }
 
 .o-time-study-selection-btn {
@@ -1130,26 +1129,25 @@ br {
   }
 }
 
-/* stylelint-disable-next-line keyframes-name-pattern */
-@keyframes barrelRoll {
+@keyframes a-barrel-roll {
   0% { transform: rotateZ(0deg); }
 
   50%,
   100% { transform: rotateZ(360deg); }
 }
 
-@keyframes spin3d {
+@keyframes a-spin3d {
   0% { transform: rotate3d(5.2, -2.8, 1.4, 0deg); }
   100% { transform: rotate3d(5.2, -2.8, 1.4, 360deg); }
 }
 
-@keyframes spin4d {
+@keyframes a-spin4d {
   0%,
   100% { transform: scale(1) rotate3d(5.2, -2.8, 1.4, 0deg); }
   50% { transform: scale(0) rotate3d(5.2, -2.8, 1.4, 360deg); }
 }
 
-@keyframes float {
+@keyframes a-float {
   0% {
     bottom: 0;
     opacity: 0;
@@ -1165,7 +1163,7 @@ br {
   }
 }
 
-@keyframes implode {
+@keyframes a-implode {
   0%,
   100% {
     transform: scale(1);
@@ -1178,7 +1176,7 @@ br {
   }
 }
 
-@keyframes eternify {
+@keyframes a-eternify {
   0% {
     opacity: 1;
     filter: blur(0);
@@ -1220,7 +1218,7 @@ br {
   }
 }
 
-@keyframes dilate {
+@keyframes a-dilate {
   0% {
     opacity: 1;
     transform: scaleX(1);
@@ -1242,7 +1240,7 @@ br {
   }
 }
 
-@keyframes undilate {
+@keyframes a-undilate {
   0% {
     opacity: 1;
     transform: scaleX(1);
@@ -1264,14 +1262,14 @@ br {
   }
 }
 
-@keyframes realize {
+@keyframes a-realize {
   0% { opacity: 1; }
   20% { opacity: 0; }
   80% { opacity: 0; }
   100% { opacity: 1; }
 }
 
-@keyframes realizebg {
+@keyframes a-realizebg {
   0% { opacity: 0; }
   20% { opacity: 0; }
   30% { opacity: 1; }
@@ -1280,41 +1278,41 @@ br {
   100% { opacity: 0; }
 }
 
-@keyframes text-grow {
+@keyframes a-text-grow {
   0% { font-size: 1.3rem; }
   50% { font-size: 1.8rem; }
   100% { font-size: 1.3rem; }
 }
 
-@keyframes text-shrink {
+@keyframes a-text-shrink {
   0% { font-size: 1.8rem; }
   50% { font-size: 1.3rem; }
   100% { font-size: 1.8rem; }
 }
 
-@keyframes text-crunch {
+@keyframes a-text-crunch {
   0% { font-size: 1.5rem; }
   90% { font-size: 1.5rem; }
   100% { font-size: 0; }
 }
 
-@keyframes text-flash {
+@keyframes a-text-flash {
   0% { color: yellow; }
   50% { color: red; }
 }
 
-@keyframes fade-out {
+@keyframes a-fade-out {
   0% { opacity: 1; }
   50% { opacity: 0; }
   100% { opacity: 1; }
 }
 
-@keyframes disappear {
+@keyframes a-disappear {
   0% { opacity: 1; }
   100% { opacity: 0; }
 }
 
-@keyframes text-stretch {
+@keyframes a-text-stretch {
   0% { letter-spacing: 0; }
   100% { letter-spacing: 30rem; }
 }
@@ -9345,7 +9343,7 @@ input.o-automator-block-input {
   font-family: "Font Awesome 6 Free" !important;
 }
 
-@keyframes opacity {
+@keyframes a-opacity {
   0% { opacity: 0; }
   50% { opacity: 0.4; }
   100% { opacity: 0; }
@@ -9364,7 +9362,7 @@ input.o-automator-block-input {
   left: 0;
   background: gold;
   border-radius: var(--var-border-radius, inherit);
-  animation: opacity 3s infinite;
+  animation: a-opacity 3s infinite;
 }
 
 .o-celestial-nav__hoverable .tooltiptext {
diff --git a/public/stylesheets/theme-S1.css b/public/stylesheets/theme-S1.css
index 74b170e0a..bb429bf59 100644
--- a/public/stylesheets/theme-S1.css
+++ b/public/stylesheets/theme-S1.css
@@ -45,18 +45,17 @@ body.t-s1 {
   z-index: 0;
   opacity: 1;
   background-image: url("../images/snow1.png"), url("../images/snow2.png"), url("../images/snow3.png");
-  animation: snow 10s linear infinite, snowFade 10s cubic-bezier(0, 0.3, 1, 0.7) infinite;
+  animation: a-snow 10s linear infinite, a-snow-fade 10s cubic-bezier(0, 0.3, 1, 0.7) infinite;
   pointer-events: none;
 }
 
-@keyframes snow {
+@keyframes a-snow {
   0% { background-position: 0 0, 0 0, 0 0; }
   50% { background-position: 500px 500px, 100px 200px, -100px 150px; }
   100% { background-position: 1000px 1000px, 200px 400px, -200px 300px; }
 }
 
-/* stylelint-disable-next-line keyframes-name-pattern */
-@keyframes snowFade {
+@keyframes a-snow-fade {
   0% { opacity: 0; }
   50% { opacity: 1; }
   100% { opacity: 0; }
diff --git a/public/stylesheets/theme-S3.css b/public/stylesheets/theme-S3.css
index 7c3569d40..5e114bb11 100644
--- a/public/stylesheets/theme-S3.css
+++ b/public/stylesheets/theme-S3.css
@@ -9,10 +9,10 @@ body {
 .t-s3 .time-theorem-buttons,
 .t-s3 .sidebar,
 .t-s3 .c-glyph-tooltip {
-  animation: glasses 7s infinite;
+  animation: a-glasses 7s infinite;
 }
 
-@keyframes glasses {
+@keyframes a-glasses {
   0% { filter: blur(0); }
   10% { filter: blur(3px); }
   20% { filter: blur(0); }
diff --git a/src/components/SaveTimer.vue b/src/components/SaveTimer.vue
index 8285d9e02..45289297e 100644
--- a/src/components/SaveTimer.vue
+++ b/src/components/SaveTimer.vue
@@ -63,6 +63,6 @@ export default {
 }
 
 .t-s3 .o-save-timer {
-  animation: glasses 7s infinite;
+  animation: a-glasses 7s infinite;
 }
 </style>
diff --git a/src/components/tabs/celestial-pelle/PelleTab.vue b/src/components/tabs/celestial-pelle/PelleTab.vue
index cc1affb77..60582ee0b 100644
--- a/src/components/tabs/celestial-pelle/PelleTab.vue
+++ b/src/components/tabs/celestial-pelle/PelleTab.vue
@@ -186,12 +186,12 @@ export default {
   background: black;
 }
 
-@keyframes roll {
+@keyframes a-roll {
   100% { transform: rotateY(360deg); }
 }
 
 .pelle-icon {
-  animation: roll infinite 8s linear;
+  animation: a-roll infinite 8s linear;
 }
 
 .o-celestial-quote-history {

From 44793c004861d6a53bdccf82f2ebef5c8b31f1cb Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Tue, 17 May 2022 07:17:58 -0700
Subject: [PATCH 38/89] tweak base tab colors to match unique tabs

---
 public/stylesheets/new-ui-styles.css |  8 ++------
 public/stylesheets/styles.css        | 24 ++++--------------------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/public/stylesheets/new-ui-styles.css b/public/stylesheets/new-ui-styles.css
index 264b6d626..5fd3cccb7 100644
--- a/public/stylesheets/new-ui-styles.css
+++ b/public/stylesheets/new-ui-styles.css
@@ -66,7 +66,7 @@ body.t-s9 {
   height: 7rem;
   justify-content: center;
   align-items: center;
-  background-color: var(--color-base);
+  background-color: var(--color-prestige--accent);
   border-right: 0.1rem solid var(--color-accent);
   border-bottom: 0.1rem solid var(--color-accent);
   padding: 1rem;
@@ -311,7 +311,7 @@ body.t-s9 {
   line-height: 2.8rem;
   opacity: 0;
   color: var(--color-text);
-  background: var(--color-base);
+  background: var(--color-prestige--accent);
   border: 0.1rem solid var(--color-accent);
   margin-left: -7.7rem;
   transition-duration: 0.2s;
@@ -345,7 +345,6 @@ body.t-s9 {
 
 .o-tab-btn--infinity .o-subtab__tooltip {
   color: var(--color-infinity);
-  background: var(--color-prestige--accent);
   border-color: var(--color-infinity);
 }
 
@@ -355,7 +354,6 @@ body.t-s9 {
 
 .o-tab-btn--eternity .o-subtab__tooltip {
   color: var(--color-eternity);
-  background: var(--color-prestige--accent);
   border-color: var(--color-eternity);
 }
 
@@ -365,7 +363,6 @@ body.t-s9 {
 
 .o-tab-btn--reality .o-subtab__tooltip {
   color: var(--color-reality);
-  background: var(--color-prestige--accent);
   border-color: var(--color-reality);
 }
 
@@ -375,7 +372,6 @@ body.t-s9 {
 
 .o-tab-btn--celestial .o-subtab__tooltip {
   color: var(--color-celestials);
-  background: var(--color-prestige--accent);
   border-color: var(--color-celestials);
 }
 
diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index 1eb4d4f27..716f5f181 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -154,7 +154,7 @@ html {
   --color-reality: #afa3a5;
   --color-reality-light: #e8e3e4;
   --color-celestials: #f2d6c1;
-  --color-prestige--accent: black;
+  --color-prestige--accent: #dbd242;
 
   --color-pelle--base: #7cb727;
 }
@@ -534,7 +534,7 @@ button:focus {
   font-size: 1.8rem;
   font-weight: bold;
   color: var(--color-text);
-  background-color: var(--color-base);
+  background-color: var(--color-prestige--accent);
   border: var(--var-border-width, 0.2rem) solid var(--color-accent);
   border-radius: var(--var-border-radius, 0.4rem);
   transition-duration: 0.2s;
@@ -549,51 +549,43 @@ button:focus {
 }
 
 .o-tab-btn:hover {
-  color: var(--color-text-inverted);
+  color: var(--color-prestige--accent);
   background: var(--color-accent);
 }
 
 .o-tab-btn--infinity {
   color: var(--color-infinity);
-  background: var(--color-prestige--accent);
   border-color: var(--color-infinity);
 }
 
 .o-tab-btn--infinity:hover {
-  color: var(--color-prestige--accent);
   background: var(--color-infinity);
 }
 
 .o-tab-btn--eternity {
   color: var(--color-eternity);
-  background: var(--color-prestige--accent);
   border-color: var(--color-eternity);
 }
 
 .o-tab-btn--eternity:hover {
-  color: var(--color-prestige--accent);
   background: var(--color-eternity);
 }
 
 .o-tab-btn--reality {
   color: var(--color-reality);
-  background: var(--color-prestige--accent);
   border-color: var(--color-reality);
 }
 
 .o-tab-btn--reality:hover {
-  color: var(--color-prestige--accent);
   background: var(--color-reality);
 }
 
 .o-tab-btn--celestial {
   color: var(--color-celestials);
-  background: var(--color-prestige--accent);
   border-color: var(--color-celestials);
 }
 
 .o-tab-btn--celestial:hover {
-  color: var(--color-prestige--accent);
   background: var(--color-celestials);
 }
 
@@ -9260,7 +9252,7 @@ input.o-automator-block-input {
   font: 1rem Typewriter, serif;
   font-weight: bold;
   color: var(--color-text);
-  background-color: var(--color-base);
+  background-color: var(--color-text-inverted);
   border: 0.1rem solid black;
   border-radius: var(--var-border-radius, 0.4rem);
   box-shadow: none;
@@ -9296,45 +9288,37 @@ input.o-automator-block-input {
 
 .c-hide-modal-tab-button--infinity {
   color: var(--color-infinity);
-  background: var(--color-prestige--accent);
   border-color: var(--color-infinity);
 }
 
 .c-hide-modal-tab-button--infinity:hover {
-  color: var(--color-prestige--accent);
   background: var(--color-infinity);
 }
 
 .c-hide-modal-tab-button--eternity {
   color: var(--color-eternity);
-  background: var(--color-prestige--accent);
   border-color: var(--color-eternity);
 }
 
 .c-hide-modal-tab-button--eternity:hover {
-  color: var(--color-prestige--accent);
   background: var(--color-eternity);
 }
 
 .c-hide-modal-tab-button--reality {
   color: var(--color-reality);
-  background: var(--color-prestige--accent);
   border-color: var(--color-reality);
 }
 
 .c-hide-modal-tab-button--reality:hover {
-  color: var(--color-prestige--accent);
   background: var(--color-reality);
 }
 
 .c-hide-modal-tab-button--celestials {
   color: var(--color-celestials);
-  background: var(--color-prestige--accent);
   border-color: var(--color-celestials);
 }
 
 .c-hide-modal-tab-button--celestials:hover {
-  color: var(--color-prestige--accent);
   background: var(--color-celestials);
 }
 

From 679ae44dd2a3336d68a8610d172dba73f5fedeb3 Mon Sep 17 00:00:00 2001
From: L4R5W <66326188+L4R5W@users.noreply.github.com>
Date: Wed, 18 May 2022 09:33:13 +0200
Subject: [PATCH 39/89] add ReacTivity to credits

---
 javascripts/core/secret-formula/credits.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/javascripts/core/secret-formula/credits.js b/javascripts/core/secret-formula/credits.js
index 2dddbefb9..b3f768f8e 100644
--- a/javascripts/core/secret-formula/credits.js
+++ b/javascripts/core/secret-formula/credits.js
@@ -321,6 +321,9 @@ GameDatabase.credits = {
     }, {
       name: "Razvan Cercel",
       roles: 12
+    }, {
+      name: "ReacTivity",
+      roles: 12
     }, {
       name: "Rukimix",
       roles: 12

From e8515984e8b1ece78df607b212adb056c72f0189 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 05:26:15 -0700
Subject: [PATCH 40/89] adjust stylelintrc to hopefully not break codefactor

---
 .stylelintrc.json | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/.stylelintrc.json b/.stylelintrc.json
index 2ab809c30..a8ab7f125 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -3,8 +3,13 @@
         "stylelint-order"
     ],
     "extends": [
-        "stylelint-config-standard",
-        "stylelint-config-recommended-vue"
+        "stylelint-config-recommended",
+        "stylelint-config-html",
+        "stylelint-config-standard"
+    ],
+    "files": [
+        "*.vue",
+        "**/*.vue"
     ],
     "rules": {
         "no-descending-specificity": null,
@@ -23,6 +28,25 @@
                 "ignoreProperties": ["appearance", "background-clip", "backdrop-filter", "clip-path", "user-select"]
             }
         ],
+        "selector-pseudo-class-no-unknown": [
+            true,
+            {
+            "ignorePseudoClasses": [
+                    "deep",
+                    "global"
+                ]
+            }
+        ],
+        "selector-pseudo-element-no-unknown": [
+            true,
+            {
+            "ignorePseudoElements": [
+                    "v-deep",
+                    "v-global",
+                    "v-slotted"
+                ]
+            }
+        ],
 
         "unit-allowed-list": [
             "rem",

From a7ba8e1057225e2a9d6af5e474558eabdd19996a Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 05:38:00 -0700
Subject: [PATCH 41/89] fix incorrect config

---
 .stylelintrc.json | 60 +++++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/.stylelintrc.json b/.stylelintrc.json
index a8ab7f125..1f451f64c 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -3,14 +3,8 @@
         "stylelint-order"
     ],
     "extends": [
-        "stylelint-config-recommended",
-        "stylelint-config-html",
         "stylelint-config-standard"
     ],
-    "files": [
-        "*.vue",
-        "**/*.vue"
-    ],
     "rules": {
         "no-descending-specificity": null,
         "font-family-no-missing-generic-family-keyword": null,
@@ -28,25 +22,6 @@
                 "ignoreProperties": ["appearance", "background-clip", "backdrop-filter", "clip-path", "user-select"]
             }
         ],
-        "selector-pseudo-class-no-unknown": [
-            true,
-            {
-            "ignorePseudoClasses": [
-                    "deep",
-                    "global"
-                ]
-            }
-        ],
-        "selector-pseudo-element-no-unknown": [
-            true,
-            {
-            "ignorePseudoElements": [
-                    "v-deep",
-                    "v-global",
-                    "v-slotted"
-                ]
-            }
-        ],
 
         "unit-allowed-list": [
             "rem",
@@ -413,5 +388,38 @@
                 "emptyLineBeforeUnspecified": "always"
             }
         ]
-    }
+    },
+    "overrides": [
+        {
+            "files": [
+                "*.vue",
+                "**/*.vue"
+            ],
+            "extends": [
+                "stylelint-config-recommended",
+                "stylelint-config-html"
+            ],
+            "rules": {
+                "selector-pseudo-class-no-unknown": [
+                    true,
+                    {
+                        "ignorePseudoClasses": [
+                            "deep",
+                            "global"
+                        ]
+                    }
+                ],
+                "selector-pseudo-element-no-unknown": [
+                    true,
+                    {
+                        "ignorePseudoElements": [
+                            "v-deep",
+                            "v-global",
+                            "v-slotted"
+                        ]
+                    }
+                ]
+            }
+        }
+    ]
 }

From 5db5c07ebaf3f8b723724435120bdd79f871dd6a Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 10:20:07 -0700
Subject: [PATCH 42/89] fix all `no-prototype-builtin` errors

---
 javascripts/core/app/ui.js            | 2 +-
 javascripts/core/devtools.js          | 2 +-
 javascripts/core/intervals.js         | 5 ++++-
 javascripts/core/performance-stats.js | 2 +-
 javascripts/core/player.js            | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/javascripts/core/app/ui.js b/javascripts/core/app/ui.js
index 3d2c53787..c619abf78 100644
--- a/javascripts/core/app/ui.js
+++ b/javascripts/core/app/ui.js
@@ -97,7 +97,7 @@ const ReactivityComplainer = {
       throw new Error(`Boi you fukked up - ${path} became REACTIVE (oh shite)`);
     }
     for (const key in obj) {
-      if (!obj.hasOwnProperty(key)) continue;
+      if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
       const prop = obj[key];
       if (typeof prop === "object") {
         this.checkReactivity(prop, `${path}.${key}`);
diff --git a/javascripts/core/devtools.js b/javascripts/core/devtools.js
index 8ac429cbd..0397b07ff 100644
--- a/javascripts/core/devtools.js
+++ b/javascripts/core/devtools.js
@@ -166,7 +166,7 @@ dev.resetDilation = function() {
 // when making a special glyph, so no max-params
 // eslint-disable-next-line max-params
 dev.giveSpecialGlyph = function(color, symbol, level, rawLevel = level) {
-  if (!specialGlyphSymbols.hasOwnProperty(symbol)) return;
+  if (!Object.prototype.hasOwnProperty.call(specialGlyphSymbols, symbol)) return;
   if (Glyphs.freeInventorySpace === 0) return;
   const glyph = GlyphGenerator.randomGlyph({ actualLevel: level, rawLevel });
   glyph.symbol = symbol;
diff --git a/javascripts/core/intervals.js b/javascripts/core/intervals.js
index c9c887118..5192caf17 100644
--- a/javascripts/core/intervals.js
+++ b/javascripts/core/intervals.js
@@ -30,7 +30,10 @@ export const GameIntervals = (function() {
     // Not a getter because getter will cause stack overflow
     all() {
       return Object.values(GameIntervals)
-        .filter(i => i.hasOwnProperty("start") && i.hasOwnProperty("stop"));
+        .filter(i =>
+          Object.prototype.hasOwnProperty.call(i, "start") &&
+          Object.prototype.hasOwnProperty.call(i, "stop")
+        );
     },
     start() {
       // eslint-disable-next-line no-shadow
diff --git a/javascripts/core/performance-stats.js b/javascripts/core/performance-stats.js
index 8f12ba35e..42c0f8f09 100644
--- a/javascripts/core/performance-stats.js
+++ b/javascripts/core/performance-stats.js
@@ -49,7 +49,7 @@ export const PerformanceStats = {
     function render(rootBlock) {
       indentLevel++;
       for (const blockName in rootBlock) {
-        if (!rootBlock.hasOwnProperty(blockName)) continue;
+        if (!Object.prototype.hasOwnProperty.call(rootBlock, blockName)) continue;
         const block = rootBlock[blockName];
         const records = block.records;
         while (records.length > 1 && records.last().timestamp - records.first().timestamp > samplePeriod) {
diff --git a/javascripts/core/player.js b/javascripts/core/player.js
index debb9bf53..7a6fbdfa0 100644
--- a/javascripts/core/player.js
+++ b/javascripts/core/player.js
@@ -984,7 +984,7 @@ export function guardFromNaNValues(obj) {
   }
 
   for (const key in obj) {
-    if (!obj.hasOwnProperty(key)) continue;
+    if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
 
     // TODO: rework autobuyer saving
     if (key === "automator") continue;

From c7905dc70bdaba9b44e8dafbb38312813311e04c Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 18:16:55 -0700
Subject: [PATCH 43/89] clean up infinity upgrade gamedatabase

---
 javascripts/core/big_crunch.js                | 307 ------------
 javascripts/core/break-infinity-upgrades.js   |  48 ++
 javascripts/core/globals.js                   |   2 +
 javascripts/core/infinity-upgrades.js         | 213 ++++++++
 .../infinity/break-infinity-upgrades.js       | 283 +++++------
 .../infinity/infinity-upgrades.js             | 460 +++++++++---------
 6 files changed, 643 insertions(+), 670 deletions(-)
 create mode 100644 javascripts/core/break-infinity-upgrades.js
 create mode 100644 javascripts/core/infinity-upgrades.js

diff --git a/javascripts/core/big_crunch.js b/javascripts/core/big_crunch.js
index 063572e1c..1fd0a6259 100644
--- a/javascripts/core/big_crunch.js
+++ b/javascripts/core/big_crunch.js
@@ -1,6 +1,4 @@
-import { GameMechanicState, RebuyableMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index";
 import { DC } from "./constants";
-import { SpeedrunMilestones } from "./speedrun";
 
 export function bigCrunchAnimation() {
   document.body.style.animation = "implode 2s 1";
@@ -152,311 +150,6 @@ export function secondSoftReset(forcedNDReset = false) {
   AchievementTimers.marathon2.reset();
 }
 
-class ChargedInfinityUpgradeState extends GameMechanicState {
-  constructor(config, upgrade) {
-    super(config);
-    this._upgrade = upgrade;
-  }
-
-  get isEffectActive() {
-    return this._upgrade.isBought && this._upgrade.isCharged;
-  }
-}
-
-export class InfinityUpgrade extends SetPurchasableMechanicState {
-  constructor(config, requirement) {
-    super(config);
-    if (Array.isArray(requirement) || typeof requirement === "function") {
-      this._requirements = requirement;
-    } else if (requirement === undefined) {
-      this._requirements = [];
-    } else {
-      this._requirements = [requirement];
-    }
-    if (config.charged) {
-      this._chargedEffect = new ChargedInfinityUpgradeState(config.charged, this);
-    }
-  }
-
-  get currency() {
-    return Currency.infinityPoints;
-  }
-
-  get set() {
-    return player.infinityUpgrades;
-  }
-
-  get isAvailableForPurchase() {
-    return typeof this._requirements === "function" ? this._requirements()
-      : this._requirements.every(x => x.isBought);
-  }
-
-  get isEffectActive() {
-    return this.isBought && !this.isCharged;
-  }
-
-  get chargedEffect() {
-    return this._chargedEffect;
-  }
-
-  purchase() {
-    if (super.purchase()) {
-      // This applies the 4th column of infinity upgrades retroactively
-      if (this.config.id.includes("skip")) skipResetsIfPossible();
-      EventHub.dispatch(GAME_EVENT.INFINITY_UPGRADE_BOUGHT);
-      return true;
-    }
-    if (this.canCharge) {
-      this.charge();
-      return true;
-    }
-    return false;
-  }
-
-  get hasChargeEffect() {
-    return this.config.charged !== undefined;
-  }
-
-  get isCharged() {
-    return player.celestials.ra.charged.has(this.id);
-  }
-
-  get canCharge() {
-    return this.isBought &&
-      this.hasChargeEffect &&
-      !this.isCharged &&
-      Ra.chargesLeft !== 0 &&
-      !Pelle.isDisabled("chargedInfinityUpgrades");
-  }
-
-  charge() {
-    player.celestials.ra.charged.add(this.id);
-  }
-
-  disCharge() {
-    player.celestials.ra.charged.delete(this.id);
-  }
-}
-
-export function totalIPMult() {
-  if (Effarig.isRunning && Effarig.currentStage === EFFARIG_STAGES.INFINITY) {
-    return DC.D1;
-  }
-  let ipMult = DC.D1
-    .times(ShopPurchase.IPPurchases.currentMult)
-    .timesEffectsOf(
-      TimeStudy(41),
-      TimeStudy(51),
-      TimeStudy(141),
-      TimeStudy(142),
-      TimeStudy(143),
-      Achievement(85),
-      Achievement(93),
-      Achievement(116),
-      Achievement(125),
-      Achievement(141).effects.ipGain,
-      InfinityUpgrade.ipMult,
-      DilationUpgrade.ipMultDT,
-      GlyphEffect.ipMult
-    );
-  ipMult = ipMult.times(Replicanti.amount.powEffectOf(AlchemyResource.exponential));
-  return ipMult;
-}
-
-export function disChargeAll() {
-  const upgrades = [
-    InfinityUpgrade.totalTimeMult,
-    InfinityUpgrade.dim18mult,
-    InfinityUpgrade.dim36mult,
-    InfinityUpgrade.resetBoost,
-    InfinityUpgrade.buy10Mult,
-    InfinityUpgrade.dim27mult,
-    InfinityUpgrade.dim45mult,
-    InfinityUpgrade.galaxyBoost,
-    InfinityUpgrade.thisInfinityTimeMult,
-    InfinityUpgrade.unspentIPMult,
-    InfinityUpgrade.dimboostMult,
-    InfinityUpgrade.ipGen
-  ];
-  for (const upgrade of upgrades) {
-    if (upgrade.isCharged) {
-      upgrade.disCharge();
-    }
-  }
-  player.celestials.ra.disCharge = false;
-}
-
-(function() {
-  const db = GameDatabase.infinity.upgrades;
-  const upgrade = (config, requirement) => new InfinityUpgrade(config, requirement);
-  InfinityUpgrade.totalTimeMult = upgrade(db.totalTimeMult);
-  InfinityUpgrade.dim18mult = upgrade(db.dim18mult, InfinityUpgrade.totalTimeMult);
-  InfinityUpgrade.dim36mult = upgrade(db.dim36mult, InfinityUpgrade.dim18mult);
-  InfinityUpgrade.resetBoost = upgrade(db.resetBoost, InfinityUpgrade.dim36mult);
-
-  InfinityUpgrade.buy10Mult = upgrade(db.buy10Mult);
-  InfinityUpgrade.dim27mult = upgrade(db.dim27mult, InfinityUpgrade.buy10Mult);
-  InfinityUpgrade.dim45mult = upgrade(db.dim45mult, InfinityUpgrade.dim27mult);
-  InfinityUpgrade.galaxyBoost = upgrade(db.galaxyBoost, InfinityUpgrade.dim45mult);
-
-  InfinityUpgrade.thisInfinityTimeMult = upgrade(db.thisInfinityTimeMult);
-  InfinityUpgrade.unspentIPMult = upgrade(db.unspentIPMult, InfinityUpgrade.thisInfinityTimeMult);
-  InfinityUpgrade.dimboostMult = upgrade(db.dimboostMult, InfinityUpgrade.unspentIPMult);
-  InfinityUpgrade.ipGen = upgrade(db.ipGen, InfinityUpgrade.dimboostMult);
-
-  InfinityUpgrade.skipReset1 = upgrade(db.skipReset1);
-  InfinityUpgrade.skipReset2 = upgrade(db.skipReset2, InfinityUpgrade.skipReset1);
-  InfinityUpgrade.skipReset3 = upgrade(db.skipReset3, InfinityUpgrade.skipReset2);
-  InfinityUpgrade.skipResetGalaxy = upgrade(db.skipResetGalaxy, InfinityUpgrade.skipReset3);
-
-  InfinityUpgrade.ipOffline = upgrade(db.ipOffline, () => Achievement(41).isUnlocked);
-}());
-
-// The repeatable 2xIP upgrade has an odd cost structure - it follows a shallow exponential (step *10) up to e3M, at
-// which point it follows a steeper one (step *1e10) up to e6M before finally hardcapping. At the hardcap, there's
-// an extra bump that increases the multipler itself from e993k to e1M. All these numbers are specified in
-// GameDatabase.infinity.upgrades.ipMult
-class InfinityIPMultUpgrade extends GameMechanicState {
-  get cost() {
-    if (this.purchaseCount >= this.purchasesAtIncrease) {
-      return this.config.costIncreaseThreshold
-        .times(Decimal.pow(this.costIncrease, this.purchaseCount - this.purchasesAtIncrease));
-    }
-    return Decimal.pow(this.costIncrease, this.purchaseCount + 1);
-  }
-
-  get purchaseCount() {
-    return player.IPMultPurchases;
-  }
-
-  get purchasesAtIncrease() {
-    return this.config.costIncreaseThreshold.log10() - 1;
-  }
-
-  get hasIncreasedCost() {
-    return this.purchaseCount >= this.purchasesAtIncrease;
-  }
-
-  get costIncrease() {
-    return this.hasIncreasedCost ? 1e10 : 10;
-  }
-
-  get isCapped() {
-    return this.cost.gte(this.config.costCap);
-  }
-
-  get isBought() {
-    return this.isCapped;
-  }
-
-  get isRequirementSatisfied() {
-    return Achievement(41).isUnlocked;
-  }
-
-  get canBeBought() {
-    return !Pelle.isDoomed && !this.isCapped && Currency.infinityPoints.gte(this.cost) && this.isRequirementSatisfied;
-  }
-
-  // This is only ever called with amount = 1 or within buyMax under conditions that ensure the scaling doesn't
-  // change mid-purchase
-  purchase(amount = 1) {
-    if (!this.canBeBought) return;
-    if (!TimeStudy(181).isBought) {
-      Autobuyer.bigCrunch.bumpAmount(DC.D2.pow(amount));
-    }
-    Currency.infinityPoints.subtract(Decimal.sumGeometricSeries(amount, this.cost, this.costIncrease, 0));
-    player.IPMultPurchases += amount;
-    GameUI.update();
-  }
-
-  buyMax() {
-    if (!this.canBeBought) return;
-    if (!this.hasIncreasedCost) {
-      // Only allow IP below the softcap to be used
-      const availableIP = Currency.infinityPoints.value.clampMax(this.config.costIncreaseThreshold);
-      const purchases = Decimal.affordGeometricSeries(availableIP, this.cost, this.costIncrease, 0).toNumber();
-      if (purchases <= 0) return;
-      this.purchase(purchases);
-    }
-    // Do not replace it with `if else` - it's specifically designed to process two sides of threshold separately
-    // (for example, we have 1e4000000 IP and no mult - first it will go to (but not including) 1e3000000 and then
-    // it will go in this part)
-    if (this.hasIncreasedCost) {
-      const availableIP = Currency.infinityPoints.value.clampMax(this.config.costCap);
-      const purchases = Decimal.affordGeometricSeries(availableIP, this.cost, this.costIncrease, 0).toNumber();
-      if (purchases <= 0) return;
-      this.purchase(purchases);
-    }
-  }
-}
-
-InfinityUpgrade.ipMult = new InfinityIPMultUpgrade(GameDatabase.infinity.upgrades.ipMult);
-
-export class BreakInfinityUpgrade extends SetPurchasableMechanicState {
-  get currency() {
-    return Currency.infinityPoints;
-  }
-
-  get set() {
-    return player.infinityUpgrades;
-  }
-
-  onPurchased() {
-    if (this.id === "postGalaxy") {
-      SpeedrunMilestones(7).tryComplete();
-      PelleStrikes.powerGalaxies.trigger();
-    }
-  }
-}
-
-(function() {
-  const db = GameDatabase.infinity.breakUpgrades;
-  const upgrade = props => new BreakInfinityUpgrade(props);
-  BreakInfinityUpgrade.totalAMMult = upgrade(db.totalAMMult);
-  BreakInfinityUpgrade.currentAMMult = upgrade(db.currentAMMult);
-  BreakInfinityUpgrade.galaxyBoost = upgrade(db.galaxyBoost);
-
-  BreakInfinityUpgrade.infinitiedMult = upgrade(db.infinitiedMult);
-  BreakInfinityUpgrade.achievementMult = upgrade(db.achievementMult);
-  BreakInfinityUpgrade.slowestChallengeMult = upgrade(db.slowestChallengeMult);
-
-  BreakInfinityUpgrade.infinitiedGen = upgrade(db.infinitiedGen);
-  BreakInfinityUpgrade.autobuyMaxDimboosts = upgrade(db.autobuyMaxDimboosts);
-  BreakInfinityUpgrade.autobuyerSpeed = upgrade(db.autobuyerSpeed);
-}());
-
-class RebuyableBreakInfinityUpgradeState extends RebuyableMechanicState {
-  get currency() {
-    return Currency.infinityPoints;
-  }
-
-  get boughtAmount() {
-    return player.infinityRebuyables[this.id];
-  }
-
-  set boughtAmount(value) {
-    player.infinityRebuyables[this.id] = value;
-  }
-
-  get isCapped() {
-    return this.boughtAmount === this.config.maxUpgrades;
-  }
-}
-
-BreakInfinityUpgrade.tickspeedCostMult = new class extends RebuyableBreakInfinityUpgradeState {
-  onPurchased() {
-    GameCache.tickSpeedMultDecrease.invalidate();
-  }
-}(GameDatabase.infinity.breakUpgrades.tickspeedCostMult);
-
-BreakInfinityUpgrade.dimCostMult = new class extends RebuyableBreakInfinityUpgradeState {
-  onPurchased() {
-    GameCache.dimensionMultDecrease.invalidate();
-  }
-}(GameDatabase.infinity.breakUpgrades.dimCostMult);
-
-BreakInfinityUpgrade.ipGen = new RebuyableBreakInfinityUpgradeState(GameDatabase.infinity.breakUpgrades.ipGen);
-
 export function preProductionGenerateIP(diff) {
   if (InfinityUpgrade.ipGen.isBought) {
     const genPeriod = Time.bestInfinity.totalMilliseconds * 10;
diff --git a/javascripts/core/break-infinity-upgrades.js b/javascripts/core/break-infinity-upgrades.js
new file mode 100644
index 000000000..fdbaacf19
--- /dev/null
+++ b/javascripts/core/break-infinity-upgrades.js
@@ -0,0 +1,48 @@
+import { RebuyableMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index";
+import { SpeedrunMilestones } from "./speedrun";
+
+export class BreakInfinityUpgradeState extends SetPurchasableMechanicState {
+  get currency() {
+    return Currency.infinityPoints;
+  }
+
+  get set() {
+    return player.infinityUpgrades;
+  }
+
+  onPurchased() {
+    if (this.id === "postGalaxy") {
+      SpeedrunMilestones(7).tryComplete();
+      PelleStrikes.powerGalaxies.trigger();
+    }
+  }
+}
+
+class RebuyableBreakInfinityUpgradeState extends RebuyableMechanicState {
+  get currency() {
+    return Currency.infinityPoints;
+  }
+
+  get boughtAmount() {
+    return player.infinityRebuyables[this.id];
+  }
+
+  set boughtAmount(value) {
+    player.infinityRebuyables[this.id] = value;
+  }
+
+  get isCapped() {
+    return this.boughtAmount === this.config.maxUpgrades;
+  }
+
+  onPurchased() {
+    this.config.onPurchased?.();
+  }
+}
+
+export const BreakInfinityUpgrade = mapGameDataToObject(
+  GameDatabase.infinity.breakUpgrades,
+  config => (config.rebuyable
+    ? new RebuyableBreakInfinityUpgradeState(config)
+    : new BreakInfinityUpgradeState(config))
+);
diff --git a/javascripts/core/globals.js b/javascripts/core/globals.js
index a341628b0..f57e7e930 100644
--- a/javascripts/core/globals.js
+++ b/javascripts/core/globals.js
@@ -68,6 +68,8 @@ export * from "./time-studies/index";
 export * from "./dimboost";
 export * from "./sacrifice";
 export * from "./big_crunch";
+export * from "./infinity-upgrades";
+export * from "./break-infinity-upgrades";
 export * from "./challenge";
 export * from "./eternity";
 export * from "./eternity_challenge";
diff --git a/javascripts/core/infinity-upgrades.js b/javascripts/core/infinity-upgrades.js
new file mode 100644
index 000000000..45c571da3
--- /dev/null
+++ b/javascripts/core/infinity-upgrades.js
@@ -0,0 +1,213 @@
+import { GameMechanicState, SetPurchasableMechanicState } from "./game-mechanics/index";
+import { DC } from "./constants";
+
+class ChargedInfinityUpgradeState extends GameMechanicState {
+  constructor(config, upgrade) {
+    super(config);
+    this._upgrade = upgrade;
+  }
+
+  get isEffectActive() {
+    return this._upgrade.isBought && this._upgrade.isCharged;
+  }
+}
+
+export class InfinityUpgradeState extends SetPurchasableMechanicState {
+  constructor(config) {
+    super(config);
+    if (config.charged) {
+      this._chargedEffect = new ChargedInfinityUpgradeState(config.charged, this);
+    }
+  }
+
+  get currency() {
+    return Currency.infinityPoints;
+  }
+
+  get set() {
+    return player.infinityUpgrades;
+  }
+
+  get isAvailableForPurchase() {
+    return this.config.checkRequirement?.() ?? true;
+  }
+
+  get isEffectActive() {
+    return this.isBought && !this.isCharged;
+  }
+
+  get chargedEffect() {
+    return this._chargedEffect;
+  }
+
+  purchase() {
+    if (super.purchase()) {
+      // This applies the 4th column of infinity upgrades retroactively
+      if (this.config.id.includes("skip")) skipResetsIfPossible();
+      EventHub.dispatch(GAME_EVENT.INFINITY_UPGRADE_BOUGHT);
+      return true;
+    }
+    if (this.canCharge) {
+      this.charge();
+      return true;
+    }
+    return false;
+  }
+
+  get hasChargeEffect() {
+    return this.config.charged !== undefined;
+  }
+
+  get isCharged() {
+    return player.celestials.ra.charged.has(this.id);
+  }
+
+  get canCharge() {
+    return this.isBought &&
+      this.hasChargeEffect &&
+      !this.isCharged &&
+      Ra.chargesLeft !== 0 &&
+      !Pelle.isDisabled("chargedInfinityUpgrades");
+  }
+
+  charge() {
+    player.celestials.ra.charged.add(this.id);
+  }
+
+  disCharge() {
+    player.celestials.ra.charged.delete(this.id);
+  }
+}
+
+export function totalIPMult() {
+  if (Effarig.isRunning && Effarig.currentStage === EFFARIG_STAGES.INFINITY) {
+    return DC.D1;
+  }
+  let ipMult = DC.D1
+    .times(ShopPurchase.IPPurchases.currentMult)
+    .timesEffectsOf(
+      TimeStudy(41),
+      TimeStudy(51),
+      TimeStudy(141),
+      TimeStudy(142),
+      TimeStudy(143),
+      Achievement(85),
+      Achievement(93),
+      Achievement(116),
+      Achievement(125),
+      Achievement(141).effects.ipGain,
+      InfinityUpgrade.ipMult,
+      DilationUpgrade.ipMultDT,
+      GlyphEffect.ipMult
+    );
+  ipMult = ipMult.times(Replicanti.amount.powEffectOf(AlchemyResource.exponential));
+  return ipMult;
+}
+
+export function disChargeAll() {
+  const upgrades = [
+    InfinityUpgrade.totalTimeMult,
+    InfinityUpgrade.dim18mult,
+    InfinityUpgrade.dim36mult,
+    InfinityUpgrade.resetBoost,
+    InfinityUpgrade.buy10Mult,
+    InfinityUpgrade.dim27mult,
+    InfinityUpgrade.dim45mult,
+    InfinityUpgrade.galaxyBoost,
+    InfinityUpgrade.thisInfinityTimeMult,
+    InfinityUpgrade.unspentIPMult,
+    InfinityUpgrade.dimboostMult,
+    InfinityUpgrade.ipGen
+  ];
+  for (const upgrade of upgrades) {
+    if (upgrade.isCharged) {
+      upgrade.disCharge();
+    }
+  }
+  player.celestials.ra.disCharge = false;
+}
+
+// The repeatable 2xIP upgrade has an odd cost structure - it follows a shallow exponential (step *10) up to e3M, at
+// which point it follows a steeper one (step *1e10) up to e6M before finally hardcapping. At the hardcap, there's
+// an extra bump that increases the multipler itself from e993k to e1M. All these numbers are specified in
+// GameDatabase.infinity.upgrades.ipMult
+class InfinityIPMultUpgrade extends GameMechanicState {
+  get cost() {
+    if (this.purchaseCount >= this.purchasesAtIncrease) {
+      return this.config.costIncreaseThreshold
+        .times(Decimal.pow(this.costIncrease, this.purchaseCount - this.purchasesAtIncrease));
+    }
+    return Decimal.pow(this.costIncrease, this.purchaseCount + 1);
+  }
+
+  get purchaseCount() {
+    return player.IPMultPurchases;
+  }
+
+  get purchasesAtIncrease() {
+    return this.config.costIncreaseThreshold.log10() - 1;
+  }
+
+  get hasIncreasedCost() {
+    return this.purchaseCount >= this.purchasesAtIncrease;
+  }
+
+  get costIncrease() {
+    return this.hasIncreasedCost ? 1e10 : 10;
+  }
+
+  get isCapped() {
+    return this.cost.gte(this.config.costCap);
+  }
+
+  get isBought() {
+    return this.isCapped;
+  }
+
+  get isRequirementSatisfied() {
+    return Achievement(41).isUnlocked;
+  }
+
+  get canBeBought() {
+    return !Pelle.isDoomed && !this.isCapped && Currency.infinityPoints.gte(this.cost) && this.isRequirementSatisfied;
+  }
+
+  // This is only ever called with amount = 1 or within buyMax under conditions that ensure the scaling doesn't
+  // change mid-purchase
+  purchase(amount = 1) {
+    if (!this.canBeBought) return;
+    if (!TimeStudy(181).isBought) {
+      Autobuyer.bigCrunch.bumpAmount(DC.D2.pow(amount));
+    }
+    Currency.infinityPoints.subtract(Decimal.sumGeometricSeries(amount, this.cost, this.costIncrease, 0));
+    player.IPMultPurchases += amount;
+    GameUI.update();
+  }
+
+  buyMax() {
+    if (!this.canBeBought) return;
+    if (!this.hasIncreasedCost) {
+      // Only allow IP below the softcap to be used
+      const availableIP = Currency.infinityPoints.value.clampMax(this.config.costIncreaseThreshold);
+      const purchases = Decimal.affordGeometricSeries(availableIP, this.cost, this.costIncrease, 0).toNumber();
+      if (purchases <= 0) return;
+      this.purchase(purchases);
+    }
+    // Do not replace it with `if else` - it's specifically designed to process two sides of threshold separately
+    // (for example, we have 1e4000000 IP and no mult - first it will go to (but not including) 1e3000000 and then
+    // it will go in this part)
+    if (this.hasIncreasedCost) {
+      const availableIP = Currency.infinityPoints.value.clampMax(this.config.costCap);
+      const purchases = Decimal.affordGeometricSeries(availableIP, this.cost, this.costIncrease, 0).toNumber();
+      if (purchases <= 0) return;
+      this.purchase(purchases);
+    }
+  }
+}
+
+export const InfinityUpgrade = mapGameDataToObject(
+  GameDatabase.infinity.upgrades,
+  config => (config.id === "ipMult"
+    ? new InfinityIPMultUpgrade(config)
+    : new InfinityUpgradeState(config))
+);
diff --git a/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js b/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js
index 9c0a606f3..f3d1edd08 100644
--- a/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js
+++ b/javascripts/core/secret-formula/infinity/break-infinity-upgrades.js
@@ -1,145 +1,148 @@
 import { DC } from "../../constants";
 import { GameDatabase } from "../game-database";
 
-GameDatabase.infinity.breakUpgrades = (function() {
-  function rebuyable(config) {
-    const effectFunction = config.effect || (x => x);
-    return {
-      id: config.id,
-      cost: () => config.initialCost * Math.pow(config.costIncrease, player.infinityRebuyables[config.id]),
-      maxUpgrades: config.maxUpgrades,
-      description: config.description,
-      effect: () => effectFunction(player.infinityRebuyables[config.id]),
-      isDisabled: config.isDisabled,
-      // There isn't enough room in the button to fit the EC reduction and "Next:" at the same time while still
-      // presenting all the information in an understandable way, so we only show it if the upgrade is maxed
-      formatEffect: config.formatEffect ||
-        (value => {
-          const afterECText = config.afterEC ? config.afterEC() : "";
-          return value === config.maxUpgrades
-            ? `Default: ${formatX(10)} | Currently: ${formatX(10 - value)} ${afterECText}`
-            : `Default: ${formatX(10)} | Currently: ${formatX(10 - value)} Next: ${formatX(10 - value - 1)}`;
-        }),
-      formatCost: value => format(value, 2, 0),
-      noLabel: !config.label
-    };
-  }
-
+function rebuyable(config) {
+  const effectFunction = config.effect || (x => x);
+  const { id, maxUpgrades, description, isDisabled, noLabel, onPurchased } = config;
   return {
-    totalAMMult: {
-      id: "totalMult",
-      cost: 1e4,
-      description: "Antimatter Dimensions gain a multiplier based on total antimatter produced",
-      effect: () => Math.pow(player.records.totalAntimatter.exponent + 1, 0.5),
-      formatEffect: value => formatX(value, 2, 2)
-    },
-    currentAMMult: {
-      id: "currentMult",
-      cost: 5e4,
-      description: "Antimatter Dimensions gain a multiplier based on current antimatter",
-      effect: () => Math.pow(Currency.antimatter.exponent + 1, 0.5),
-      formatEffect: value => formatX(value, 2, 2)
-    },
-    galaxyBoost: {
-      id: "postGalaxy",
-      cost: 5e11,
-      description: () => `All Galaxies are ${formatPercents(0.5)} stronger`,
-      effect: 1.5
-    },
-    infinitiedMult: {
-      id: "infinitiedMult",
-      cost: 1e5,
-      description: "Antimatter Dimensions gain a multiplier based on Infinities",
-      effect: () => 1 + Currency.infinitiesTotal.value.pLog10() * 10,
-      formatEffect: value => formatX(value, 2, 2)
-    },
-    achievementMult: {
-      id: "achievementMult",
-      cost: 1e6,
-      description: "Additional multiplier to Antimatter Dimensions based on Achievements completed",
-      effect: () => Math.max(Math.pow((Achievements.effectiveCount - 30), 3) / 40, 1),
-      formatEffect: value => formatX(value, 2, 2)
-    },
-    slowestChallengeMult: {
-      id: "challengeMult",
-      cost: 1e7,
-      description: "Antimatter Dimensions gain a multiplier based on slowest challenge run",
-      effect: () => Decimal.clampMin(50 / Time.worstChallenge.totalMinutes, 1),
-      formatEffect: value => formatX(value, 2, 2),
-      hasCap: true,
-      cap: DC.D3E4
-    },
-    infinitiedGen: {
-      id: "infinitiedGeneration",
-      cost: 2e7,
-      description: () => (Pelle.isDoomed
-        ? "This upgrade has no effect while in Doomed"
-        : "Passively generate Infinities based on your fastest Infinity"),
-      effect: () => player.records.bestInfinity.time,
-      formatEffect: value => {
-        if (Pelle.isDoomed) return "Disabled";
-        if (value === Number.MAX_VALUE && !Pelle.isDoomed) return "No Infinity generation";
-        let infinities = DC.D1;
-        infinities = infinities.timesEffectsOf(
-          RealityUpgrade(5),
-          RealityUpgrade(7),
-          Ra.unlocks.continuousTTBoost.effects.infinity
-        );
-        infinities = infinities.times(getAdjustedGlyphEffect("infinityinfmult"));
-        return `${quantify("Infinity", infinities)} every ${Time.bestInfinity.times(5).toStringShort()}`;
-      }
-    },
-    autobuyMaxDimboosts: {
-      id: "autobuyMaxDimboosts",
-      cost: 5e9,
-      description: "Unlock the buy max Dimension Boost Autobuyer mode"
-    },
-    autobuyerSpeed: {
-      id: "autoBuyerUpgrade",
-      cost: 1e15,
-      description: "Autobuyers unlocked or improved by Normal Challenges work twice as fast"
-    },
-    tickspeedCostMult: rebuyable({
-      id: 0,
-      initialCost: 1e6,
-      costIncrease: 5,
-      maxUpgrades: 8,
-      description: "Reduce post-infinity Tickspeed Upgrade cost multiplier scaling",
-      afterEC: () => (EternityChallenge(11).completions > 0
-        ? `After EC11: ${formatX(Player.tickSpeedMultDecrease, 2, 2)}`
-        : ""
-      ),
-      label: false,
-    }),
-    dimCostMult: rebuyable({
-      id: 1,
-      initialCost: 1e7,
-      costIncrease: 5e3,
-      maxUpgrades: 7,
-      description: "Reduce post-infinity Antimatter Dimension cost multiplier scaling",
-      afterEC: () => (EternityChallenge(6).completions > 0
-        ? `After EC6: ${formatX(Player.dimensionMultDecrease, 2, 2)}`
-        : ""
-      ),
-      label: false,
-    }),
-    ipGen: rebuyable({
-      id: 2,
-      initialCost: 1e7,
-      costIncrease: 10,
-      maxUpgrades: 10,
-      effect: value => Player.bestRunIPPM.times(value / 20),
-      description: () => {
-        let generation = `Generate ${formatInt(5 * player.infinityRebuyables[2])}%`;
-        if (!BreakInfinityUpgrade.ipGen.isCapped) {
-          generation += ` ➜ ${formatInt(5 * (1 + player.infinityRebuyables[2]))}%`;
-        }
-        const offlineString = player.options.offlineProgress ? ", works offline" : "";
-        return `${generation} of your best IP/min from your last 10 Infinities${offlineString}`;
-      },
-      isDisabled: effect => effect.eq(0),
-      formatEffect: value => `${format(value, 2, 1)} IP/min`,
-      label: true
-    })
+    rebuyable: true,
+    id,
+    cost: () => config.initialCost * Math.pow(config.costIncrease, player.infinityRebuyables[config.id]),
+    maxUpgrades,
+    description,
+    effect: () => effectFunction(player.infinityRebuyables[config.id]),
+    isDisabled,
+    // There isn't enough room in the button to fit the EC reduction and "Next:" at the same time while still
+    // presenting all the information in an understandable way, so we only show it if the upgrade is maxed
+    formatEffect: config.formatEffect ||
+      (value => {
+        const afterECText = config.afterEC ? config.afterEC() : "";
+        return value === config.maxUpgrades
+          ? `Default: ${formatX(10)} | Currently: ${formatX(10 - value)} ${afterECText}`
+          : `Default: ${formatX(10)} | Currently: ${formatX(10 - value)} Next: ${formatX(10 - value - 1)}`;
+      }),
+    formatCost: value => format(value, 2, 0),
+    noLabel,
+    onPurchased
   };
-}());
+}
+
+GameDatabase.infinity.breakUpgrades = {
+  totalAMMult: {
+    id: "totalMult",
+    cost: 1e4,
+    description: "Antimatter Dimensions gain a multiplier based on total antimatter produced",
+    effect: () => Math.pow(player.records.totalAntimatter.exponent + 1, 0.5),
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  currentAMMult: {
+    id: "currentMult",
+    cost: 5e4,
+    description: "Antimatter Dimensions gain a multiplier based on current antimatter",
+    effect: () => Math.pow(Currency.antimatter.exponent + 1, 0.5),
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  galaxyBoost: {
+    id: "postGalaxy",
+    cost: 5e11,
+    description: () => `All Galaxies are ${formatPercents(0.5)} stronger`,
+    effect: 1.5
+  },
+  infinitiedMult: {
+    id: "infinitiedMult",
+    cost: 1e5,
+    description: "Antimatter Dimensions gain a multiplier based on Infinities",
+    effect: () => 1 + Currency.infinitiesTotal.value.pLog10() * 10,
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  achievementMult: {
+    id: "achievementMult",
+    cost: 1e6,
+    description: "Additional multiplier to Antimatter Dimensions based on Achievements completed",
+    effect: () => Math.max(Math.pow((Achievements.effectiveCount - 30), 3) / 40, 1),
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  slowestChallengeMult: {
+    id: "challengeMult",
+    cost: 1e7,
+    description: "Antimatter Dimensions gain a multiplier based on slowest challenge run",
+    effect: () => Decimal.clampMin(50 / Time.worstChallenge.totalMinutes, 1),
+    formatEffect: value => formatX(value, 2, 2),
+    hasCap: true,
+    cap: DC.D3E4
+  },
+  infinitiedGen: {
+    id: "infinitiedGeneration",
+    cost: 2e7,
+    description: () => (Pelle.isDoomed
+      ? "This upgrade has no effect while in Doomed"
+      : "Passively generate Infinities based on your fastest Infinity"),
+    effect: () => player.records.bestInfinity.time,
+    formatEffect: value => {
+      if (Pelle.isDoomed) return "Disabled";
+      if (value === Number.MAX_VALUE && !Pelle.isDoomed) return "No Infinity generation";
+      let infinities = DC.D1;
+      infinities = infinities.timesEffectsOf(
+        RealityUpgrade(5),
+        RealityUpgrade(7),
+        Ra.unlocks.continuousTTBoost.effects.infinity
+      );
+      infinities = infinities.times(getAdjustedGlyphEffect("infinityinfmult"));
+      return `${quantify("Infinity", infinities)} every ${Time.bestInfinity.times(5).toStringShort()}`;
+    }
+  },
+  autobuyMaxDimboosts: {
+    id: "autobuyMaxDimboosts",
+    cost: 5e9,
+    description: "Unlock the buy max Dimension Boost Autobuyer mode"
+  },
+  autobuyerSpeed: {
+    id: "autoBuyerUpgrade",
+    cost: 1e15,
+    description: "Autobuyers unlocked or improved by Normal Challenges work twice as fast"
+  },
+  tickspeedCostMult: rebuyable({
+    id: 0,
+    initialCost: 1e6,
+    costIncrease: 5,
+    maxUpgrades: 8,
+    description: "Reduce post-infinity Tickspeed Upgrade cost multiplier scaling",
+    afterEC: () => (EternityChallenge(11).completions > 0
+      ? `After EC11: ${formatX(Player.tickSpeedMultDecrease, 2, 2)}`
+      : ""
+    ),
+    noLabel: true,
+    onPurchased: () => GameCache.tickSpeedMultDecrease.invalidate()
+  }),
+  dimCostMult: rebuyable({
+    id: 1,
+    initialCost: 1e7,
+    costIncrease: 5e3,
+    maxUpgrades: 7,
+    description: "Reduce post-infinity Antimatter Dimension cost multiplier scaling",
+    afterEC: () => (EternityChallenge(6).completions > 0
+      ? `After EC6: ${formatX(Player.dimensionMultDecrease, 2, 2)}`
+      : ""
+    ),
+    noLabel: true,
+    onPurchased: () => GameCache.dimensionMultDecrease.invalidate()
+  }),
+  ipGen: rebuyable({
+    id: 2,
+    initialCost: 1e7,
+    costIncrease: 10,
+    maxUpgrades: 10,
+    effect: value => Player.bestRunIPPM.times(value / 20),
+    description: () => {
+      let generation = `Generate ${formatInt(5 * player.infinityRebuyables[2])}%`;
+      if (!BreakInfinityUpgrade.ipGen.isCapped) {
+        generation += ` ➜ ${formatInt(5 * (1 + player.infinityRebuyables[2]))}%`;
+      }
+      const offlineString = player.options.offlineProgress ? ", works offline" : "";
+      return `${generation} of your best IP/min from your last 10 Infinities${offlineString}`;
+    },
+    isDisabled: effect => effect.eq(0),
+    formatEffect: value => `${format(value, 2, 1)} IP/min`,
+    noLabel: false
+  })
+};
diff --git a/javascripts/core/secret-formula/infinity/infinity-upgrades.js b/javascripts/core/secret-formula/infinity/infinity-upgrades.js
index 0d9db2860..bc0b9e33f 100644
--- a/javascripts/core/secret-formula/infinity/infinity-upgrades.js
+++ b/javascripts/core/secret-formula/infinity/infinity-upgrades.js
@@ -1,227 +1,241 @@
 import { DC } from "../../constants";
 import { GameDatabase } from "../game-database";
 
-GameDatabase.infinity.upgrades = (function() {
-  function dimInfinityMult() {
-    return Currency.infinitiesTotal.value.times(0.2).plus(1);
-  }
-  function chargedDimInfinityMult() {
-    return 1 + Math.log10(Math.max(1, Currency.infinitiesTotal.value.pLog10())) * Math.sqrt(Ra.pets.teresa.level) / 150;
-  }
-  return {
-    totalTimeMult: {
-      id: "timeMult",
-      cost: 1,
-      description: "Antimatter Dimensions gain a multiplier based on time played",
-      effect: () => Math.pow(Time.totalTimePlayed.totalMinutes / 2, 0.15),
-      formatEffect: value => formatX(value, 2, 2),
-      charged: {
-        description: "Antimatter Dimensions gain a power effect based on time played and Teresa level",
-        effect: () => 1 +
-          Math.log10(Math.log10(Time.totalTimePlayed.totalMilliseconds)) *
-          Math.pow(Ra.pets.teresa.level, 0.5) / 150,
-        formatEffect: value => formatPow(value, 4, 4)
-      }
-    },
-    dim18mult: {
-      id: "18Mult",
-      cost: 1,
-      description: "1st and 8th Antimatter Dimensions gain a multiplier based on Infinities",
-      effect: () => dimInfinityMult(),
-      formatEffect: value => formatX(value, 1, 1),
-      charged: {
-        description: "1st and 8th Antimatter Dimensions gain a power effect based on Infinities and Teresa level",
-        effect: () => chargedDimInfinityMult(),
-        formatEffect: value => formatPow(value, 4, 4)
-      }
-    },
-    dim27mult: {
-      id: "27Mult",
-      cost: 1,
-      description: "2nd and 7th Antimatter Dimensions gain a multiplier based on Infinities",
-      effect: () => dimInfinityMult(),
-      formatEffect: value => formatX(value, 1, 1),
-      charged: {
-        description: "2nd and 7th Antimatter Dimensions gain a power effect based on Infinities and Teresa level",
-        effect: () => chargedDimInfinityMult(),
-        formatEffect: value => formatPow(value, 4, 4)
-      }
-    },
-    dim36mult: {
-      id: "36Mult",
-      cost: 1,
-      description: "3rd and 6th Antimatter Dimensions gain a multiplier based on Infinities",
-      effect: () => dimInfinityMult(),
-      formatEffect: value => formatX(value, 1, 1),
-      charged: {
-        description: "3rd and 6th Antimatter Dimensions gain a power effect based on Infinities and Teresa level",
-        effect: () => chargedDimInfinityMult(),
-        formatEffect: value => formatPow(value, 4, 4)
-      }
-    },
-    dim45mult: {
-      id: "45Mult",
-      cost: 1,
-      description: "4th and 5th Antimatter Dimensions gain a multiplier based on Infinities",
-      effect: () => dimInfinityMult(),
-      formatEffect: value => formatX(value, 1, 1),
-      charged: {
-        description: "4th and 5th Antimatter Dimensions gain a power effect based on Infinities and Teresa level",
-        effect: () => chargedDimInfinityMult(),
-        formatEffect: value => formatPow(value, 4, 4)
-      }
-    },
-    resetBoost: {
-      id: "resetBoost",
-      cost: 1,
-      description: () =>
-        `Decrease the number of Dimensions needed for Dimension Boosts and Antimatter Galaxies by ${formatInt(9)}`,
-      effect: 9,
-      charged: {
-        description: () => "Decrease Dimension Boost requirement based on Teresa level",
-        effect: () => 1 / (1 + Math.sqrt(Ra.pets.teresa.level) / 10),
-        formatEffect: value => `${formatX(value, 4, 4)}`
-      }
-    },
-    buy10Mult: {
-      id: "dimMult",
-      cost: 1,
-      description: () => `Increase the multiplier for buying ${formatInt(10)} Antimatter Dimensions`,
-      effect: () => 1.1,
-      formatEffect: () => `${formatX(2, 0, 1)} ➜ ${formatX(2.2, 0, 1)}`,
-      charged: {
-        description: () => `The multiplier for buying ${formatInt(10)} Antimatter Dimensions gains ` +
-          "a power effect based on Teresa level",
-        effect: () => 1 + Ra.pets.teresa.level / 200,
-        formatEffect: value => formatPow(value, 3, 3)
-      }
-    },
-    galaxyBoost: {
-      id: "galaxyBoost",
-      cost: 2,
-      description: "All Galaxies are twice as strong",
-      effect: 2,
-      charged: {
-        description: "All Galaxies are stronger based on Teresa level",
-        effect: () => 2 + Math.sqrt(Ra.pets.teresa.level) / 100,
-        formatEffect: value => `+${formatPercents(value - 1)}`
-      }
-    },
-    thisInfinityTimeMult: {
-      id: "timeMult2",
-      cost: 3,
-      description: "Antimatter Dimensions gain a multiplier based on time spent in current Infinity",
-      effect: () => Decimal.max(Math.pow(Time.thisInfinity.totalMinutes / 4, 0.25), 1),
-      formatEffect: value => formatX(value, 2, 2),
-      charged: {
-        description:
-          "Antimatter Dimensions gain a power effect based on time spent in current Infinity and Teresa level",
-        effect: () => 1 +
-          Math.log10(Math.log10(Time.thisInfinity.totalMilliseconds + 100)) *
-          Math.sqrt(Ra.pets.teresa.level) / 150,
-        formatEffect: value => formatPow(value, 4, 4)
-      }
-    },
-    unspentIPMult: {
-      id: "unspentBonus",
-      cost: 5,
-      description: "Multiplier to 1st Antimatter Dimension based on unspent Infinity Points",
-      effect: () => Currency.infinityPoints.value.dividedBy(2).pow(1.5).plus(1),
-      formatEffect: value => formatX(value, 2, 2),
-      charged: {
-        description: "Multiplier to 1st Antimatter Dimension based on unspent Infinity Points, powered by Teresa level",
-        effect: () => Currency.infinityPoints.value.dividedBy(2).pow(Math.sqrt(Ra.pets.teresa.level) * 1.5).plus(1),
-        formatEffect: value => formatX(value, 2, 2)
-      }
-    },
-    dimboostMult: {
-      id: "resetMult",
-      cost: 7,
-      description: "Increase Dimension Boost multiplier",
-      effect: () => 2.5,
-      formatEffect: () => `${formatX(2, 0, 1)} ➜ ${formatX(2.5, 0, 1)}`,
-      charged: {
-        description: "Dimension Boost multiplier gains a power effect based on Teresa level",
-        effect: () => 1 + Ra.pets.teresa.level / 200,
-        formatEffect: value => formatPow(value, 3, 3)
-      }
-    },
-    ipGen: {
-      id: "passiveGen",
-      cost: 10,
-      description: () => (Pelle.isDoomed
-        ? "This upgrade has no effect while in Doomed"
-        : `Passively generate Infinity Points ${formatInt(10)} times slower than your fastest Infinity`),
-      // Cutting corners: this is not actual effect, but it is totalIPMult that is displyed on upgrade
-      effect: () => (Teresa.isRunning || V.isRunning || Pelle.isDoomed ? DC.D0 : GameCache.totalIPMult.value),
-      formatEffect: value => {
-        if (Teresa.isRunning || V.isRunning) return "Disabled in this reality";
-        if (Pelle.isDoomed) return "Disabled";
-        const income = format(value, 2, 0);
-        const period = player.records.bestInfinity.time >= 999999999999
-          ? "∞"
-          : Time.bestInfinity.times(10).toStringShort();
-        return `${income} every ${period}`;
-      },
-      charged: {
-        description: () =>
-          `Gain a percentage of your Reality Machines gained on Reality each real-time second,
-          percent increases with Teresa level`,
-        effect: () => Math.sqrt(Ra.pets.teresa.level) / 1000 *
-          Ra.unlocks.continuousTTBoost.effects.autoPrestige.effectOrDefault(1),
-        formatEffect: value => `${formatPercents(value, 2)}`
-      }
-    },
-    skipReset1: {
-      id: "skipReset1",
-      cost: 20,
-      description: () =>
-        `Start every reset with ${formatInt(1)} Dimension Boost, automatically unlocking the 5th Antimatter Dimension`,
-    },
-    skipReset2: {
-      id: "skipReset2",
-      cost: 40,
-      description: () =>
-        `Start every reset with ${formatInt(2)} Dimension Boosts, automatically unlocking the 6th Antimatter Dimension`,
-    },
-    skipReset3: {
-      id: "skipReset3",
-      cost: 80,
-      description: () =>
-        `Start every reset with ${formatInt(3)} Dimension Boosts, automatically unlocking the 7th Antimatter Dimension`,
-    },
-    skipResetGalaxy: {
-      id: "skipResetGalaxy",
-      cost: 300,
-      description: () =>
-        `Start every reset with ${formatInt(4)} Dimension Boosts, automatically unlocking the 8th Antimatter Dimension;
-        and an Antimatter Galaxy`,
-    },
-    ipOffline: {
-      id: "ipOffline",
-      cost: 1000,
-      description: () => (player.options.offlineProgress
-        ? `Only while offline, gain ${formatPercents(0.5)} of your best IP/min without using Max All`
-        : "This upgrade would give offline Infinity Point generation, but offline progress is currently disabled"),
-      effect: () => (player.options.offlineProgress
-        ? player.records.thisEternity.bestIPMsWithoutMaxAll.times(TimeSpan.fromMinutes(1).totalMilliseconds / 2)
-        : DC.D0),
-      isDisabled: () => !player.options.offlineProgress,
-      formatEffect: value => `${format(value, 2, 2)} IP/min`,
-    },
-    ipMult: {
-      id: "ipMult",
-      cost: () => InfinityUpgrade.ipMult.cost,
-      costCap: DC.E6E6,
-      costIncreaseThreshold: DC.E3E6,
-      description: () => (Pelle.isDoomed
-        ? "This upgrade has no effect while in Doomed"
-        : `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)),
-      cap: () => Effarig.eternityCap ?? DC.E1E6,
-      formatEffect: value => formatX(value, 2, 2),
+
+function dimInfinityMult() {
+  return Currency.infinitiesTotal.value.times(0.2).plus(1);
+}
+function chargedDimInfinityMult() {
+  return 1 + Math.log10(Math.max(1, Currency.infinitiesTotal.value.pLog10())) * Math.sqrt(Ra.pets.teresa.level) / 150;
+}
+
+GameDatabase.infinity.upgrades = {
+  totalTimeMult: {
+    id: "timeMult",
+    cost: 1,
+    description: "Antimatter Dimensions gain a multiplier based on time played",
+    effect: () => Math.pow(Time.totalTimePlayed.totalMinutes / 2, 0.15),
+    formatEffect: value => formatX(value, 2, 2),
+    charged: {
+      description: "Antimatter Dimensions gain a power effect based on time played and Teresa level",
+      effect: () => 1 +
+        Math.log10(Math.log10(Time.totalTimePlayed.totalMilliseconds)) *
+        Math.pow(Ra.pets.teresa.level, 0.5) / 150,
+      formatEffect: value => formatPow(value, 4, 4)
     }
-  };
-}());
+  },
+  dim18mult: {
+    id: "18Mult",
+    cost: 1,
+    checkRequirement: () => InfinityUpgrade.totalTimeMult.isBought,
+    description: "1st and 8th Antimatter Dimensions gain a multiplier based on Infinities",
+    effect: () => dimInfinityMult(),
+    formatEffect: value => formatX(value, 1, 1),
+    charged: {
+      description: "1st and 8th Antimatter Dimensions gain a power effect based on Infinities and Teresa level",
+      effect: () => chargedDimInfinityMult(),
+      formatEffect: value => formatPow(value, 4, 4)
+    }
+  },
+  dim27mult: {
+    id: "27Mult",
+    cost: 1,
+    checkRequirement: () => InfinityUpgrade.buy10Mult.isBought,
+    description: "2nd and 7th Antimatter Dimensions gain a multiplier based on Infinities",
+    effect: () => dimInfinityMult(),
+    formatEffect: value => formatX(value, 1, 1),
+    charged: {
+      description: "2nd and 7th Antimatter Dimensions gain a power effect based on Infinities and Teresa level",
+      effect: () => chargedDimInfinityMult(),
+      formatEffect: value => formatPow(value, 4, 4)
+    }
+  },
+  dim36mult: {
+    id: "36Mult",
+    cost: 1,
+    checkRequirement: () => InfinityUpgrade.dim18mult.isBought,
+    description: "3rd and 6th Antimatter Dimensions gain a multiplier based on Infinities",
+    effect: () => dimInfinityMult(),
+    formatEffect: value => formatX(value, 1, 1),
+    charged: {
+      description: "3rd and 6th Antimatter Dimensions gain a power effect based on Infinities and Teresa level",
+      effect: () => chargedDimInfinityMult(),
+      formatEffect: value => formatPow(value, 4, 4)
+    }
+  },
+  dim45mult: {
+    id: "45Mult",
+    cost: 1,
+    checkRequirement: () => InfinityUpgrade.dim27mult.isBought,
+    description: "4th and 5th Antimatter Dimensions gain a multiplier based on Infinities",
+    effect: () => dimInfinityMult(),
+    formatEffect: value => formatX(value, 1, 1),
+    charged: {
+      description: "4th and 5th Antimatter Dimensions gain a power effect based on Infinities and Teresa level",
+      effect: () => chargedDimInfinityMult(),
+      formatEffect: value => formatPow(value, 4, 4)
+    }
+  },
+  resetBoost: {
+    id: "resetBoost",
+    cost: 1,
+    checkRequirement: () => InfinityUpgrade.dim36mult.isBought,
+    description: () =>
+      `Decrease the number of Dimensions needed for Dimension Boosts and Antimatter Galaxies by ${formatInt(9)}`,
+    effect: 9,
+    charged: {
+      description: () => "Decrease Dimension Boost requirement based on Teresa level",
+      effect: () => 1 / (1 + Math.sqrt(Ra.pets.teresa.level) / 10),
+      formatEffect: value => `${formatX(value, 4, 4)}`
+    }
+  },
+  buy10Mult: {
+    id: "dimMult",
+    cost: 1,
+    description: () => `Increase the multiplier for buying ${formatInt(10)} Antimatter Dimensions`,
+    effect: () => 1.1,
+    formatEffect: () => `${formatX(2, 0, 1)} ➜ ${formatX(2.2, 0, 1)}`,
+    charged: {
+      description: () => `The multiplier for buying ${formatInt(10)} Antimatter Dimensions gains ` +
+        "a power effect based on Teresa level",
+      effect: () => 1 + Ra.pets.teresa.level / 200,
+      formatEffect: value => formatPow(value, 3, 3)
+    }
+  },
+  galaxyBoost: {
+    id: "galaxyBoost",
+    cost: 2,
+    checkRequirement: () => InfinityUpgrade.dim45mult.isBought,
+    description: "All Galaxies are twice as strong",
+    effect: 2,
+    charged: {
+      description: "All Galaxies are stronger based on Teresa level",
+      effect: () => 2 + Math.sqrt(Ra.pets.teresa.level) / 100,
+      formatEffect: value => `+${formatPercents(value - 1)}`
+    }
+  },
+  thisInfinityTimeMult: {
+    id: "timeMult2",
+    cost: 3,
+    description: "Antimatter Dimensions gain a multiplier based on time spent in current Infinity",
+    effect: () => Decimal.max(Math.pow(Time.thisInfinity.totalMinutes / 4, 0.25), 1),
+    formatEffect: value => formatX(value, 2, 2),
+    charged: {
+      description:
+        "Antimatter Dimensions gain a power effect based on time spent in current Infinity and Teresa level",
+      effect: () => 1 +
+        Math.log10(Math.log10(Time.thisInfinity.totalMilliseconds + 100)) *
+        Math.sqrt(Ra.pets.teresa.level) / 150,
+      formatEffect: value => formatPow(value, 4, 4)
+    }
+  },
+  unspentIPMult: {
+    id: "unspentBonus",
+    cost: 5,
+    checkRequirement: () => InfinityUpgrade.thisInfinityTimeMult.isBought,
+    description: "Multiplier to 1st Antimatter Dimension based on unspent Infinity Points",
+    effect: () => Currency.infinityPoints.value.dividedBy(2).pow(1.5).plus(1),
+    formatEffect: value => formatX(value, 2, 2),
+    charged: {
+      description: "Multiplier to 1st Antimatter Dimension based on unspent Infinity Points, powered by Teresa level",
+      effect: () => Currency.infinityPoints.value.dividedBy(2).pow(Math.sqrt(Ra.pets.teresa.level) * 1.5).plus(1),
+      formatEffect: value => formatX(value, 2, 2)
+    }
+  },
+  dimboostMult: {
+    id: "resetMult",
+    cost: 7,
+    checkRequirement: () => InfinityUpgrade.unspentIPMult.isBought,
+    description: "Increase Dimension Boost multiplier",
+    effect: () => 2.5,
+    formatEffect: () => `${formatX(2, 0, 1)} ➜ ${formatX(2.5, 0, 1)}`,
+    charged: {
+      description: "Dimension Boost multiplier gains a power effect based on Teresa level",
+      effect: () => 1 + Ra.pets.teresa.level / 200,
+      formatEffect: value => formatPow(value, 3, 3)
+    }
+  },
+  ipGen: {
+    id: "passiveGen",
+    cost: 10,
+    checkRequirement: () => InfinityUpgrade.dimboostMult.isBought,
+    description: () => (Pelle.isDoomed
+      ? "This upgrade has no effect while in Doomed"
+      : `Passively generate Infinity Points ${formatInt(10)} times slower than your fastest Infinity`),
+    // Cutting corners: this is not actual effect, but it is totalIPMult that is displyed on upgrade
+    effect: () => (Teresa.isRunning || V.isRunning || Pelle.isDoomed ? DC.D0 : GameCache.totalIPMult.value),
+    formatEffect: value => {
+      if (Teresa.isRunning || V.isRunning) return "Disabled in this reality";
+      if (Pelle.isDoomed) return "Disabled";
+      const income = format(value, 2, 0);
+      const period = player.records.bestInfinity.time >= 999999999999
+        ? "∞"
+        : Time.bestInfinity.times(10).toStringShort();
+      return `${income} every ${period}`;
+    },
+    charged: {
+      description: () =>
+        `Gain a percentage of your Reality Machines gained on Reality each real-time second,
+        percent increases with Teresa level`,
+      effect: () => Math.sqrt(Ra.pets.teresa.level) / 1000 *
+        Ra.unlocks.continuousTTBoost.effects.autoPrestige.effectOrDefault(1),
+      formatEffect: value => `${formatPercents(value, 2)}`
+    }
+  },
+  skipReset1: {
+    id: "skipReset1",
+    cost: 20,
+    description: () =>
+      `Start every reset with ${formatInt(1)} Dimension Boost, automatically unlocking the 5th Antimatter Dimension`,
+  },
+  skipReset2: {
+    id: "skipReset2",
+    cost: 40,
+    checkRequirement: () => InfinityUpgrade.skipReset1.isBought,
+    description: () =>
+      `Start every reset with ${formatInt(2)} Dimension Boosts, automatically unlocking the 6th Antimatter Dimension`,
+  },
+  skipReset3: {
+    id: "skipReset3",
+    cost: 80,
+    checkRequirement: () => InfinityUpgrade.skipReset2.isBought,
+    description: () =>
+      `Start every reset with ${formatInt(3)} Dimension Boosts, automatically unlocking the 7th Antimatter Dimension`,
+  },
+  skipResetGalaxy: {
+    id: "skipResetGalaxy",
+    cost: 300,
+    checkRequirement: () => InfinityUpgrade.skipReset3.isBought,
+    description: () =>
+      `Start every reset with ${formatInt(4)} Dimension Boosts, automatically unlocking the 8th Antimatter Dimension;
+      and an Antimatter Galaxy`,
+  },
+  ipOffline: {
+    id: "ipOffline",
+    cost: 1000,
+    checkRequirement: () => Achievement(41).isUnlocked,
+    description: () => (player.options.offlineProgress
+      ? `Only while offline, gain ${formatPercents(0.5)} of your best IP/min without using Max All`
+      : "This upgrade would give offline Infinity Point generation, but offline progress is currently disabled"),
+    effect: () => (player.options.offlineProgress
+      ? player.records.thisEternity.bestIPMsWithoutMaxAll.times(TimeSpan.fromMinutes(1).totalMilliseconds / 2)
+      : DC.D0),
+    isDisabled: () => !player.options.offlineProgress,
+    formatEffect: value => `${format(value, 2, 2)} IP/min`,
+  },
+  ipMult: {
+    id: "ipMult",
+    cost: () => InfinityUpgrade.ipMult.cost,
+    checkRequirement: () => Achievement(41).isUnlocked,
+    costCap: DC.E6E6,
+    costIncreaseThreshold: DC.E3E6,
+    description: () => (Pelle.isDoomed
+      ? "This upgrade has no effect while in Doomed"
+      : `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)),
+    cap: () => Effarig.eternityCap ?? DC.E1E6,
+    formatEffect: value => formatX(value, 2, 2),
+  }
+};

From dcd34002c6ae1121dba9f256e3b48dc8bba62053 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 18:19:58 -0700
Subject: [PATCH 44/89] clean up alchemy gamedatabase

---
 javascripts/core/celestials/ra/alchemy.js     |  46 +-
 .../core/secret-formula/celestials/alchemy.js | 885 +++++++++---------
 .../core/secret-formula/game-database.js      |   1 +
 3 files changed, 462 insertions(+), 470 deletions(-)

diff --git a/javascripts/core/celestials/ra/alchemy.js b/javascripts/core/celestials/ra/alchemy.js
index fe02a65bd..2f3bf9378 100644
--- a/javascripts/core/celestials/ra/alchemy.js
+++ b/javascripts/core/celestials/ra/alchemy.js
@@ -224,44 +224,16 @@ class AlchemyReaction {
   }
 }
 
-export const AlchemyResource = (function() {
-  function createResource(resource) {
-    const config = GameDatabase.celestials.alchemy.resources[resource];
-    config.id = resource;
-    if (config.isBaseResource) {
-      return new BasicAlchemyResourceState(config);
-    }
-    return new AdvancedAlchemyResourceState(config);
-  }
-
-  return {
-    power: createResource(ALCHEMY_RESOURCE.POWER),
-    infinity: createResource(ALCHEMY_RESOURCE.INFINITY),
-    time: createResource(ALCHEMY_RESOURCE.TIME),
-    replication: createResource(ALCHEMY_RESOURCE.REPLICATION),
-    dilation: createResource(ALCHEMY_RESOURCE.DILATION),
-    cardinality: createResource(ALCHEMY_RESOURCE.CARDINALITY),
-    eternity: createResource(ALCHEMY_RESOURCE.ETERNITY),
-    dimensionality: createResource(ALCHEMY_RESOURCE.DIMENSIONALITY),
-    inflation: createResource(ALCHEMY_RESOURCE.INFLATION),
-    alternation: createResource(ALCHEMY_RESOURCE.ALTERNATION),
-    effarig: createResource(ALCHEMY_RESOURCE.EFFARIG),
-    synergism: createResource(ALCHEMY_RESOURCE.SYNERGISM),
-    momentum: createResource(ALCHEMY_RESOURCE.MOMENTUM),
-    decoherence: createResource(ALCHEMY_RESOURCE.DECOHERENCE),
-    exponential: createResource(ALCHEMY_RESOURCE.EXPONENTIAL),
-    force: createResource(ALCHEMY_RESOURCE.FORCE),
-    uncountability: createResource(ALCHEMY_RESOURCE.UNCOUNTABILITY),
-    boundless: createResource(ALCHEMY_RESOURCE.BOUNDLESS),
-    multiversal: createResource(ALCHEMY_RESOURCE.MULTIVERSAL),
-    unpredictability: createResource(ALCHEMY_RESOURCE.UNPREDICTABILITY),
-    reality: createResource(ALCHEMY_RESOURCE.REALITY)
-  };
-}());
+export const AlchemyResource = mapGameDataToObject(
+  GameDatabase.celestials.alchemy.resources,
+  config => (config.isBaseResource
+    ? new BasicAlchemyResourceState(config)
+    : new AdvancedAlchemyResourceState(config))
+);
 
 export const AlchemyResources = {
-  all: Object.values(AlchemyResource),
-  base: Object.values(AlchemyResource).filter(r => r.isBaseResource)
+  all: AlchemyResource.all,
+  base: AlchemyResource.all.filter(r => r.isBaseResource)
 };
 
 export const AlchemyReactions = (function() {
@@ -269,7 +241,7 @@ export const AlchemyReactions = (function() {
   function mapReagents(resource) {
     return resource.config.reagents
       .map(r => ({
-        resource: AlchemyResources.all[r.resource],
+        resource: AlchemyResources.all.find(x => x.id === r.resource),
         cost: r.amount
       }));
   }
diff --git a/javascripts/core/secret-formula/celestials/alchemy.js b/javascripts/core/secret-formula/celestials/alchemy.js
index 938388e91..f93d31188 100644
--- a/javascripts/core/secret-formula/celestials/alchemy.js
+++ b/javascripts/core/secret-formula/celestials/alchemy.js
@@ -1,443 +1,462 @@
 import { DC } from "../../constants";
 import { GameDatabase } from "../game-database";
 
-GameDatabase.celestials.alchemy = {
-  resources: {
-    // T1 resources (Non-Effarig "base" resources)
-    [ALCHEMY_RESOURCE.POWER]: {
-      name: "Power",
-      symbol: "Ω",
-      isBaseResource: true,
-      effect: amount => 1 + amount / 200000,
-      tier: 1,
-      uiOrder: 1,
-      unlockedAt: 2,
-      description: "provides a multiplier to Antimatter Dimensions",
-      formatEffect: value => `Antimatter Dimension multipliers ${formatPow(value, 4, 4)}`
-    },
-    [ALCHEMY_RESOURCE.INFINITY]: {
-      name: "Infinity",
-      symbol: "∞",
-      isBaseResource: true,
-      effect: amount => 1 + amount / 200000,
-      tier: 1,
-      uiOrder: 2,
-      unlockedAt: 3,
-      description: "provides a multiplier to Infinity Dimensions",
-      formatEffect: value => `Infinity Dimension multipliers ${formatPow(value, 4, 4)}`
-    },
-    [ALCHEMY_RESOURCE.TIME]: {
-      name: "Time",
-      symbol: "Δ",
-      isBaseResource: true,
-      effect: amount => 1 + amount / 200000,
-      tier: 1,
-      uiOrder: 3,
-      unlockedAt: 4,
-      description: "provides a multiplier to Time Dimensions",
-      formatEffect: value => `Time Dimension multipliers ${formatPow(value, 4, 4)}`
-    },
-    [ALCHEMY_RESOURCE.REPLICATION]: {
-      name: "Replication",
-      symbol: "Ξ",
-      isBaseResource: true,
-      effect: amount => Decimal.pow10(amount / 1000),
-      tier: 1,
-      uiOrder: 4,
-      unlockedAt: 5,
-      description: `increases Replication Speed`,
-      formatEffect: value => `Replication speed is increased by ${formatX(value, 2, 2)}`
-    },
-    [ALCHEMY_RESOURCE.DILATION]: {
-      name: "Dilation",
-      symbol: "Ψ",
-      isBaseResource: true,
-      effect: amount => Decimal.pow10(amount / 2000),
-      tier: 1,
-      uiOrder: 5,
-      unlockedAt: 6,
-      description: "increases Dilated Time production",
-      formatEffect: value => `Dilated Time production is increased by ${formatX(value, 2, 2)}`
-    },
+GameDatabase.celestials.alchemy.resources = {
+  // T1 resources (Non-Effarig "base" resources)
+  "power": {
+    id: ALCHEMY_RESOURCE.POWER,
+    name: "Power",
+    symbol: "Ω",
+    isBaseResource: true,
+    effect: amount => 1 + amount / 200000,
+    tier: 1,
+    uiOrder: 1,
+    unlockedAt: 2,
+    description: "provides a multiplier to Antimatter Dimensions",
+    formatEffect: value => `Antimatter Dimension multipliers ${formatPow(value, 4, 4)}`
+  },
+  "infinity": {
+    id: ALCHEMY_RESOURCE.INFINITY,
+    name: "Infinity",
+    symbol: "∞",
+    isBaseResource: true,
+    effect: amount => 1 + amount / 200000,
+    tier: 1,
+    uiOrder: 2,
+    unlockedAt: 3,
+    description: "provides a multiplier to Infinity Dimensions",
+    formatEffect: value => `Infinity Dimension multipliers ${formatPow(value, 4, 4)}`
+  },
+  "time": {
+    id: ALCHEMY_RESOURCE.TIME,
+    name: "Time",
+    symbol: "Δ",
+    isBaseResource: true,
+    effect: amount => 1 + amount / 200000,
+    tier: 1,
+    uiOrder: 3,
+    unlockedAt: 4,
+    description: "provides a multiplier to Time Dimensions",
+    formatEffect: value => `Time Dimension multipliers ${formatPow(value, 4, 4)}`
+  },
+  "replication": {
+    id: ALCHEMY_RESOURCE.REPLICATION,
+    name: "Replication",
+    symbol: "Ξ",
+    isBaseResource: true,
+    effect: amount => Decimal.pow10(amount / 1000),
+    tier: 1,
+    uiOrder: 4,
+    unlockedAt: 5,
+    description: `increases Replication Speed`,
+    formatEffect: value => `Replication speed is increased by ${formatX(value, 2, 2)}`
+  },
+  "dilation": {
+    id: ALCHEMY_RESOURCE.DILATION,
+    name: "Dilation",
+    symbol: "Ψ",
+    isBaseResource: true,
+    effect: amount => Decimal.pow10(amount / 2000),
+    tier: 1,
+    uiOrder: 5,
+    unlockedAt: 6,
+    description: "increases Dilated Time production",
+    formatEffect: value => `Dilated Time production is increased by ${formatX(value, 2, 2)}`
+  },
 
-    // T2 resources (combinations of pairs of T1 resources)
-    [ALCHEMY_RESOURCE.CARDINALITY]: {
-      name: "Cardinality",
-      symbol: "α",
-      isBaseResource: false,
-      effect: amount => 1 + 0.2 / (1 + amount / 20000),
-      tier: 2,
-      uiOrder: 3,
-      unlockedAt: 8,
-      get description() { return `reduces the slowdown per ${format(Number.MAX_VALUE, 2)} Replicanti`; },
-      formatEffect: value => `Replicanti interval increases slower ${formatX(1.2, 1, 1)} ➜ ` +
-        `${formatX(value, 4, 4)} per ${format(Number.MAX_VALUE, 2)}`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.TIME,
-          amount: 8
-        },
-        {
-          resource: ALCHEMY_RESOURCE.REPLICATION,
-          amount: 7
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.ETERNITY]: {
-      name: "Eternity",
-      symbol: "τ",
-      isBaseResource: false,
-      effect: amount => 1 + amount / 15000,
-      tier: 2,
-      uiOrder: 2,
-      unlockedAt: 9,
-      description: "increases Eternity generation",
-      formatEffect: value => `Eternity generation ${formatPow(value, 4, 4)}`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.TIME,
-          amount: 11
-        },
-        {
-          resource: ALCHEMY_RESOURCE.INFINITY,
-          amount: 4
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.DIMENSIONALITY]: {
-      name: "Dimensionality",
-      symbol: "ρ",
-      isBaseResource: false,
-      effect: amount => Decimal.pow10(5 * amount),
-      tier: 2,
-      uiOrder: 1,
-      unlockedAt: 10,
-      description: "provides a multiplier to all dimensions",
-      formatEffect: value => `All Dimensions ${formatX(value)}`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.POWER,
-          amount: 10
-        },
-        {
-          resource: ALCHEMY_RESOURCE.INFINITY,
-          amount: 5
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.INFLATION]: {
-      name: "Inflation",
-      symbol: "λ",
-      isBaseResource: false,
-      effect: amount => Decimal.pow10(6e9 - 3e5 * amount),
-      tier: 2,
-      uiOrder: 5,
-      unlockedAt: 11,
-      description: "increases multiplier effect over a threshold",
-      formatEffect: value => `All Antimatter Dimension multipliers are ${formatPow(1.05, 2, 2)}
-      if they are above ${format(value)} `,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.POWER,
-          amount: 9
-        },
-        {
-          resource: ALCHEMY_RESOURCE.DILATION,
-          amount: 6
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.ALTERNATION]: {
-      name: "Alternation",
-      symbol: "ω",
-      isBaseResource: false,
-      effect: amount => amount / 200000,
-      tier: 2,
-      uiOrder: 4,
-      unlockedAt: 12,
-      description: "increases the strength of Tachyon Galaxies based on Replicanti",
-      formatEffect: value => `Tachyon Galaxies are ${formatPercents(value, 2, 2)} stronger ` +
-        `per ${format(DC.E1E6)} Replicanti`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.REPLICATION,
-          amount: 5
-        },
-        {
-          resource: ALCHEMY_RESOURCE.DILATION,
-          amount: 10
-        }
-      ]
-    },
-
-    // T3 resources (Effarig and conbinations of T1/T2 with Effarig)
-    [ALCHEMY_RESOURCE.EFFARIG]: {
-      name: "Effarig",
-      symbol: "Ϙ",
-      isBaseResource: true,
-      effect: amount => Math.pow(10, amount / 2500),
-      tier: 2,
-      uiOrder: 3.5,
-      unlockedAt: 7,
-      description: "increases Relic Shard gain",
-      formatEffect: value => `Relic Shard gain is multiplied ${formatX(value, 2, 2)}`
-    },
-    [ALCHEMY_RESOURCE.SYNERGISM]: {
-      name: "Synergism",
-      symbol: "π",
-      isBaseResource: false,
-      effect: amount => Math.clampMax(0.3 + Math.sqrt(amount / 15000), 1),
-      tier: 3,
-      uiOrder: 2,
-      unlockedAt: 13,
-      description: "increases the effectiveness of Alchemy Reactions",
-      formatEffect(value) {
-        const baseEffect = `Alchemy reaction efficiency ${formatPercents(0.3)} ➜ ${formatPercents(value, 2, 2)}`;
-        if (player.reality.glyphs.sac.reality === 0) {
-          return baseEffect;
-        }
-        const increasedYield = formatPercents(value * Effects.sum(GlyphSacrifice.reality), 2, 2);
-        return `${baseEffect} (${increasedYield} after Glyph Sacrifice)`;
+  // T2 resources (combinations of pairs of T1 resources)
+  "cardinality": {
+    id: ALCHEMY_RESOURCE.CARDINALITY,
+    name: "Cardinality",
+    symbol: "α",
+    isBaseResource: false,
+    effect: amount => 1 + 0.2 / (1 + amount / 20000),
+    tier: 2,
+    uiOrder: 3,
+    unlockedAt: 8,
+    get description() { return `reduces the slowdown per ${format(Number.MAX_VALUE, 2)} Replicanti`; },
+    formatEffect: value => `Replicanti interval increases slower ${formatX(1.2, 1, 1)} ➜
+      ${formatX(value, 4, 4)} per ${format(Number.MAX_VALUE, 2)}`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.TIME,
+        amount: 8
       },
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.EFFARIG,
-          amount: 3
-        },
-        {
-          resource: ALCHEMY_RESOURCE.REPLICATION,
-          amount: 16
-        },
-        {
-          resource: ALCHEMY_RESOURCE.INFINITY,
-          amount: 14
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.MOMENTUM]: {
-      name: "Momentum",
-      symbol: "μ",
-      isBaseResource: false,
-      effect: amount => 1 + amount / 125000,
-      tier: 3,
-      uiOrder: 3,
-      unlockedAt: 15,
-      description: "provides a multiplier to all dimensions based on real time since unlock",
-      formatEffect: value => `All Dimensions ${formatPow(Ra.momentumValue, 4, 4)}, increasing by
-        ${format(0.002 * Achievement(175).effectOrDefault(1), 3, 3)}
-        per real-time hour after the resource is unlocked, up to a maximum of ${formatPow(value, 4, 4)}`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.EFFARIG,
-          amount: 11
-        },
-        {
-          resource: ALCHEMY_RESOURCE.POWER,
-          amount: 4
-        },
-        {
-          resource: ALCHEMY_RESOURCE.TIME,
-          amount: 20
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.DECOHERENCE]: {
-      name: "Decoherence",
-      symbol: "ξ",
-      isBaseResource: false,
-      effect: amount => 0.10 * Math.sqrt(amount / 10000),
-      tier: 3,
-      uiOrder: 4,
-      unlockedAt: 14,
-      description: "causes refining to give all basic Alchemy Resources",
-      formatEffect: value => `Refined Glyphs also give ${formatPercents(value, 2)} of their value ` +
-        "to all other base resources",
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.EFFARIG,
-          amount: 13
-        },
-        {
-          resource: ALCHEMY_RESOURCE.ALTERNATION,
-          amount: 8
-        }
-      ]
-    },
+      {
+        resource: ALCHEMY_RESOURCE.REPLICATION,
+        amount: 7
+      }
+    ]
+  },
+  "eternity": {
+    id: ALCHEMY_RESOURCE.ETERNITY,
+    name: "Eternity",
+    symbol: "τ",
+    isBaseResource: false,
+    effect: amount => 1 + amount / 15000,
+    tier: 2,
+    uiOrder: 2,
+    unlockedAt: 9,
+    description: "increases Eternity generation",
+    formatEffect: value => `Eternity generation ${formatPow(value, 4, 4)}`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.TIME,
+        amount: 11
+      },
+      {
+        resource: ALCHEMY_RESOURCE.INFINITY,
+        amount: 4
+      }
+    ]
+  },
+  "dimensionality": {
+    id: ALCHEMY_RESOURCE.DIMENSIONALITY,
+    name: "Dimensionality",
+    symbol: "ρ",
+    isBaseResource: false,
+    effect: amount => Decimal.pow10(5 * amount),
+    tier: 2,
+    uiOrder: 1,
+    unlockedAt: 10,
+    description: "provides a multiplier to all dimensions",
+    formatEffect: value => `All Dimensions ${formatX(value)}`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.POWER,
+        amount: 10
+      },
+      {
+        resource: ALCHEMY_RESOURCE.INFINITY,
+        amount: 5
+      }
+    ]
+  },
+  "inflation": {
+    id: ALCHEMY_RESOURCE.INFLATION,
+    name: "Inflation",
+    symbol: "λ",
+    isBaseResource: false,
+    effect: amount => Decimal.pow10(6e9 - 3e5 * amount),
+    tier: 2,
+    uiOrder: 5,
+    unlockedAt: 11,
+    description: "increases multiplier effect over a threshold",
+    formatEffect: value => `All Antimatter Dimension multipliers are ${formatPow(1.05, 2, 2)}
+      if they are above ${format(value)} `,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.POWER,
+        amount: 9
+      },
+      {
+        resource: ALCHEMY_RESOURCE.DILATION,
+        amount: 6
+      }
+    ]
+  },
+  "alternation": {
+    id: ALCHEMY_RESOURCE.ALTERNATION,
+    name: "Alternation",
+    symbol: "ω",
+    isBaseResource: false,
+    effect: amount => amount / 200000,
+    tier: 2,
+    uiOrder: 4,
+    unlockedAt: 12,
+    description: "increases the strength of Tachyon Galaxies based on Replicanti",
+    formatEffect: value => `Tachyon Galaxies are ${formatPercents(value, 2, 2)} stronger
+      per ${format(DC.E1E6)} Replicanti`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.REPLICATION,
+        amount: 5
+      },
+      {
+        resource: ALCHEMY_RESOURCE.DILATION,
+        amount: 10
+      }
+    ]
+  },
 
-    // T4 resources (resources which feed directly into the final resource)
-    [ALCHEMY_RESOURCE.EXPONENTIAL]: {
-      name: "Exponential",
-      symbol: "Γ",
-      isBaseResource: false,
-      effect: amount => 10 * Math.pow(amount / 10000, 2),
-      tier: 4,
-      uiOrder: 2,
-      unlockedAt: 18,
-      description: "multiplies Infinity Points by Replicanti",
-      formatEffect: value => `Infinity Points multiplied by Replicanti${formatPow(value, 2, 3)}`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.INFLATION,
-          amount: 18
-        },
-        {
-          resource: ALCHEMY_RESOURCE.SYNERGISM,
-          amount: 3
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.FORCE]: {
-      name: "Force",
-      symbol: "Φ",
-      isBaseResource: false,
-      effect: amount => 5 * amount,
-      tier: 4,
-      uiOrder: 2,
-      unlockedAt: 17,
-      description: "multiplies Antimatter Dimensions by Reality Machines",
-      formatEffect: value => `Multiply Antimatter Dimensions by Reality Machines${formatPow(value, 2, 2)}`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.DIMENSIONALITY,
-          amount: 7
-        },
-        {
-          resource: ALCHEMY_RESOURCE.MOMENTUM,
-          amount: 8
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.UNCOUNTABILITY]: {
-      name: "Uncountability",
-      symbol: "Θ",
-      isBaseResource: false,
-      effect: amount => Math.sqrt(amount),
-      tier: 4,
-      uiOrder: 3,
-      unlockedAt: 19,
-      description: "passively generates Realities and Perk Points",
-      formatEffect: value => `Generate ${format(value, 2, 2)} Realities and Perk Points per second`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.INFINITY,
-          amount: 20
-        },
-        {
-          resource: ALCHEMY_RESOURCE.EFFARIG,
-          amount: 6
-        },
-        {
-          resource: ALCHEMY_RESOURCE.CARDINALITY,
-          amount: 16
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.BOUNDLESS]: {
-      name: "Boundless",
-      symbol: "Π",
-      isBaseResource: false,
-      effect: amount => amount / 80000,
-      tier: 4,
-      uiOrder: 1,
-      unlockedAt: 20,
-      description: "makes Tesseracts stronger",
-      formatEffect: value => `Tesseracts are +${formatPercents(value, 2, 2)} stronger`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.ETERNITY,
-          amount: 13
-        },
-        {
-          resource: ALCHEMY_RESOURCE.INFLATION,
-          amount: 18
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.MULTIVERSAL]: {
-      name: "Multiversal",
-      symbol: "Σ",
-      isBaseResource: false,
-      effect: amount => 5 * Math.pow(amount / 10000, 2),
-      tier: 4,
-      uiOrder: 5,
-      unlockedAt: 16,
-      description: "makes each Reality simulate more Realities",
-      formatEffect: value => `Each Reality simulates ${format(value, 2, 3)} additional Realities, giving all
-        the same rewards as if it was amplified`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.ALTERNATION,
-          amount: 16
-        },
-        {
-          resource: ALCHEMY_RESOURCE.DECOHERENCE,
-          amount: 3
-        }
-      ]
-    },
-    [ALCHEMY_RESOURCE.UNPREDICTABILITY]: {
-      name: "Unpredictability",
-      symbol: "Λ",
-      isBaseResource: false,
-      effect: amount => amount / (10000 + amount),
-      tier: 4,
-      uiOrder: 4,
-      unlockedAt: 21,
-      description: "makes each Alchemy Reaction have a chance to happen twice",
-      formatEffect: value => `Any alchemy reaction has a ${formatPercents(value, 2, 2)}
-        chance of triggering again`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.EFFARIG,
-          amount: 15
-        },
-        {
-          resource: ALCHEMY_RESOURCE.DECOHERENCE,
-          amount: 3
-        },
-        {
-          resource: ALCHEMY_RESOURCE.SYNERGISM,
-          amount: 10
-        }
-      ]
+  // T3 resources (Effarig and conbinations of T1/T2 with Effarig)
+  "effarig": {
+    id: ALCHEMY_RESOURCE.EFFARIG,
+    name: "Effarig",
+    symbol: "Ϙ",
+    isBaseResource: true,
+    effect: amount => Math.pow(10, amount / 2500),
+    tier: 2,
+    uiOrder: 3.5,
+    unlockedAt: 7,
+    description: "increases Relic Shard gain",
+    formatEffect: value => `Relic Shard gain is multiplied ${formatX(value, 2, 2)}`
+  },
+  "synergism": {
+    id: ALCHEMY_RESOURCE.SYNERGISM,
+    name: "Synergism",
+    symbol: "π",
+    isBaseResource: false,
+    effect: amount => Math.clampMax(0.3 + Math.sqrt(amount / 15000), 1),
+    tier: 3,
+    uiOrder: 2,
+    unlockedAt: 13,
+    description: "increases the effectiveness of Alchemy Reactions",
+    formatEffect(value) {
+      const baseEffect = `Alchemy reaction efficiency ${formatPercents(0.3)} ➜ ${formatPercents(value, 2, 2)}`;
+      if (player.reality.glyphs.sac.reality === 0) {
+        return baseEffect;
+      }
+      const increasedYield = formatPercents(value * Effects.sum(GlyphSacrifice.reality), 2, 2);
+      return `${baseEffect} (${increasedYield} after Glyph Sacrifice)`;
     },
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.EFFARIG,
+        amount: 3
+      },
+      {
+        resource: ALCHEMY_RESOURCE.REPLICATION,
+        amount: 16
+      },
+      {
+        resource: ALCHEMY_RESOURCE.INFINITY,
+        amount: 14
+      }
+    ]
+  },
+  "momentum": {
+    id: ALCHEMY_RESOURCE.MOMENTUM,
+    name: "Momentum",
+    symbol: "μ",
+    isBaseResource: false,
+    effect: amount => 1 + amount / 125000,
+    tier: 3,
+    uiOrder: 3,
+    unlockedAt: 15,
+    description: "provides a multiplier to all dimensions based on real time since unlock",
+    formatEffect: value => `All Dimensions ${formatPow(Ra.momentumValue, 4, 4)}, increasing by
+      ${format(0.002 * Achievement(175).effectOrDefault(1), 3, 3)}
+      per real-time hour after the resource is unlocked, up to a maximum of ${formatPow(value, 4, 4)}`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.EFFARIG,
+        amount: 11
+      },
+      {
+        resource: ALCHEMY_RESOURCE.POWER,
+        amount: 4
+      },
+      {
+        resource: ALCHEMY_RESOURCE.TIME,
+        amount: 20
+      }
+    ]
+  },
+  "decoherence": {
+    id: ALCHEMY_RESOURCE.DECOHERENCE,
+    name: "Decoherence",
+    symbol: "ξ",
+    isBaseResource: false,
+    effect: amount => 0.10 * Math.sqrt(amount / 10000),
+    tier: 3,
+    uiOrder: 4,
+    unlockedAt: 14,
+    description: "causes refining to give all basic Alchemy Resources",
+    formatEffect: value => `Refined Glyphs also give ${formatPercents(value, 2)} of their value ` +
+      "to all other base resources",
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.EFFARIG,
+        amount: 13
+      },
+      {
+        resource: ALCHEMY_RESOURCE.ALTERNATION,
+        amount: 8
+      }
+    ]
+  },
 
-    // T5 (Reality)
-    [ALCHEMY_RESOURCE.REALITY]: {
-      name: "Reality",
-      symbol: "Ϟ",
-      isBaseResource: false,
-      effect: amount => Math.floor(amount),
-      tier: 5,
-      unlockedAt: 25,
-      description: "allows creation of Reality Glyphs",
-      formatEffect: value => `Consume all Reality resource to create a level ${formatInt(value)} Reality Glyph`,
-      reagents: [
-        {
-          resource: ALCHEMY_RESOURCE.EXPONENTIAL,
-          amount: 1
-        },
-        {
-          resource: ALCHEMY_RESOURCE.FORCE,
-          amount: 1
-        },
-        {
-          resource: ALCHEMY_RESOURCE.UNCOUNTABILITY,
-          amount: 1
-        },
-        {
-          resource: ALCHEMY_RESOURCE.BOUNDLESS,
-          amount: 1
-        },
-        {
-          resource: ALCHEMY_RESOURCE.MULTIVERSAL,
-          amount: 1
-        },
-        {
-          resource: ALCHEMY_RESOURCE.UNPREDICTABILITY,
-          amount: 1
-        }
-      ]
-    },
+  // T4 resources (resources which feed directly into the final resource)
+  "exponential": {
+    id: ALCHEMY_RESOURCE.EXPONENTIAL,
+    name: "Exponential",
+    symbol: "Γ",
+    isBaseResource: false,
+    effect: amount => 10 * Math.pow(amount / 10000, 2),
+    tier: 4,
+    uiOrder: 2,
+    unlockedAt: 18,
+    description: "multiplies Infinity Points by Replicanti",
+    formatEffect: value => `Infinity Points multiplied by Replicanti${formatPow(value, 2, 3)}`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.INFLATION,
+        amount: 18
+      },
+      {
+        resource: ALCHEMY_RESOURCE.SYNERGISM,
+        amount: 3
+      }
+    ]
+  },
+  "force": {
+    id: ALCHEMY_RESOURCE.FORCE,
+    name: "Force",
+    symbol: "Φ",
+    isBaseResource: false,
+    effect: amount => 5 * amount,
+    tier: 4,
+    uiOrder: 2,
+    unlockedAt: 17,
+    description: "multiplies Antimatter Dimensions by Reality Machines",
+    formatEffect: value => `Multiply Antimatter Dimensions by Reality Machines${formatPow(value, 2, 2)}`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.DIMENSIONALITY,
+        amount: 7
+      },
+      {
+        resource: ALCHEMY_RESOURCE.MOMENTUM,
+        amount: 8
+      }
+    ]
+  },
+  "uncountability": {
+    id: ALCHEMY_RESOURCE.UNCOUNTABILITY,
+    name: "Uncountability",
+    symbol: "Θ",
+    isBaseResource: false,
+    effect: amount => Math.sqrt(amount),
+    tier: 4,
+    uiOrder: 3,
+    unlockedAt: 19,
+    description: "passively generates Realities and Perk Points",
+    formatEffect: value => `Generate ${format(value, 2, 2)} Realities and Perk Points per second`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.INFINITY,
+        amount: 20
+      },
+      {
+        resource: ALCHEMY_RESOURCE.EFFARIG,
+        amount: 6
+      },
+      {
+        resource: ALCHEMY_RESOURCE.CARDINALITY,
+        amount: 16
+      }
+    ]
+  },
+  "boundless": {
+    id: ALCHEMY_RESOURCE.BOUNDLESS,
+    name: "Boundless",
+    symbol: "Π",
+    isBaseResource: false,
+    effect: amount => amount / 80000,
+    tier: 4,
+    uiOrder: 1,
+    unlockedAt: 20,
+    description: "makes Tesseracts stronger",
+    formatEffect: value => `Tesseracts are +${formatPercents(value, 2, 2)} stronger`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.ETERNITY,
+        amount: 13
+      },
+      {
+        resource: ALCHEMY_RESOURCE.INFLATION,
+        amount: 18
+      }
+    ]
+  },
+  "multiversal": {
+    id: ALCHEMY_RESOURCE.MULTIVERSAL,
+    name: "Multiversal",
+    symbol: "Σ",
+    isBaseResource: false,
+    effect: amount => 5 * Math.pow(amount / 10000, 2),
+    tier: 4,
+    uiOrder: 5,
+    unlockedAt: 16,
+    description: "makes each Reality simulate more Realities",
+    formatEffect: value => `Each Reality simulates ${format(value, 2, 3)} additional Realities, giving all
+      the same rewards as if it was amplified`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.ALTERNATION,
+        amount: 16
+      },
+      {
+        resource: ALCHEMY_RESOURCE.DECOHERENCE,
+        amount: 3
+      }
+    ]
+  },
+  "unpredictability": {
+    id: ALCHEMY_RESOURCE.UNPREDICTABILITY,
+    name: "Unpredictability",
+    symbol: "Λ",
+    isBaseResource: false,
+    effect: amount => amount / (10000 + amount),
+    tier: 4,
+    uiOrder: 4,
+    unlockedAt: 21,
+    description: "makes each Alchemy Reaction have a chance to happen twice",
+    formatEffect: value => `Any alchemy reaction has a ${formatPercents(value, 2, 2)}
+      chance of triggering again`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.EFFARIG,
+        amount: 15
+      },
+      {
+        resource: ALCHEMY_RESOURCE.DECOHERENCE,
+        amount: 3
+      },
+      {
+        resource: ALCHEMY_RESOURCE.SYNERGISM,
+        amount: 10
+      }
+    ]
+  },
+
+  // T5 (Reality)
+  "reality": {
+    id: ALCHEMY_RESOURCE.REALITY,
+    name: "Reality",
+    symbol: "Ϟ",
+    isBaseResource: false,
+    effect: amount => Math.floor(amount),
+    tier: 5,
+    unlockedAt: 25,
+    description: "allows creation of Reality Glyphs",
+    formatEffect: value => `Consume all Reality resource to create a level ${formatInt(value)} Reality Glyph`,
+    reagents: [
+      {
+        resource: ALCHEMY_RESOURCE.EXPONENTIAL,
+        amount: 1
+      },
+      {
+        resource: ALCHEMY_RESOURCE.FORCE,
+        amount: 1
+      },
+      {
+        resource: ALCHEMY_RESOURCE.UNCOUNTABILITY,
+        amount: 1
+      },
+      {
+        resource: ALCHEMY_RESOURCE.BOUNDLESS,
+        amount: 1
+      },
+      {
+        resource: ALCHEMY_RESOURCE.MULTIVERSAL,
+        amount: 1
+      },
+      {
+        resource: ALCHEMY_RESOURCE.UNPREDICTABILITY,
+        amount: 1
+      }
+    ]
   },
 };
diff --git a/javascripts/core/secret-formula/game-database.js b/javascripts/core/secret-formula/game-database.js
index 3bda43728..d400db021 100644
--- a/javascripts/core/secret-formula/game-database.js
+++ b/javascripts/core/secret-formula/game-database.js
@@ -10,6 +10,7 @@ export const GameDatabase = {
     glyphSacrifice: {},
   },
   celestials: {
+    alchemy: {},
     pelle: {},
     descriptions: {},
   }

From e83b5ff19719c48701e436cb3904420e4e1541a2 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 18:25:54 -0700
Subject: [PATCH 45/89] clean up effarig gamedatabase

---
 javascripts/core/celestials/effarig.js        |  37 +-----
 .../core/secret-formula/celestials/effarig.js | 106 ++++++++++--------
 .../core/secret-formula/game-database.js      |   1 +
 3 files changed, 66 insertions(+), 78 deletions(-)

diff --git a/javascripts/core/celestials/effarig.js b/javascripts/core/celestials/effarig.js
index 823a0984e..4e4ed474e 100644
--- a/javascripts/core/celestials/effarig.js
+++ b/javascripts/core/celestials/effarig.js
@@ -178,41 +178,14 @@ class EffarigUnlockState extends BitUpgradeState {
   purchase() {
     if (this.isUnlocked || !Currency.relicShards.purchase(this.cost)) return;
     this.unlock();
-    switch (this) {
-      case EffarigUnlock.adjuster:
-        Effarig.quotes.show(Effarig.quotes.UNLOCK_WEIGHTS);
-        ui.view.tabs.reality.openGlyphWeights = true;
-        Tab.reality.glyphs.show();
-        break;
-      case EffarigUnlock.glyphFilter:
-        Effarig.quotes.show(Effarig.quotes.UNLOCK_GLYPH_FILTER);
-        player.reality.showSidebarPanel = GLYPH_SIDEBAR_MODE.FILTER_SETTINGS;
-        break;
-      case EffarigUnlock.setSaves:
-        Effarig.quotes.show(Effarig.quotes.UNLOCK_SET_SAVES);
-        player.reality.showSidebarPanel = GLYPH_SIDEBAR_MODE.SAVED_SETS;
-        break;
-      case EffarigUnlock.run:
-        Effarig.quotes.show(Effarig.quotes.UNLOCK_RUN);
-        break;
-      default:
-        throw new Error("Unknown Effarig upgrade");
-    }
+    this.config.onPurchased?.();
   }
 }
 
-export const EffarigUnlock = (function() {
-  const db = GameDatabase.celestials.effarig.unlocks;
-  return {
-    adjuster: new EffarigUnlockState(db.adjuster),
-    glyphFilter: new EffarigUnlockState(db.glyphFilter),
-    setSaves: new EffarigUnlockState(db.setSaves),
-    run: new EffarigUnlockState(db.run),
-    infinity: new EffarigUnlockState(db.infinity),
-    eternity: new EffarigUnlockState(db.eternity),
-    reality: new EffarigUnlockState(db.reality),
-  };
-}());
+export const EffarigUnlock = mapGameDataToObject(
+  GameDatabase.celestials.effarig.unlocks,
+  config => new EffarigUnlockState(config)
+);
 
 EventHub.logic.on(GAME_EVENT.TAB_CHANGED, () => {
   if (Tab.celestials.effarig.isOpen) Effarig.quotes.show(Effarig.quotes.INITIAL);
diff --git a/javascripts/core/secret-formula/celestials/effarig.js b/javascripts/core/secret-formula/celestials/effarig.js
index 9c10719cf..408eef4d5 100644
--- a/javascripts/core/secret-formula/celestials/effarig.js
+++ b/javascripts/core/secret-formula/celestials/effarig.js
@@ -1,56 +1,70 @@
 import { DC } from "../../constants";
 import { GameDatabase } from "../game-database";
 
-GameDatabase.celestials.effarig = {
-  unlocks: {
-    adjuster: {
-      id: 0,
-      description: "Adjustable Glyph level factor weights",
-      cost: 1e7
-    },
-    glyphFilter: {
-      id: 1,
-      description: "Glyph Filtering",
-      cost: 2e8
-    },
-    setSaves: {
-      id: 2,
-      description: "Glyph Set Saves",
-      cost: 3e9
-    },
-    run: {
-      id: 3,
-      description: "Effarig's Reality",
-      cost: 5e11
-    },
-    infinity: {
-      id: 4,
-      label: "Infinity",
-      get description() {
-        if (Pelle.isDoomed) return "Any rewards from Effarig's Infinity have been disabled.";
-        return ` Infinities raise the Replicanti cap
+GameDatabase.celestials.effarig.unlocks = {
+  adjuster: {
+    id: 0,
+    description: "Adjustable Glyph level factor weights",
+    cost: 1e7,
+    onPurchased: () => {
+      Effarig.quotes.show(Effarig.quotes.UNLOCK_WEIGHTS);
+      ui.view.tabs.reality.openGlyphWeights = true;
+      Tab.reality.glyphs.show();
+    }
+  },
+  glyphFilter: {
+    id: 1,
+    description: "Glyph Filtering",
+    cost: 2e8,
+    onPurchased: () => {
+      Effarig.quotes.show(Effarig.quotes.UNLOCK_GLYPH_FILTER);
+      player.reality.showSidebarPanel = GLYPH_SIDEBAR_MODE.FILTER_SETTINGS;
+    }
+  },
+  setSaves: {
+    id: 2,
+    description: "Glyph Set Saves",
+    cost: 3e9,
+    onPurchased: () => {
+      Effarig.quotes.show(Effarig.quotes.UNLOCK_SET_SAVES);
+      player.reality.showSidebarPanel = GLYPH_SIDEBAR_MODE.SAVED_SETS;
+    }
+  },
+  run: {
+    id: 3,
+    description: "Effarig's Reality",
+    cost: 5e11,
+    onPurchased: () => {
+      Effarig.quotes.show(Effarig.quotes.UNLOCK_RUN);
+    }
+  },
+  infinity: {
+    id: 4,
+    label: "Infinity",
+    get description() {
+      if (Pelle.isDoomed) return "Any rewards from Effarig's Infinity have been disabled.";
+      return ` Infinities raise the Replicanti cap
         Infinities increase your max Replicanti Galaxies
         Base Infinity Point gain is capped at ${format(DC.E200)} in Effarig's Reality
         Each type of Infinity Point multiplier is capped at ${format(DC.E50)} in Effarig's Reality`;
-      },
     },
-    eternity: {
-      id: 5,
-      label: "Eternity",
-      get description() {
-        if (Pelle.isDoomed) return "Any rewards from Effarig's Eternity have been disabled.";
-        return ` Eternities generates Infinities
-          Infinity Points are no longer limited in any way in Effarig's Reality
-          You have unlocked The Enslaved Ones`;
-      },
+  },
+  eternity: {
+    id: 5,
+    label: "Eternity",
+    get description() {
+      if (Pelle.isDoomed) return "Any rewards from Effarig's Eternity have been disabled.";
+      return ` Eternities generates Infinities
+        Infinity Points are no longer limited in any way in Effarig's Reality
+        You have unlocked The Enslaved Ones`;
+    },
+  },
+  reality: {
+    id: 6,
+    label: "Reality",
+    get description() {
+      if (Pelle.isDoomed) return "Any rewards from Effarig's Reality have been disabled.";
+      return " You have unlocked Effarig Glyphs (You may equip at most one)";
     },
-    reality: {
-      id: 6,
-      label: "Reality",
-      get description() {
-        if (Pelle.isDoomed) return "Any rewards from Effarig's Reality have been disabled.";
-        return " You have unlocked Effarig Glyphs (You may equip at most one)";
-      },
-    }
   }
 };
diff --git a/javascripts/core/secret-formula/game-database.js b/javascripts/core/secret-formula/game-database.js
index d400db021..392cde6c3 100644
--- a/javascripts/core/secret-formula/game-database.js
+++ b/javascripts/core/secret-formula/game-database.js
@@ -10,6 +10,7 @@ export const GameDatabase = {
     glyphSacrifice: {},
   },
   celestials: {
+    effarig: {},
     alchemy: {},
     pelle: {},
     descriptions: {},

From a9a020abea5923152e751e79125e6bd1ee240f19 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 18:30:18 -0700
Subject: [PATCH 46/89] clean up enslaved gamedatabase

---
 javascripts/core/celestials/enslaved.js         | 17 ++++-------------
 .../core/secret-formula/celestials/enslaved.js  |  7 ++++---
 src/components/modals/EnslavedHintsModal.vue    |  6 +++---
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/javascripts/core/celestials/enslaved.js b/javascripts/core/celestials/enslaved.js
index bf34196ec..a16b3cd3f 100644
--- a/javascripts/core/celestials/enslaved.js
+++ b/javascripts/core/celestials/enslaved.js
@@ -266,19 +266,10 @@ class EnslavedProgressState extends BitUpgradeState {
   }
 }
 
-export const EnslavedProgress = (function() {
-  const db = GameDatabase.celestials.enslaved.progress;
-  return {
-    hintsUnlocked: new EnslavedProgressState(db.hintsUnlocked),
-    ec1: new EnslavedProgressState(db.ec1),
-    feelEternity: new EnslavedProgressState(db.feelEternity),
-    ec6: new EnslavedProgressState(db.ec6),
-    c10: new EnslavedProgressState(db.c10),
-    secretStudy: new EnslavedProgressState(db.secretStudy),
-    storedTime: new EnslavedProgressState(db.storedTime),
-    challengeCombo: new EnslavedProgressState(db.challengeCombo),
-  };
-}());
+export const EnslavedProgress = mapGameDataToObject(
+  GameDatabase.celestials.enslaved.progress,
+  config => new EnslavedProgressState(config)
+);
 
 export const Tesseracts = {
   get bought() {
diff --git a/javascripts/core/secret-formula/celestials/enslaved.js b/javascripts/core/secret-formula/celestials/enslaved.js
index e3305e9a7..d77c655b6 100644
--- a/javascripts/core/secret-formula/celestials/enslaved.js
+++ b/javascripts/core/secret-formula/celestials/enslaved.js
@@ -60,7 +60,8 @@ GameDatabase.celestials.enslaved = {
   glyphHints: [
     "Infinity and Dilation Glyphs seem confined too tightly to be useful at all.",
     "Power and Time Glyphs are particularly strong here.",
-    "Effarig Glyphs are only useful with the right effects, but you can complete the Reality without one. " +
-      "A Replication Glyph is very helpful, but it's not strictly necessary or quite as strong " +
-      "as Power and Time."]
+    `Effarig Glyphs are only useful with the right effects, but you can complete the Reality without one.
+      A Replication Glyph is very helpful, but it's not strictly necessary or quite as strong
+      as Power and Time.`
+  ]
 };
diff --git a/src/components/modals/EnslavedHintsModal.vue b/src/components/modals/EnslavedHintsModal.vue
index 754a1f152..92cab4207 100644
--- a/src/components/modals/EnslavedHintsModal.vue
+++ b/src/components/modals/EnslavedHintsModal.vue
@@ -62,8 +62,8 @@ export default {
       this.canGetHint = this.currentStored >= this.nextHintCost;
       this.shownEntries = [];
 
-      this.realityHintsLeft = Object.values(EnslavedProgress).length;
-      for (const prog of Object.values(EnslavedProgress)) {
+      this.realityHintsLeft = EnslavedProgress.all.length;
+      for (const prog of EnslavedProgress.all) {
         if (prog.hasHint) {
           this.shownEntries.push([prog.hasProgress
             ? prog.config.progress
@@ -82,7 +82,7 @@ export default {
     },
     giveRealityHint(available) {
       if (available <= 0 || !Enslaved.spendTimeForHint()) return;
-      Object.values(EnslavedProgress).filter(prog => !prog.hasHint).randomElement().unlock();
+      EnslavedProgress.all.filter(prog => !prog.hasHint).randomElement().unlock();
     },
     giveGlyphHint(available) {
       if (available <= 0 || !Enslaved.spendTimeForHint()) return;

From 80d736d978c6c25603033dd38de9b047ded15165 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 19:23:08 -0700
Subject: [PATCH 47/89] drop unneeded IIFEs in gamedatabase declarations

---
 .../core/automator/automator-points.js        |   30 +-
 .../celestials/galaxy-generator.js            |  121 +-
 .../secret-formula/celestials/navigation.js   | 3105 ++++++++---------
 .../celestials/pelle-upgrades.js              |  369 +-
 .../secret-formula/celestials/perk-shop.js    |  165 +-
 .../eternity/dilation-upgrades.js             |  369 +-
 .../time-studies/normal-time-studies.js       | 1322 +++----
 .../reality/imaginary-upgrades.js             |  579 ++-
 .../reality/reality-upgrades.js               |  676 ++--
 9 files changed, 3364 insertions(+), 3372 deletions(-)

diff --git a/javascripts/core/automator/automator-points.js b/javascripts/core/automator/automator-points.js
index 53993b9c5..d994f6ef4 100644
--- a/javascripts/core/automator/automator-points.js
+++ b/javascripts/core/automator/automator-points.js
@@ -35,19 +35,17 @@ export const AutomatorPoints = {
   }
 };
 
-GameDatabase.reality.otherAutomatorPoints = (function() {
-  return [
-    {
-      name: "Reality Count",
-      automatorPoints: () => 2 * Math.clampMax(Currency.realities.value, 100),
-      shortDescription: () => `+${formatInt(2)} per Reality, up to ${formatInt(100)} Realities`,
-      symbol: "Ϟ",
-    },
-    {
-      name: "Black Hole",
-      automatorPoints: () => (BlackHole(1).isUnlocked ? 10 : 0),
-      shortDescription: () => `Unlocking gives ${formatInt(10)} AP`,
-      symbol: "<i class='fas fa-circle'></i>",
-    },
-  ];
-}());
+GameDatabase.reality.otherAutomatorPoints = [
+  {
+    name: "Reality Count",
+    automatorPoints: () => 2 * Math.clampMax(Currency.realities.value, 100),
+    shortDescription: () => `+${formatInt(2)} per Reality, up to ${formatInt(100)} Realities`,
+    symbol: "Ϟ",
+  },
+  {
+    name: "Black Hole",
+    automatorPoints: () => (BlackHole(1).isUnlocked ? 10 : 0),
+    shortDescription: () => `Unlocking gives ${formatInt(10)} AP`,
+    symbol: "<i class='fas fa-circle'></i>",
+  },
+];
diff --git a/javascripts/core/secret-formula/celestials/galaxy-generator.js b/javascripts/core/secret-formula/celestials/galaxy-generator.js
index 3d6fbe98a..0cfbd57ac 100644
--- a/javascripts/core/secret-formula/celestials/galaxy-generator.js
+++ b/javascripts/core/secret-formula/celestials/galaxy-generator.js
@@ -1,66 +1,65 @@
 import { GameDatabase } from "../game-database";
 
-GameDatabase.celestials.pelle.galaxyGeneratorUpgrades = (function() {
-  const formatCost = c => format(c, 2);
+const formatCost = c => format(c, 2);
 
-  const rebuyable = config => {
-    const { id, description, cost, effect, formatEffect, currency, currencyLabel } = config;
-    return {
-      id,
-      description,
-      cost: () => cost(player.celestials.pelle.rebuyables[id]),
-      formatCost,
-      effect: (x = player.celestials.pelle.rebuyables[id]) => effect(x),
-      formatEffect,
-      currency,
-      currencyLabel
-    };
-  };
+const rebuyable = config => {
+  const { id, description, cost, effect, formatEffect, currency, currencyLabel } = config;
   return {
-    additive: rebuyable({
-      id: "galaxyGeneratorAdditive",
-      description: "Increase base Galaxy generation by 2",
-      cost: x => Math.pow(3, x),
-      effect: x => x * 2,
-      formatEffect: x => `${format(x, 2, 2)}/s`,
-      currency: () => Currency.galaxyGeneratorGalaxies,
-      currencyLabel: "Galaxy"
-    }),
-    multiplicative: rebuyable({
-      id: "galaxyGeneratorMultiplicative",
-      description: "Multiply Galaxy generation",
-      cost: x => Math.pow(10, x),
-      effect: x => Decimal.pow(2.5, x),
-      formatEffect: x => formatX(x, 2, 1),
-      currency: () => Currency.galaxyGeneratorGalaxies,
-      currencyLabel: "Galaxy"
-    }),
-    antimatterMult: rebuyable({
-      id: "galaxyGeneratorAntimatterMult",
-      description: "Multiply Galaxy generation",
-      cost: x => Decimal.pow("1e100000000", 10 ** x),
-      effect: x => Decimal.pow(2, x),
-      formatEffect: x => formatX(x, 2),
-      currency: () => Currency.antimatter,
-      currencyLabel: "Antimatter"
-    }),
-    IPMult: rebuyable({
-      id: "galaxyGeneratorIPMult",
-      description: "Multiply Galaxy generation",
-      cost: x => Decimal.pow("1e2000000", 100 ** x),
-      effect: x => Decimal.pow(2, x),
-      formatEffect: x => formatX(x, 2),
-      currency: () => Currency.infinityPoints,
-      currencyLabel: "Infinity Point"
-    }),
-    EPMult: rebuyable({
-      id: "galaxyGeneratorEPMult",
-      description: "Multiply Galaxy generation",
-      cost: x => Decimal.pow("1e10000", 1000 ** x),
-      effect: x => Decimal.pow(2, x),
-      formatEffect: x => formatX(x, 2),
-      currency: () => Currency.eternityPoints,
-      currencyLabel: "Eternity Point"
-    }),
+    id,
+    description,
+    cost: () => cost(player.celestials.pelle.rebuyables[id]),
+    formatCost,
+    effect: (x = player.celestials.pelle.rebuyables[id]) => effect(x),
+    formatEffect,
+    currency,
+    currencyLabel
   };
-}());
+};
+
+GameDatabase.celestials.pelle.galaxyGeneratorUpgrades = {
+  additive: rebuyable({
+    id: "galaxyGeneratorAdditive",
+    description: "Increase base Galaxy generation by 2",
+    cost: x => Math.pow(3, x),
+    effect: x => x * 2,
+    formatEffect: x => `${format(x, 2, 2)}/s`,
+    currency: () => Currency.galaxyGeneratorGalaxies,
+    currencyLabel: "Galaxy"
+  }),
+  multiplicative: rebuyable({
+    id: "galaxyGeneratorMultiplicative",
+    description: "Multiply Galaxy generation",
+    cost: x => Math.pow(10, x),
+    effect: x => Decimal.pow(2.5, x),
+    formatEffect: x => formatX(x, 2, 1),
+    currency: () => Currency.galaxyGeneratorGalaxies,
+    currencyLabel: "Galaxy"
+  }),
+  antimatterMult: rebuyable({
+    id: "galaxyGeneratorAntimatterMult",
+    description: "Multiply Galaxy generation",
+    cost: x => Decimal.pow("1e100000000", 10 ** x),
+    effect: x => Decimal.pow(2, x),
+    formatEffect: x => formatX(x, 2),
+    currency: () => Currency.antimatter,
+    currencyLabel: "Antimatter"
+  }),
+  IPMult: rebuyable({
+    id: "galaxyGeneratorIPMult",
+    description: "Multiply Galaxy generation",
+    cost: x => Decimal.pow("1e2000000", 100 ** x),
+    effect: x => Decimal.pow(2, x),
+    formatEffect: x => formatX(x, 2),
+    currency: () => Currency.infinityPoints,
+    currencyLabel: "Infinity Point"
+  }),
+  EPMult: rebuyable({
+    id: "galaxyGeneratorEPMult",
+    description: "Multiply Galaxy generation",
+    cost: x => Decimal.pow("1e10000", 1000 ** x),
+    effect: x => Decimal.pow(2, x),
+    formatEffect: x => formatX(x, 2),
+    currency: () => Currency.eternityPoints,
+    currencyLabel: "Eternity Point"
+  }),
+};
diff --git a/javascripts/core/secret-formula/celestials/navigation.js b/javascripts/core/secret-formula/celestials/navigation.js
index 69328ee3c..7b3a2c75e 100644
--- a/javascripts/core/secret-formula/celestials/navigation.js
+++ b/javascripts/core/secret-formula/celestials/navigation.js
@@ -29,1642 +29,1641 @@ export const CELESTIAL_NAV_DRAW_ORDER = {
   NODE_OVERLAYS: 3000,
 };
 
-GameDatabase.celestials.navigation = (function() {
-  const Positions = Object.freeze({
-    teresa: new Vector(100, 100),
-    teresaPerkPointShop: new Vector(0, -50),
+const Positions = Object.freeze({
+  teresa: new Vector(100, 100),
+  teresaPerkPointShop: new Vector(0, -50),
 
-    effarigShop: new Vector(300, 0),
-    effarigRealityUnlock: new Vector(400, 50),
-    effarigNode: new Vector(550, 25),
+  effarigShop: new Vector(300, 0),
+  effarigRealityUnlock: new Vector(400, 50),
+  effarigNode: new Vector(550, 25),
 
-    enslavedReality: new Vector(650, 250),
-    enslavedGlyphLevel: new Vector(650 + 75 * Math.cos(Math.PI / 180 * -60), 250 + 75 * Math.sin(Math.PI / 180 * -60)),
-    enslavedGlyphRarity: new Vector(650 + 75 * Math.cos(Math.PI / 180 * 120), 250 + 75 * Math.sin(Math.PI / 180 * 120)),
+  enslavedReality: new Vector(650, 250),
+  enslavedGlyphLevel: new Vector(650 + 75 * Math.cos(Math.PI / 180 * -60), 250 + 75 * Math.sin(Math.PI / 180 * -60)),
+  enslavedGlyphRarity: new Vector(650 + 75 * Math.cos(Math.PI / 180 * 120), 250 + 75 * Math.sin(Math.PI / 180 * 120)),
 
-    vUnlockAchievement: new Vector(400, 350 + 50 * Math.sqrt(3)),
-    vAchievement0: new Vector(350, 350),
-    vAchievement1: new Vector(450, 350),
-    vAchievement2: new Vector(500, 350 + 50 * Math.sqrt(3)),
-    vAchievement3: new Vector(450, 350 + 100 * Math.sqrt(3)),
-    vAchievement4: new Vector(350, 350 + 100 * Math.sqrt(3)),
-    vAchievement5: new Vector(300, 350 + 50 * Math.sqrt(3)),
+  vUnlockAchievement: new Vector(400, 350 + 50 * Math.sqrt(3)),
+  vAchievement0: new Vector(350, 350),
+  vAchievement1: new Vector(450, 350),
+  vAchievement2: new Vector(500, 350 + 50 * Math.sqrt(3)),
+  vAchievement3: new Vector(450, 350 + 100 * Math.sqrt(3)),
+  vAchievement4: new Vector(350, 350 + 100 * Math.sqrt(3)),
+  vAchievement5: new Vector(300, 350 + 50 * Math.sqrt(3)),
 
-    raReality: new Vector(400, 200),
-    raPetTeresa: new Vector(400 + 85 * Math.sin(Math.PI / 180 * 252), 200 + 85 * Math.cos(Math.PI / 180 * 252)),
-    raPetEffarig: new Vector(400 + 85 * Math.sin(Math.PI / 180 * 140), 200 + 85 * Math.cos(Math.PI / 180 * 140)),
-    raPetEnslaved: new Vector(400 + 85 * Math.sin(Math.PI / 180 * 78), 200 + 85 * Math.cos(Math.PI / 180 * 78)),
-    raPetV: new Vector(400 + 85 * Math.sin(Math.PI / 180 * 0), 200 + 85 * Math.cos(Math.PI / 180 * 0)),
+  raReality: new Vector(400, 200),
+  raPetTeresa: new Vector(400 + 85 * Math.sin(Math.PI / 180 * 252), 200 + 85 * Math.cos(Math.PI / 180 * 252)),
+  raPetEffarig: new Vector(400 + 85 * Math.sin(Math.PI / 180 * 140), 200 + 85 * Math.cos(Math.PI / 180 * 140)),
+  raPetEnslaved: new Vector(400 + 85 * Math.sin(Math.PI / 180 * 78), 200 + 85 * Math.cos(Math.PI / 180 * 78)),
+  raPetV: new Vector(400 + 85 * Math.sin(Math.PI / 180 * 0), 200 + 85 * Math.cos(Math.PI / 180 * 0)),
 
-    laitelaFirstCenter: new Vector(150, 450),
-    laitelaFirstLeft: new Vector(100, 500),
-    laitelaFirstRight: new Vector(200, 500),
-    laitelaSecondCenter: new Vector(150, 550),
-    laitelaSecondLeft: new Vector(100, 600),
-    laitelaSecondRight: new Vector(200, 600),
-    laitelaThirdCenter: new Vector(150, 650),
-  });
-  return {
-    "teresa-base": {
-      visible: () => true,
-      complete: () => 1,
-      node: {
-        clickAction: () => Tab.celestials.teresa.show(true),
-        completeClass: "c-celestial-nav__test-complete",
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        position: Positions.teresa,
-        ring: {
-          rMajor: 78,
-          rMinor: 64,
-        },
-        legend: {
-          text: "Teresa",
-          angle: 135,
-          diagonal: 32,
-          horizontal: 16,
-        },
-      },
-    },
-    "teresa-reality-unlock": {
-      visible: () => true,
-      complete: () => (TeresaUnlocks.run.canBeApplied
-        ? 1 : Decimal.pLog10(Teresa.pouredAmount) / Math.log10(TeresaUnlocks.run.price)),
-      node: {
-        completeClass: "c-celestial-nav__test-complete",
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        position: Positions.teresa,
-        ring: {
-          rMajor: 32,
-          rMinor: 22,
-        },
-        legend: {
-          hideWhenCompleted: true,
-          text: () => {
-            const rm = Teresa.pouredAmount;
-            const cost = TeresaUnlocks.run.price;
-            return `Pour ${format(rm, 2)} / ${format(cost, 2)} RM`;
-          },
-          angle: 135,
-          diagonal: 16,
-          horizontal: 16,
-        },
-      },
-      connector: (function() {
-        const pathStart = -Math.PI;
-        const pathEnd = Math.PI;
-        const path = LogarithmicSpiral.fromPolarEndpoints(Positions.teresa, -Math.PI, 69, Math.PI, 26);
-        const pathPadStart = path.angleFromRadius(64 - 3) - pathStart;
-        const pathPadEnd = pathEnd - path.angleFromRadius(34);
-        return {
-          pathStart,
-          pathEnd,
-          path,
-          pathPadStart,
-          pathPadEnd,
-        };
-      }()),
-    },
-    "teresa-reality": {
-      visible: () => true,
-      complete: () => (Teresa.runCompleted ? 1 : 0),
-      node: {
-        clickAction: () => Tab.celestials.teresa.show(true),
-        completeClass: "c-celestial-nav__test-complete",
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        symbol: "Ϟ",
-        position: Positions.teresa,
-        ring: {
-          rMajor: 16,
-        },
-        alwaysShowLegend: true,
-        legend: {
-          text: "Teresa's Reality",
-          angle: -135,
-          diagonal: 96,
-          horizontal: 16,
-        },
-      }
-    },
-    "teresa-pp-shop": {
-      visible: () => true,
-      complete: () => (TeresaUnlocks.shop.canBeApplied
-        ? 1 : Decimal.pLog10(Teresa.pouredAmount) / Math.log10(TeresaUnlocks.shop.price)),
-      node: {
-        clickAction: () => Tab.celestials.teresa.show(true),
-        completeClass: "c-celestial-nav__test-complete",
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        position: Positions.teresaPerkPointShop,
-        ring: {
-          rMajor: 16,
-          rMinor: 0,
-        },
-        legend: {
-          text: complete => {
-            if (complete >= 1) return "Perk Point Shop";
-            const rm = Teresa.pouredAmount;
-            const cost = TeresaUnlocks.shop.price;
-            return [
-              "Perk Point Shop",
-              `Pour ${format(rm, 2)} / ${format(cost, 2)} Reality Machines`
-            ];
-          },
-          angle: -35,
-          diagonal: 16,
-          horizontal: 16,
-        },
-      },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: LinearPath.connectCircles(Positions.teresa, 78 - 1, Positions.teresaPerkPointShop, 16 - 1),
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "effarig-shop": {
-      visible: () => true,
-      complete: () => (TeresaUnlocks.effarig.canBeApplied
-        ? 1 : Decimal.pLog10(Teresa.pouredAmount) / Math.log10(TeresaUnlocks.effarig.price)),
-      node: {
-        clickAction: () => Tab.celestials.effarig.show(true),
-        completeClass: "c-celestial-nav__effarig",
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        position: Positions.effarigShop,
-        ring: {
-          rMajor: 24,
-        },
-        legend: {
-          text: complete => {
-            if (complete >= 1) return "Effarig's Shop";
-            const rm = Teresa.pouredAmount;
-            const cost = TeresaUnlocks.effarig.price;
-            return [
-              "Effarig",
-              `Pour ${format(rm, 2)} / ${format(cost, 2)} Reality Machines`
-            ];
-          },
-          angle: -135,
-          diagonal: 16,
-          horizontal: 16,
-        },
-      },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: LinearPath.connectCircles(Positions.teresa, 78 - 1, Positions.effarigShop, 24 - 1),
-        fill: "url(#gradTeresaEffarig)",
-      }
-    },
-    "effarig-reality-unlock": {
-      visible: () => TeresaUnlocks.effarig.canBeApplied,
-      // If the upgrade to unlock the reality isn't yet bought, clamp the progress at 99.9%,
-      // even if the player has enough relic shards to buy it.
-      complete: () => (EffarigUnlock.run.isUnlocked
-        ? 1 : Math.clampMax(0.999, Decimal.pLog10(Currency.relicShards.value) /
-          Math.log10(EffarigUnlock.run.cost))),
-      node: {
-        clickAction: () => Tab.celestials.effarig.show(true),
-        completeClass: "c-celestial-nav__effarig",
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        position: Positions.effarigRealityUnlock,
-        ring: {
-          rMajor: 16,
-        },
-        legend: {
-          text: complete => {
-            if (complete >= 1) return "Unlock Effarig's Reality";
-            const rs = Currency.relicShards.value;
-            const cost = EffarigUnlock.run.cost;
-            return [
-              "Unlock Effarig's Reality",
-              `Reach ${format(rs, 2)} / ${format(cost, 2)} Relic Shards`
-            ];
-          },
-          angle: 75,
-          diagonal: 40,
-          horizontal: 16,
-        },
-      },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: LinearPath.connectCircles(Positions.effarigShop, 24 - 1, Positions.effarigRealityUnlock, 16 - 1),
-        fill: "#d13737",
-      }
-    },
-    "effarig-infinity": {
-      visible: () => EffarigUnlock.run.isUnlocked,
-      complete: () => {
-        if (EffarigUnlock.infinity.isUnlocked) return 1;
-        if (!Effarig.isRunning) return 0;
+  laitelaFirstCenter: new Vector(150, 450),
+  laitelaFirstLeft: new Vector(100, 500),
+  laitelaFirstRight: new Vector(200, 500),
+  laitelaSecondCenter: new Vector(150, 550),
+  laitelaSecondLeft: new Vector(100, 600),
+  laitelaSecondRight: new Vector(200, 600),
+  laitelaThirdCenter: new Vector(150, 650),
+});
 
-        return Currency.antimatter.value.pLog10() / Decimal.NUMBER_MAX_VALUE.log10();
+GameDatabase.celestials.navigation = {
+  "teresa-base": {
+    visible: () => true,
+    complete: () => 1,
+    node: {
+      clickAction: () => Tab.celestials.teresa.show(true),
+      completeClass: "c-celestial-nav__test-complete",
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      position: Positions.teresa,
+      ring: {
+        rMajor: 78,
+        rMinor: 64,
       },
-      node: {
-        clickAction: () => Tab.celestials.effarig.show(true),
-        completeClass: "c-celestial-nav__effarig",
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        position: Positions.effarigNode,
-        ring: {
-          rMajor: 60,
-          rMinor: 52,
-        },
-        legend: {
-          text: complete => {
-            if (complete >= 1) return "Effarig's Infinity";
-            if (complete === 0) return "Unlock Effarig's Reality";
-            const am = Effarig.isRunning ? Currency.antimatter.value : 0;
-            return [
-              "Effarig's Infinity",
-              `Reach ${format(am, 2)} / ${format(Number.MAX_VALUE, 2)}`,
-              "Antimatter inside Effarig's Reality."
-            ];
-          },
-          angle: 0,
-          diagonal: 100,
-          horizontal: 16,
-        },
-        bgDrawOrder: CELESTIAL_NAV_DRAW_ORDER.NODE_BG + 750,
+      legend: {
+        text: "Teresa",
+        angle: 135,
+        diagonal: 32,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: LinearPath.connectCircles(Positions.effarigRealityUnlock, 16 - 1, Positions.effarigNode, 60 - 1),
-        fill: "#d13737",
-      }
     },
-    "effarig-eternity": {
-      visible: () => EffarigUnlock.infinity.isUnlocked,
-      complete: () => {
-        if (EffarigUnlock.eternity.isUnlocked) return 1;
-        if (!Effarig.isRunning) return 0;
+  },
+  "teresa-reality-unlock": {
+    visible: () => true,
+    complete: () => (TeresaUnlocks.run.canBeApplied
+      ? 1 : Decimal.pLog10(Teresa.pouredAmount) / Math.log10(TeresaUnlocks.run.price)),
+    node: {
+      completeClass: "c-celestial-nav__test-complete",
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      position: Positions.teresa,
+      ring: {
+        rMajor: 32,
+        rMinor: 22,
+      },
+      legend: {
+        hideWhenCompleted: true,
+        text: () => {
+          const rm = Teresa.pouredAmount;
+          const cost = TeresaUnlocks.run.price;
+          return `Pour ${format(rm, 2)} / ${format(cost, 2)} RM`;
+        },
+        angle: 135,
+        diagonal: 16,
+        horizontal: 16,
+      },
+    },
+    connector: (function() {
+      const pathStart = -Math.PI;
+      const pathEnd = Math.PI;
+      const path = LogarithmicSpiral.fromPolarEndpoints(Positions.teresa, -Math.PI, 69, Math.PI, 26);
+      const pathPadStart = path.angleFromRadius(64 - 3) - pathStart;
+      const pathPadEnd = pathEnd - path.angleFromRadius(34);
+      return {
+        pathStart,
+        pathEnd,
+        path,
+        pathPadStart,
+        pathPadEnd,
+      };
+    }()),
+  },
+  "teresa-reality": {
+    visible: () => true,
+    complete: () => (Teresa.runCompleted ? 1 : 0),
+    node: {
+      clickAction: () => Tab.celestials.teresa.show(true),
+      completeClass: "c-celestial-nav__test-complete",
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      symbol: "Ϟ",
+      position: Positions.teresa,
+      ring: {
+        rMajor: 16,
+      },
+      alwaysShowLegend: true,
+      legend: {
+        text: "Teresa's Reality",
+        angle: -135,
+        diagonal: 96,
+        horizontal: 16,
+      },
+    }
+  },
+  "teresa-pp-shop": {
+    visible: () => true,
+    complete: () => (TeresaUnlocks.shop.canBeApplied
+      ? 1 : Decimal.pLog10(Teresa.pouredAmount) / Math.log10(TeresaUnlocks.shop.price)),
+    node: {
+      clickAction: () => Tab.celestials.teresa.show(true),
+      completeClass: "c-celestial-nav__test-complete",
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      position: Positions.teresaPerkPointShop,
+      ring: {
+        rMajor: 16,
+        rMinor: 0,
+      },
+      legend: {
+        text: complete => {
+          if (complete >= 1) return "Perk Point Shop";
+          const rm = Teresa.pouredAmount;
+          const cost = TeresaUnlocks.shop.price;
+          return [
+            "Perk Point Shop",
+            `Pour ${format(rm, 2)} / ${format(cost, 2)} Reality Machines`
+          ];
+        },
+        angle: -35,
+        diagonal: 16,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: LinearPath.connectCircles(Positions.teresa, 78 - 1, Positions.teresaPerkPointShop, 16 - 1),
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "effarig-shop": {
+    visible: () => true,
+    complete: () => (TeresaUnlocks.effarig.canBeApplied
+      ? 1 : Decimal.pLog10(Teresa.pouredAmount) / Math.log10(TeresaUnlocks.effarig.price)),
+    node: {
+      clickAction: () => Tab.celestials.effarig.show(true),
+      completeClass: "c-celestial-nav__effarig",
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      position: Positions.effarigShop,
+      ring: {
+        rMajor: 24,
+      },
+      legend: {
+        text: complete => {
+          if (complete >= 1) return "Effarig's Shop";
+          const rm = Teresa.pouredAmount;
+          const cost = TeresaUnlocks.effarig.price;
+          return [
+            "Effarig",
+            `Pour ${format(rm, 2)} / ${format(cost, 2)} Reality Machines`
+          ];
+        },
+        angle: -135,
+        diagonal: 16,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: LinearPath.connectCircles(Positions.teresa, 78 - 1, Positions.effarigShop, 24 - 1),
+      fill: "url(#gradTeresaEffarig)",
+    }
+  },
+  "effarig-reality-unlock": {
+    visible: () => TeresaUnlocks.effarig.canBeApplied,
+    // If the upgrade to unlock the reality isn't yet bought, clamp the progress at 99.9%,
+    // even if the player has enough relic shards to buy it.
+    complete: () => (EffarigUnlock.run.isUnlocked
+      ? 1 : Math.clampMax(0.999, Decimal.pLog10(Currency.relicShards.value) /
+        Math.log10(EffarigUnlock.run.cost))),
+    node: {
+      clickAction: () => Tab.celestials.effarig.show(true),
+      completeClass: "c-celestial-nav__effarig",
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      position: Positions.effarigRealityUnlock,
+      ring: {
+        rMajor: 16,
+      },
+      legend: {
+        text: complete => {
+          if (complete >= 1) return "Unlock Effarig's Reality";
+          const rs = Currency.relicShards.value;
+          const cost = EffarigUnlock.run.cost;
+          return [
+            "Unlock Effarig's Reality",
+            `Reach ${format(rs, 2)} / ${format(cost, 2)} Relic Shards`
+          ];
+        },
+        angle: 75,
+        diagonal: 40,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: LinearPath.connectCircles(Positions.effarigShop, 24 - 1, Positions.effarigRealityUnlock, 16 - 1),
+      fill: "#d13737",
+    }
+  },
+  "effarig-infinity": {
+    visible: () => EffarigUnlock.run.isUnlocked,
+    complete: () => {
+      if (EffarigUnlock.infinity.isUnlocked) return 1;
+      if (!Effarig.isRunning) return 0;
 
-        return Currency.infinityPoints.value.pLog10() / Decimal.NUMBER_MAX_VALUE.log10();
-      },
-      node: {
-        clickAction: () => Tab.celestials.effarig.show(true),
-        completeClass: "c-celestial-nav__effarig",
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#7131ec",
-        position: Positions.effarigNode,
-        ring: {
-          rMajor: 40,
-          rMinor: 30,
-        },
-        legend: {
-          text: complete => {
-            if (complete >= 1) return "Effarig's Eternity";
-            const ip = Effarig.isRunning ? Currency.infinityPoints.value : 0;
-            return [
-              "Effarig's Eternity",
-              `Reach ${format(ip, 2)} / ${format(Number.MAX_VALUE, 2)}`,
-              "Infinity Points inside Effarig's Reality."
-            ];
-          },
-          angle: -45,
-          diagonal: 16,
-          horizontal: 16,
-        },
-      },
-      connector: (function() {
-        const pathStart = -Math.PI;
-        const pathEnd = 0;
-        const path = LogarithmicSpiral.fromPolarEndpoints(new Vector(560, 25), pathStart, 66, pathEnd, 26);
-        const pathPadStart = 0;
-        const pathPadEnd = pathEnd - path.angleFromRadius(30);
-        return {
-          pathStart,
-          pathEnd,
-          path,
-          pathPadStart,
-          pathPadEnd,
-          fill: "#d13737"
-        };
-      }())
+      return Currency.antimatter.value.pLog10() / Decimal.NUMBER_MAX_VALUE.log10();
     },
-    "effarig-reality": {
-      visible: () => EffarigUnlock.eternity.isUnlocked,
-      complete: () => {
-        if (EffarigUnlock.reality.isUnlocked) return 1;
-        if (!Effarig.isRunning) return 0;
+    node: {
+      clickAction: () => Tab.celestials.effarig.show(true),
+      completeClass: "c-celestial-nav__effarig",
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      position: Positions.effarigNode,
+      ring: {
+        rMajor: 60,
+        rMinor: 52,
+      },
+      legend: {
+        text: complete => {
+          if (complete >= 1) return "Effarig's Infinity";
+          if (complete === 0) return "Unlock Effarig's Reality";
+          const am = Effarig.isRunning ? Currency.antimatter.value : 0;
+          return [
+            "Effarig's Infinity",
+            `Reach ${format(am, 2)} / ${format(Number.MAX_VALUE, 2)}`,
+            "Antimatter inside Effarig's Reality."
+          ];
+        },
+        angle: 0,
+        diagonal: 100,
+        horizontal: 16,
+      },
+      bgDrawOrder: CELESTIAL_NAV_DRAW_ORDER.NODE_BG + 750,
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: LinearPath.connectCircles(Positions.effarigRealityUnlock, 16 - 1, Positions.effarigNode, 60 - 1),
+      fill: "#d13737",
+    }
+  },
+  "effarig-eternity": {
+    visible: () => EffarigUnlock.infinity.isUnlocked,
+    complete: () => {
+      if (EffarigUnlock.eternity.isUnlocked) return 1;
+      if (!Effarig.isRunning) return 0;
 
-        return Currency.eternityPoints.value.pLog10() / 4000;
-      },
-      node: {
-        clickAction: () => Tab.celestials.effarig.show(true),
-        completeClass: "c-celestial-nav__effarig",
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#A101ec",
-        position: new Vector(550, 25),
-        ring: {
-          rMajor: 20,
-          rMinor: 0,
-        },
-        symbol: "Ϙ",
-        alwaysShowLegend: true,
-        legend: {
-          text: complete => {
-            if (complete >= 1) return "Effarig's Reality";
-            const ep = Effarig.isRunning ? Currency.eternityPoints.value : 0;
-            const goal = DC.E4000;
-            return [
-              "Effarig's Reality",
-              `Reach ${format(ep, 2)} / ${format(goal, 2)}`,
-              "Eternity Points inside Effarig's Reality."
-            ];
-          },
-          angle: -120,
-          diagonal: 82,
-          horizontal: 16,
-        },
-      },
-      connector: (function() {
-        const pathStart = 0;
-        const pathEnd = Math.PI;
-        const path = LogarithmicSpiral.fromPolarEndpoints(new Vector(558, 25), pathStart, 26, pathEnd, 24);
-        const pathPadStart = 0;
-        const pathPadEnd = 0;
-        return {
-          pathStart,
-          pathEnd,
-          path,
-          pathPadStart,
-          pathPadEnd,
-          fill: "#d13737"
-        };
-      }())
+      return Currency.infinityPoints.value.pLog10() / Decimal.NUMBER_MAX_VALUE.log10();
     },
-    "enslaved": {
-      visible: () => EffarigUnlock.eternity.isUnlocked,
-      complete: () => (EffarigUnlock.eternity.isUnlocked ? 1 : 0),
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.enslaved.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffa337",
-        position: Positions.enslavedReality,
-        ring: {
-          rMajor: 80,
-          rMinor: 70,
-          gapCenterDeg: 15,
-          gapDeg: 200,
-        },
-        alwaysShowLegend: false,
-        legend: {
-          text: "Enslaved",
-          angle: -90,
-          diagonal: 20,
-          horizontal: 16,
-        },
+    node: {
+      clickAction: () => Tab.celestials.effarig.show(true),
+      completeClass: "c-celestial-nav__effarig",
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#7131ec",
+      position: Positions.effarigNode,
+      ring: {
+        rMajor: 40,
+        rMinor: 30,
+      },
+      legend: {
+        text: complete => {
+          if (complete >= 1) return "Effarig's Eternity";
+          const ip = Effarig.isRunning ? Currency.infinityPoints.value : 0;
+          return [
+            "Effarig's Eternity",
+            `Reach ${format(ip, 2)} / ${format(Number.MAX_VALUE, 2)}`,
+            "Infinity Points inside Effarig's Reality."
+          ];
+        },
+        angle: -45,
+        diagonal: 16,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        drawOrder: CELESTIAL_NAV_DRAW_ORDER.NODE_BG + 500,
-        path: LinearPath.connectCircles(Positions.effarigNode, 40 - 1, Positions.enslavedReality, 80 - 1),
-        fill: "url(#gradEffarigEnslaved)",
-      }
     },
-    "enslaved-unlock-glyph-level": {
-      visible: () => EffarigUnlock.eternity.isUnlocked,
-      complete: () => player.records.bestReality.glyphLevel / 5000,
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.enslaved.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffa337",
-        position: Positions.enslavedGlyphLevel,
-        ring: {
-          rMajor: 24,
-          rMinor: 16,
-          gapCenterDeg: 40,
-          gapDeg: 60,
-          gapAngleDeg: 0,
-        },
-        legend: {
-          text: complete => {
-            if (complete >= 1) return "Broken the chain with Glyph level";
-            const goal = 5000;
-            return [
-              "Break a chain",
-              `Reach Glyph level ${formatInt(Math.min(player.records.bestReality.glyphLevel, goal))}/${formatInt(goal)}`
-            ];
-          },
-          angle: -45,
-          diagonal: 16,
-          horizontal: 16,
-        },
-      },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(
-          new Vector(650 - 74 * Math.sqrt(0.75), 250 - 74 * 0.5),
-          Positions.enslavedGlyphLevel)
-          .trimEnd(23),
-        fill: "#ffa337",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "enslaved-unlock-glyph-rarity": {
-      visible: () => EffarigUnlock.eternity.isUnlocked,
-      complete: () => {
-        const bestRarity = strengthToRarity(player.records.bestReality.glyphStrength);
-        return bestRarity / 100;
-      },
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.enslaved.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffa337",
-        position: Positions.enslavedGlyphRarity,
-        ring: {
-          rMajor: 24,
-          rMinor: 16,
-          gapCenterDeg: 220,
-          gapDeg: 60,
-          gapAngleDeg: 0,
-        },
-        legend: {
-          text: complete => {
-            if (complete >= 1) return "Broken the chain with Glyph rarity";
-            const goal = 100;
-            return [
-              "Break a chain",
-              `Reach Glyph rarity ${formatPercents(complete * goal / 100, 1)}/${formatPercents(goal / 100, 1)}`
-            ];
-          },
-          angle: 135,
-          diagonal: 32,
-          horizontal: 32,
-        },
-      },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.enslavedGlyphRarity, Positions.enslavedGlyphLevel).trimStart(23).trimEnd(23),
-        fill: "#ffa337",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "enslaved-reality": {
-      visible: () => EffarigUnlock.eternity.isUnlocked,
-      complete: () => {
-        if (Enslaved.isCompleted) return 1;
-        if (!Enslaved.isRunning) return 0;
+    connector: (function() {
+      const pathStart = -Math.PI;
+      const pathEnd = 0;
+      const path = LogarithmicSpiral.fromPolarEndpoints(new Vector(560, 25), pathStart, 66, pathEnd, 26);
+      const pathPadStart = 0;
+      const pathPadEnd = pathEnd - path.angleFromRadius(30);
+      return {
+        pathStart,
+        pathEnd,
+        path,
+        pathPadStart,
+        pathPadEnd,
+        fill: "#d13737"
+      };
+    }())
+  },
+  "effarig-reality": {
+    visible: () => EffarigUnlock.eternity.isUnlocked,
+    complete: () => {
+      if (EffarigUnlock.reality.isUnlocked) return 1;
+      if (!Effarig.isRunning) return 0;
 
-        return Currency.eternityPoints.value.pLog10() / 4000;
-      },
-      node: {
-        clickAction: () => Tab.celestials.enslaved.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffa337",
-        position: Positions.enslavedReality,
-        ring: {
-          rMajor: 80,
-          rMinor: 70,
-          gapCenterDeg: 195,
-          gapDeg: 200,
-        },
-        alwaysShowLegend: true,
-        legend: {
-          text: complete => {
-            if (complete >= 1) return "The Enslaved Ones' Reality";
-            const ep = Enslaved.isRunning ? Currency.eternityPoints.value : 0;
-            const goal = DC.E4000;
-            return [
-              "The Enslaved Ones' Reality",
-              `Reach ${format(ep, 2)} / ${format(goal, 2)}`,
-              "Eternity Points inside The Enslaved Ones' Reality."
-            ];
-          },
-          angle: 45,
-          diagonal: 16,
-          horizontal: 16,
-        },
-      },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.enslavedGlyphRarity, new Vector(650 + 74 * Math.sqrt(0.75), 250 + 74 * 0.5))
-          .trimStart(23),
-        fill: "#ffa337",
-      }
+      return Currency.eternityPoints.value.pLog10() / 4000;
     },
-    "v-unlock-achievement": {
-      visible: () => EffarigUnlock.reality.isUnlocked,
-      complete: () => {
-        if (Achievement(151).isUnlocked) return 1;
-        if (!player.requirementChecks.infinity.noAD8) return 0;
+    node: {
+      clickAction: () => Tab.celestials.effarig.show(true),
+      completeClass: "c-celestial-nav__effarig",
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#A101ec",
+      position: new Vector(550, 25),
+      ring: {
+        rMajor: 20,
+        rMinor: 0,
+      },
+      symbol: "Ϙ",
+      alwaysShowLegend: true,
+      legend: {
+        text: complete => {
+          if (complete >= 1) return "Effarig's Reality";
+          const ep = Effarig.isRunning ? Currency.eternityPoints.value : 0;
+          const goal = DC.E4000;
+          return [
+            "Effarig's Reality",
+            `Reach ${format(ep, 2)} / ${format(goal, 2)}`,
+            "Eternity Points inside Effarig's Reality."
+          ];
+        },
+        angle: -120,
+        diagonal: 82,
+        horizontal: 16,
+      },
+    },
+    connector: (function() {
+      const pathStart = 0;
+      const pathEnd = Math.PI;
+      const path = LogarithmicSpiral.fromPolarEndpoints(new Vector(558, 25), pathStart, 26, pathEnd, 24);
+      const pathPadStart = 0;
+      const pathPadEnd = 0;
+      return {
+        pathStart,
+        pathEnd,
+        path,
+        pathPadStart,
+        pathPadEnd,
+        fill: "#d13737"
+      };
+    }())
+  },
+  "enslaved": {
+    visible: () => EffarigUnlock.eternity.isUnlocked,
+    complete: () => (EffarigUnlock.eternity.isUnlocked ? 1 : 0),
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.enslaved.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffa337",
+      position: Positions.enslavedReality,
+      ring: {
+        rMajor: 80,
+        rMinor: 70,
+        gapCenterDeg: 15,
+        gapDeg: 200,
+      },
+      alwaysShowLegend: false,
+      legend: {
+        text: "Enslaved",
+        angle: -90,
+        diagonal: 20,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      drawOrder: CELESTIAL_NAV_DRAW_ORDER.NODE_BG + 500,
+      path: LinearPath.connectCircles(Positions.effarigNode, 40 - 1, Positions.enslavedReality, 80 - 1),
+      fill: "url(#gradEffarigEnslaved)",
+    }
+  },
+  "enslaved-unlock-glyph-level": {
+    visible: () => EffarigUnlock.eternity.isUnlocked,
+    complete: () => player.records.bestReality.glyphLevel / 5000,
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.enslaved.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffa337",
+      position: Positions.enslavedGlyphLevel,
+      ring: {
+        rMajor: 24,
+        rMinor: 16,
+        gapCenterDeg: 40,
+        gapDeg: 60,
+        gapAngleDeg: 0,
+      },
+      legend: {
+        text: complete => {
+          if (complete >= 1) return "Broken the chain with Glyph level";
+          const goal = 5000;
+          return [
+            "Break a chain",
+            `Reach Glyph level ${formatInt(Math.min(player.records.bestReality.glyphLevel, goal))}/${formatInt(goal)}`
+          ];
+        },
+        angle: -45,
+        diagonal: 16,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(
+        new Vector(650 - 74 * Math.sqrt(0.75), 250 - 74 * 0.5),
+        Positions.enslavedGlyphLevel)
+        .trimEnd(23),
+      fill: "#ffa337",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "enslaved-unlock-glyph-rarity": {
+    visible: () => EffarigUnlock.eternity.isUnlocked,
+    complete: () => {
+      const bestRarity = strengthToRarity(player.records.bestReality.glyphStrength);
+      return bestRarity / 100;
+    },
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.enslaved.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffa337",
+      position: Positions.enslavedGlyphRarity,
+      ring: {
+        rMajor: 24,
+        rMinor: 16,
+        gapCenterDeg: 220,
+        gapDeg: 60,
+        gapAngleDeg: 0,
+      },
+      legend: {
+        text: complete => {
+          if (complete >= 1) return "Broken the chain with Glyph rarity";
+          const goal = 100;
+          return [
+            "Break a chain",
+            `Reach Glyph rarity ${formatPercents(complete * goal / 100, 1)}/${formatPercents(goal / 100, 1)}`
+          ];
+        },
+        angle: 135,
+        diagonal: 32,
+        horizontal: 32,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.enslavedGlyphRarity, Positions.enslavedGlyphLevel).trimStart(23).trimEnd(23),
+      fill: "#ffa337",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "enslaved-reality": {
+    visible: () => EffarigUnlock.eternity.isUnlocked,
+    complete: () => {
+      if (Enslaved.isCompleted) return 1;
+      if (!Enslaved.isRunning) return 0;
 
-        return player.galaxies / 800;
-      },
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        symbol: "⌬",
-        symbolOffset: "2",
-        fill: "#ffe066",
-        position: Positions.vUnlockAchievement,
-        ring: {
-          rMajor: 20,
-        },
-        alwaysShowLegend: true,
-        legend: {
-          text: complete => {
-            const goal = 800;
-            if (complete >= 1) return "V's Reality";
-            const galaxies = player.requirementChecks.infinity.noAD8 ? player.galaxies : 0;
-            return [
-              "V's unlock Achievement",
-              `Reach ${formatInt(galaxies)} / ${formatInt(goal)} Antimatter Galaxies without buying`,
-              "8th Antimatter Dimensions in your current Infinity"
-            ];
-          },
-          angle: 35,
-          diagonal: 60,
-          horizontal: 16,
-        },
-      },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: LinearPath.connectCircles(Positions.enslavedReality, 80 - 1, Positions.vUnlockAchievement, 16 - 1),
-        fill: "url(#gradEnslavedV)",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
+      return Currency.eternityPoints.value.pLog10() / 4000;
     },
-    "v-unlock-1": {
-      visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => vUnlockProgress(1),
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement1,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => vUnlockLegendLabel(complete, 1),
-          angle: -135,
-          diagonal: 16,
-          horizontal: 16,
-        },
+    node: {
+      clickAction: () => Tab.celestials.enslaved.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffa337",
+      position: Positions.enslavedReality,
+      ring: {
+        rMajor: 80,
+        rMinor: 70,
+        gapCenterDeg: 195,
+        gapDeg: 200,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement1),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "v-unlock-2": {
-      visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => vUnlockProgress(2),
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement2,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => vUnlockLegendLabel(complete, 2),
-          angle: -135,
-          diagonal: 30,
-          horizontal: 16,
+      alwaysShowLegend: true,
+      legend: {
+        text: complete => {
+          if (complete >= 1) return "The Enslaved Ones' Reality";
+          const ep = Enslaved.isRunning ? Currency.eternityPoints.value : 0;
+          const goal = DC.E4000;
+          return [
+            "The Enslaved Ones' Reality",
+            `Reach ${format(ep, 2)} / ${format(goal, 2)}`,
+            "Eternity Points inside The Enslaved Ones' Reality."
+          ];
         },
+        angle: 45,
+        diagonal: 16,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement2),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
     },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.enslavedGlyphRarity, new Vector(650 + 74 * Math.sqrt(0.75), 250 + 74 * 0.5))
+        .trimStart(23),
+      fill: "#ffa337",
+    }
+  },
+  "v-unlock-achievement": {
+    visible: () => EffarigUnlock.reality.isUnlocked,
+    complete: () => {
+      if (Achievement(151).isUnlocked) return 1;
+      if (!player.requirementChecks.infinity.noAD8) return 0;
 
-    "v-unlock-3": {
-      visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => vUnlockProgress(3),
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement3,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => vUnlockLegendLabel(complete, 3),
-          angle: -135,
-          diagonal: 45,
-          horizontal: 16,
-        },
-      },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement3),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
+      return player.galaxies / 800;
     },
-    "v-unlock-4": {
-      visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => vUnlockProgress(4),
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement4,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => vUnlockLegendLabel(complete, 4),
-          angle: -135,
-          diagonal: 60,
-          horizontal: 16,
-        },
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      symbol: "⌬",
+      symbolOffset: "2",
+      fill: "#ffe066",
+      position: Positions.vUnlockAchievement,
+      ring: {
+        rMajor: 20,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement4),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "v-unlock-5": {
-      visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => vUnlockProgress(5),
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement5,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => vUnlockLegendLabel(complete, 5),
-          angle: -135,
-          diagonal: 75,
-          horizontal: 16,
+      alwaysShowLegend: true,
+      legend: {
+        text: complete => {
+          const goal = 800;
+          if (complete >= 1) return "V's Reality";
+          const galaxies = player.requirementChecks.infinity.noAD8 ? player.galaxies : 0;
+          return [
+            "V's unlock Achievement",
+            `Reach ${formatInt(galaxies)} / ${formatInt(goal)} Antimatter Galaxies without buying`,
+            "8th Antimatter Dimensions in your current Infinity"
+          ];
         },
+        angle: 35,
+        diagonal: 60,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement5),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
     },
-    "v-unlock-6": {
-      visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => vUnlockProgress(6),
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement0,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => vUnlockLegendLabel(complete, 6),
-          angle: -135,
-          diagonal: 90,
-          horizontal: 16,
-        },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: LinearPath.connectCircles(Positions.enslavedReality, 80 - 1, Positions.vUnlockAchievement, 16 - 1),
+      fill: "url(#gradEnslavedV)",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-unlock-1": {
+    visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => vUnlockProgress(1),
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement1,
+      ring: {
+        rMajor: 8,
+      },
+      legend: {
+        text: complete => vUnlockLegendLabel(complete, 1),
+        angle: -135,
+        diagonal: 16,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement0),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
     },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement1),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-unlock-2": {
+    visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => vUnlockProgress(2),
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement2,
+      ring: {
+        rMajor: 8,
+      },
+      legend: {
+        text: complete => vUnlockLegendLabel(complete, 2),
+        angle: -135,
+        diagonal: 30,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement2),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
 
-    "v-achievement-0": {
-      visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => VRunUnlocks.all[0].completions / 6,
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement0,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => {
-            const name = VRunUnlocks.all[0].config.name;
-            if (complete >= 1) return `V-Achievement "${name}"`;
-            const completions = VRunUnlocks.all[0].completions;
-            return [
-              "V-Achievement",
-              `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
-            ];
-          },
-          angle: -135,
-          diagonal: 16,
-          horizontal: 16,
-        },
+  "v-unlock-3": {
+    visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => vUnlockProgress(3),
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement3,
+      ring: {
+        rMajor: 8,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vAchievement5, Positions.vAchievement0),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "v-achievement-1": {
-      visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => VRunUnlocks.all[1].completions / 6,
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement1,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => {
-            const name = VRunUnlocks.all[1].config.name;
-            if (complete >= 1) return `V-Achievement "${name}"`;
-            const completions = VRunUnlocks.all[1].completions;
-            return [
-              "V-Achievement",
-              `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
-            ];
-          },
-          angle: 20,
-          diagonal: 16,
-          horizontal: 16,
-        },
+      legend: {
+        text: complete => vUnlockLegendLabel(complete, 3),
+        angle: -135,
+        diagonal: 45,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vAchievement0, Positions.vAchievement1),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
     },
-    "v-achievement-2": {
-      visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => VRunUnlocks.all[2].completions / 6,
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement2,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => {
-            const name = VRunUnlocks.all[2].config.name;
-            if (complete >= 1) return `V-Achievement "${name}"`;
-            const completions = VRunUnlocks.all[2].completions;
-            return [
-              "V-Achievement",
-              `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
-            ];
-          },
-          angle: 45,
-          diagonal: 16,
-          horizontal: 16,
-        },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement3),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-unlock-4": {
+    visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => vUnlockProgress(4),
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement4,
+      ring: {
+        rMajor: 8,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vAchievement1, Positions.vAchievement2),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "v-achievement-3": {
-      visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => VRunUnlocks.all[3].completions / 6,
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement3,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => {
-            const name = VRunUnlocks.all[3].config.name;
-            if (complete >= 1) return `V-Achievement "${name}"`;
-            const completions = VRunUnlocks.all[3].completions;
-            return [
-              "V-Achievement",
-              `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
-            ];
-          },
-          angle: 45,
-          diagonal: 16,
-          horizontal: 16,
-        },
+      legend: {
+        text: complete => vUnlockLegendLabel(complete, 4),
+        angle: -135,
+        diagonal: 60,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vAchievement2, Positions.vAchievement3),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
     },
-    "v-achievement-4": {
-      visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => VRunUnlocks.all[4].completions / 6,
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement4,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => {
-            const name = VRunUnlocks.all[4].config.name;
-            if (complete >= 1) return `V-Achievement "${name}"`;
-            const completions = VRunUnlocks.all[4].completions;
-            return [
-              "V-Achievement",
-              `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
-            ];
-          },
-          angle: 45,
-          diagonal: 16,
-          horizontal: 16,
-        },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement4),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-unlock-5": {
+    visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => vUnlockProgress(5),
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement5,
+      ring: {
+        rMajor: 8,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vAchievement3, Positions.vAchievement4),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "v-achievement-5": {
-      visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
-      complete: () => VRunUnlocks.all[5].completions / 6,
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.v.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#ffe066",
-        position: Positions.vAchievement5,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => {
-            const name = VRunUnlocks.all[5].config.name;
-            if (complete >= 1) return `V-Achievement "${name}"`;
-            const completions = VRunUnlocks.all[5].completions;
-            return [
-              "V-Achievement",
-              `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
-            ];
-          },
-          angle: 100,
-          diagonal: 16,
-          horizontal: 16,
-        },
+      legend: {
+        text: complete => vUnlockLegendLabel(complete, 5),
+        angle: -135,
+        diagonal: 75,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0,
-        pathEnd: 1,
-        path: new LinearPath(Positions.vAchievement4, Positions.vAchievement5),
-        fill: "#ffe066",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
     },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement5),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-unlock-6": {
+    visible: () => Achievement(151).isUnlocked || VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => vUnlockProgress(6),
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement0,
+      ring: {
+        rMajor: 8,
+      },
+      legend: {
+        text: complete => vUnlockLegendLabel(complete, 6),
+        angle: -135,
+        diagonal: 90,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vUnlockAchievement, Positions.vAchievement0),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
 
-    "ra": {
-      visible: () => VUnlocks.raUnlock.isUnlocked,
-      complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
-      node: {
-        clickAction: () => Tab.celestials.ra.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        symbol: "\uf185",
-        symbolOffset: "2",
-        fill: "#9063de",
-        position: Positions.raReality,
-        ring: {
-          rMajor: 24,
-        },
-        alwaysShowLegend: true,
-        legend: {
-          text: "Ra's Reality",
-          angle: 230,
-          diagonal: 85,
-          horizontal: 16,
-        },
-      }
-    },
-    "teresa-pet": {
-      visible: () => VUnlocks.raUnlock.isUnlocked,
-      complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.ra.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#9063de",
-        isStacked: true,
-        position: Positions.raPetTeresa,
-        ring: {
-          rMajor: 12,
-        },
-        legend: {
-          text: () => {
-            const level = Ra.pets.teresa.level;
-            if (level === 25) return `Ra's Teresa Memories have all been returned`;
-            return [
-              "Ra's Teresa Memory level",
-              `${formatInt(level)} / ${formatInt(25)}`
-            ];
-          },
-          angle: 142,
-          diagonal: 85,
-          horizontal: 16,
-        },
+  "v-achievement-0": {
+    visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => VRunUnlocks.all[0].completions / 6,
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement0,
+      ring: {
+        rMajor: 8,
       },
-      connector: {
-        pathStart: 0.05,
-        pathEnd: 0.95,
-        path: new LinearPath(Positions.raReality, Positions.raPetTeresa),
-        fill: "#9063de",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "teresa-pet-to-teresa": {
-      visible: () => VUnlocks.raUnlock.isUnlocked,
-      complete: () => Ra.pets.teresa.level / 25,
-      drawOrder: -1,
-      connector: {
-        pathStart: 0.05,
-        pathEnd: 0.70,
-        path: new LinearPath(Positions.raPetTeresa, Positions.teresa),
-        fill: "url(#gradRaTeresa)",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "effarig-pet": {
-      visible: () => VUnlocks.raUnlock.isUnlocked,
-      complete: () => Ra.pets.teresa.level / 8,
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.ra.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#9063de",
-        isStacked: true,
-        position: Positions.raPetEffarig,
-        ring: {
-          rMajor: 12,
-        },
-        legend: {
-          text: complete => {
-            const unlocked = Ra.pets.teresa.level;
-            const level = Ra.pets.effarig.level;
-            if (complete < 1) return `Ra's Teresa Memory level ${unlocked} / ${formatInt(8)}`;
-            if (level === 25) return `Ra's Effarig Memories have all been returned`;
-            return [
-              "Ra's Effarig Memory level",
-              `${formatInt(level)} / ${formatInt(25)}`
-            ];
-          },
-          angle: 142,
-          diagonal: 85,
-          horizontal: 16,
+      legend: {
+        text: complete => {
+          const name = VRunUnlocks.all[0].config.name;
+          if (complete >= 1) return `V-Achievement "${name}"`;
+          const completions = VRunUnlocks.all[0].completions;
+          return [
+            "V-Achievement",
+            `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
+          ];
         },
+        angle: -135,
+        diagonal: 16,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0.05,
-        pathEnd: 0.95,
-        path: new LinearPath(Positions.raReality, Positions.raPetEffarig),
-        fill: "#9063de",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
     },
-    "effarig-pet-to-effarig": {
-      visible: () => Ra.unlocks.effarigUnlock.isUnlocked,
-      complete: () => Ra.pets.effarig.level / 25,
-      drawOrder: -1,
-      connector: {
-        pathStart: 0.05,
-        pathEnd: 0.60,
-        path: new LinearPath(Positions.raPetEffarig, Positions.effarigNode),
-        fill: "url(#gradRaEffarig)",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "enslaved-pet": {
-      visible: () => Ra.unlocks.effarigUnlock.isUnlocked,
-      complete: () => Ra.pets.effarig.level / 8,
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.ra.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#9063de",
-        isStacked: true,
-        position: Positions.raPetEnslaved,
-        ring: {
-          rMajor: 12,
-        },
-        legend: {
-          text: complete => {
-            const unlocked = Ra.pets.effarig.level;
-            const level = Ra.pets.enslaved.level;
-            if (complete < 1) return `Ra's Effarig Memory level ${unlocked} / ${formatInt(8)}`;
-            if (level === 25) return `Ra's Enslaved Memories have all been returned`;
-            return [
-              "Ra's Enslaved Memory level",
-              `${formatInt(level)} / ${formatInt(25)}`
-            ];
-          },
-          angle: 142,
-          diagonal: 85,
-          horizontal: 16,
-        },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vAchievement5, Positions.vAchievement0),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-achievement-1": {
+    visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => VRunUnlocks.all[1].completions / 6,
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement1,
+      ring: {
+        rMajor: 8,
       },
-      connector: {
-        pathStart: 0.05,
-        pathEnd: 0.95,
-        path: new LinearPath(Positions.raReality, Positions.raPetEnslaved),
-        fill: "#9063de",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "enslaved-pet-to-enslaved": {
-      visible: () => Ra.unlocks.enslavedUnlock.isUnlocked,
-      complete: () => Ra.pets.enslaved.level / 25,
-      drawOrder: -1,
-      connector: {
-        pathStart: 0.05,
-        pathEnd: 0.55,
-        path: new LinearPath(Positions.raPetEnslaved, Positions.enslavedReality),
-        fill: "url(#gradRaEnslaved)",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "v-pet": {
-      visible: () => Ra.unlocks.enslavedUnlock.isUnlocked,
-      complete: () => Ra.pets.enslaved.level / 8,
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.ra.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#9063de",
-        isStacked: true,
-        position: Positions.raPetV,
-        ring: {
-          rMajor: 12,
-        },
-        legend: {
-          text: complete => {
-            const unlocked = Ra.pets.enslaved.level;
-            const level = Ra.pets.v.level;
-            if (complete < 1) return `Ra's Enslaved Memory level ${unlocked} / ${formatInt(8)}`;
-            if (level === 25) return `Ra's V Memories have all been returned`;
-            return [
-              "Ra's V Memory level",
-              `${formatInt(level)} / ${formatInt(25)}`
-            ];
-          },
-          angle: 142,
-          diagonal: 85,
-          horizontal: 16,
+      legend: {
+        text: complete => {
+          const name = VRunUnlocks.all[1].config.name;
+          if (complete >= 1) return `V-Achievement "${name}"`;
+          const completions = VRunUnlocks.all[1].completions;
+          return [
+            "V-Achievement",
+            `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
+          ];
         },
+        angle: 20,
+        diagonal: 16,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0.05,
-        pathEnd: 0.95,
-        path: new LinearPath(Positions.raReality, Positions.raPetV),
-        fill: "#9063de",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
     },
-    "v-pet-to-v": {
-      visible: () => Ra.unlocks.vUnlock.isUnlocked,
-      complete: () => Ra.pets.v.level / 25,
-      drawOrder: -1,
-      connector: {
-        pathStart: 0.05,
-        pathEnd: 0.42,
-        path: new LinearPath(Positions.raPetV, Positions.vUnlockAchievement),
-        fill: "url(#gradRaV)",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
-    },
-    "ra-ring-1": {
-      visible: () => VUnlocks.raUnlock.isUnlocked,
-      complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
-      node: {
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#9063de",
-        position: Positions.raReality,
-        ring: {
-          rMajor: 90,
-          rMinor: 80,
-          gapCenterDeg: 74,
-          gapDeg: 268,
-        },
-      }
-    },
-    "ra-ring-2": {
-      visible: () => VUnlocks.raUnlock.isUnlocked,
-      complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
-      node: {
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#9063de",
-        position: Positions.raReality,
-        ring: {
-          rMajor: 90,
-          rMinor: 80,
-          gapCenterDeg: 161,
-          gapDeg: 318,
-        },
-      }
-    },
-    "ra-ring-3": {
-      visible: () => VUnlocks.raUnlock.isUnlocked,
-      complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
-      node: {
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#9063de",
-        position: Positions.raReality,
-        ring: {
-          rMajor: 90,
-          rMinor: 80,
-          gapCenterDeg: 231,
-          gapDeg: 301,
-        },
-      }
-    },
-    "ra-ring-4": {
-      visible: () => VUnlocks.raUnlock.isUnlocked,
-      complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
-      node: {
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#9063de",
-        position: Positions.raReality,
-        ring: {
-          rMajor: 90,
-          rMinor: 80,
-          gapCenterDeg: 293,
-          gapDeg: 334,
-        },
-      }
-    },
-    "ra-ring-5": {
-      visible: () => VUnlocks.raUnlock.isUnlocked,
-      complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
-      node: {
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "#9063de",
-        position: Positions.raReality,
-        ring: {
-          rMajor: 90,
-          rMinor: 80,
-          gapCenterDeg: -14,
-          gapDeg: 316,
-        },
-      }
-    },
-    "laitela-unlock": {
-      visible: () => Ra.unlocks.vUnlock.isUnlocked,
-      complete: () => {
-        if (DarkMatterDimension(1).unlockUpgrade.canBeBought || Laitela.isUnlocked) return 1;
-        if (MachineHandler.isIMUnlocked) {
-          if (player.requirementChecks.reality.maxID1.neq(0)) return 0.5;
-          return Math.clampMax(0.999, player.antimatter.exponent / 1.5e12);
-        }
-        return Math.clampMax(0.25, Currency.realityMachines.value.pLog10() / MachineHandler.baseRMCap.exponent);
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vAchievement0, Positions.vAchievement1),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-achievement-2": {
+    visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => VRunUnlocks.all[2].completions / 6,
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement2,
+      ring: {
+        rMajor: 8,
       },
-      drawOrder: -1,
-      node: {
-        clickAction: () => Tab.celestials.laitela.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        symbol: "ᛝ",
-        symbolScale: 1.6,
-        symbolOffset: "0.6",
-        fill: "white",
-        position: Positions.laitelaFirstCenter,
-        ring: {
-          rMajor: 15,
+      legend: {
+        text: complete => {
+          const name = VRunUnlocks.all[2].config.name;
+          if (complete >= 1) return `V-Achievement "${name}"`;
+          const completions = VRunUnlocks.all[2].completions;
+          return [
+            "V-Achievement",
+            `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
+          ];
         },
-        alwaysShowLegend: true,
-        legend: {
-          text: complete => {
-            const realityName = "Lai'tela's Reality";
-            if (complete >= 1) return [realityName];
+        angle: 45,
+        diagonal: 16,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vAchievement1, Positions.vAchievement2),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-achievement-3": {
+    visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => VRunUnlocks.all[3].completions / 6,
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement3,
+      ring: {
+        rMajor: 8,
+      },
+      legend: {
+        text: complete => {
+          const name = VRunUnlocks.all[3].config.name;
+          if (complete >= 1) return `V-Achievement "${name}"`;
+          const completions = VRunUnlocks.all[3].completions;
+          return [
+            "V-Achievement",
+            `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
+          ];
+        },
+        angle: 45,
+        diagonal: 16,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vAchievement2, Positions.vAchievement3),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-achievement-4": {
+    visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => VRunUnlocks.all[4].completions / 6,
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement4,
+      ring: {
+        rMajor: 8,
+      },
+      legend: {
+        text: complete => {
+          const name = VRunUnlocks.all[4].config.name;
+          if (complete >= 1) return `V-Achievement "${name}"`;
+          const completions = VRunUnlocks.all[4].completions;
+          return [
+            "V-Achievement",
+            `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
+          ];
+        },
+        angle: 45,
+        diagonal: 16,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vAchievement3, Positions.vAchievement4),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-achievement-5": {
+    visible: () => VUnlocks.vAchievementUnlock.isUnlocked,
+    complete: () => VRunUnlocks.all[5].completions / 6,
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.v.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#ffe066",
+      position: Positions.vAchievement5,
+      ring: {
+        rMajor: 8,
+      },
+      legend: {
+        text: complete => {
+          const name = VRunUnlocks.all[5].config.name;
+          if (complete >= 1) return `V-Achievement "${name}"`;
+          const completions = VRunUnlocks.all[5].completions;
+          return [
+            "V-Achievement",
+            `Reach ${formatInt(completions)} / ${formatInt(6)} completions in ${name}.`
+          ];
+        },
+        angle: 100,
+        diagonal: 16,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0,
+      pathEnd: 1,
+      path: new LinearPath(Positions.vAchievement4, Positions.vAchievement5),
+      fill: "#ffe066",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
 
-            if (!MachineHandler.isIMUnlocked) {
-              const realityMachines = Currency.realityMachines.value;
-              const realityMachineCap = MachineHandler.baseRMCap;
-              return [
-                realityName,
-                "The limits of Reality Machines bind you",
-                `${format(realityMachines)} / ${format(realityMachineCap)}`
-              ];
-            }
+  "ra": {
+    visible: () => VUnlocks.raUnlock.isUnlocked,
+    complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
+    node: {
+      clickAction: () => Tab.celestials.ra.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      symbol: "\uf185",
+      symbolOffset: "2",
+      fill: "#9063de",
+      position: Positions.raReality,
+      ring: {
+        rMajor: 24,
+      },
+      alwaysShowLegend: true,
+      legend: {
+        text: "Ra's Reality",
+        angle: 230,
+        diagonal: 85,
+        horizontal: 16,
+      },
+    }
+  },
+  "teresa-pet": {
+    visible: () => VUnlocks.raUnlock.isUnlocked,
+    complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.ra.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#9063de",
+      isStacked: true,
+      position: Positions.raPetTeresa,
+      ring: {
+        rMajor: 12,
+      },
+      legend: {
+        text: () => {
+          const level = Ra.pets.teresa.level;
+          if (level === 25) return `Ra's Teresa Memories have all been returned`;
+          return [
+            "Ra's Teresa Memory level",
+            `${formatInt(level)} / ${formatInt(25)}`
+          ];
+        },
+        angle: 142,
+        diagonal: 85,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0.05,
+      pathEnd: 0.95,
+      path: new LinearPath(Positions.raReality, Positions.raPetTeresa),
+      fill: "#9063de",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "teresa-pet-to-teresa": {
+    visible: () => VUnlocks.raUnlock.isUnlocked,
+    complete: () => Ra.pets.teresa.level / 25,
+    drawOrder: -1,
+    connector: {
+      pathStart: 0.05,
+      pathEnd: 0.70,
+      path: new LinearPath(Positions.raPetTeresa, Positions.teresa),
+      fill: "url(#gradRaTeresa)",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "effarig-pet": {
+    visible: () => VUnlocks.raUnlock.isUnlocked,
+    complete: () => Ra.pets.teresa.level / 8,
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.ra.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#9063de",
+      isStacked: true,
+      position: Positions.raPetEffarig,
+      ring: {
+        rMajor: 12,
+      },
+      legend: {
+        text: complete => {
+          const unlocked = Ra.pets.teresa.level;
+          const level = Ra.pets.effarig.level;
+          if (complete < 1) return `Ra's Teresa Memory level ${unlocked} / ${formatInt(8)}`;
+          if (level === 25) return `Ra's Effarig Memories have all been returned`;
+          return [
+            "Ra's Effarig Memory level",
+            `${formatInt(level)} / ${formatInt(25)}`
+          ];
+        },
+        angle: 142,
+        diagonal: 85,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0.05,
+      pathEnd: 0.95,
+      path: new LinearPath(Positions.raReality, Positions.raPetEffarig),
+      fill: "#9063de",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "effarig-pet-to-effarig": {
+    visible: () => Ra.unlocks.effarigUnlock.isUnlocked,
+    complete: () => Ra.pets.effarig.level / 25,
+    drawOrder: -1,
+    connector: {
+      pathStart: 0.05,
+      pathEnd: 0.60,
+      path: new LinearPath(Positions.raPetEffarig, Positions.effarigNode),
+      fill: "url(#gradRaEffarig)",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "enslaved-pet": {
+    visible: () => Ra.unlocks.effarigUnlock.isUnlocked,
+    complete: () => Ra.pets.effarig.level / 8,
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.ra.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#9063de",
+      isStacked: true,
+      position: Positions.raPetEnslaved,
+      ring: {
+        rMajor: 12,
+      },
+      legend: {
+        text: complete => {
+          const unlocked = Ra.pets.effarig.level;
+          const level = Ra.pets.enslaved.level;
+          if (complete < 1) return `Ra's Effarig Memory level ${unlocked} / ${formatInt(8)}`;
+          if (level === 25) return `Ra's Enslaved Memories have all been returned`;
+          return [
+            "Ra's Enslaved Memory level",
+            `${formatInt(level)} / ${formatInt(25)}`
+          ];
+        },
+        angle: 142,
+        diagonal: 85,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0.05,
+      pathEnd: 0.95,
+      path: new LinearPath(Positions.raReality, Positions.raPetEnslaved),
+      fill: "#9063de",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "enslaved-pet-to-enslaved": {
+    visible: () => Ra.unlocks.enslavedUnlock.isUnlocked,
+    complete: () => Ra.pets.enslaved.level / 25,
+    drawOrder: -1,
+    connector: {
+      pathStart: 0.05,
+      pathEnd: 0.55,
+      path: new LinearPath(Positions.raPetEnslaved, Positions.enslavedReality),
+      fill: "url(#gradRaEnslaved)",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-pet": {
+    visible: () => Ra.unlocks.enslavedUnlock.isUnlocked,
+    complete: () => Ra.pets.enslaved.level / 8,
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.ra.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#9063de",
+      isStacked: true,
+      position: Positions.raPetV,
+      ring: {
+        rMajor: 12,
+      },
+      legend: {
+        text: complete => {
+          const unlocked = Ra.pets.enslaved.level;
+          const level = Ra.pets.v.level;
+          if (complete < 1) return `Ra's Enslaved Memory level ${unlocked} / ${formatInt(8)}`;
+          if (level === 25) return `Ra's V Memories have all been returned`;
+          return [
+            "Ra's V Memory level",
+            `${formatInt(level)} / ${formatInt(25)}`
+          ];
+        },
+        angle: 142,
+        diagonal: 85,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0.05,
+      pathEnd: 0.95,
+      path: new LinearPath(Positions.raReality, Positions.raPetV),
+      fill: "#9063de",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "v-pet-to-v": {
+    visible: () => Ra.unlocks.vUnlock.isUnlocked,
+    complete: () => Ra.pets.v.level / 25,
+    drawOrder: -1,
+    connector: {
+      pathStart: 0.05,
+      pathEnd: 0.42,
+      path: new LinearPath(Positions.raPetV, Positions.vUnlockAchievement),
+      fill: "url(#gradRaV)",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "ra-ring-1": {
+    visible: () => VUnlocks.raUnlock.isUnlocked,
+    complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
+    node: {
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#9063de",
+      position: Positions.raReality,
+      ring: {
+        rMajor: 90,
+        rMinor: 80,
+        gapCenterDeg: 74,
+        gapDeg: 268,
+      },
+    }
+  },
+  "ra-ring-2": {
+    visible: () => VUnlocks.raUnlock.isUnlocked,
+    complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
+    node: {
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#9063de",
+      position: Positions.raReality,
+      ring: {
+        rMajor: 90,
+        rMinor: 80,
+        gapCenterDeg: 161,
+        gapDeg: 318,
+      },
+    }
+  },
+  "ra-ring-3": {
+    visible: () => VUnlocks.raUnlock.isUnlocked,
+    complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
+    node: {
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#9063de",
+      position: Positions.raReality,
+      ring: {
+        rMajor: 90,
+        rMinor: 80,
+        gapCenterDeg: 231,
+        gapDeg: 301,
+      },
+    }
+  },
+  "ra-ring-4": {
+    visible: () => VUnlocks.raUnlock.isUnlocked,
+    complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
+    node: {
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#9063de",
+      position: Positions.raReality,
+      ring: {
+        rMajor: 90,
+        rMinor: 80,
+        gapCenterDeg: 293,
+        gapDeg: 334,
+      },
+    }
+  },
+  "ra-ring-5": {
+    visible: () => VUnlocks.raUnlock.isUnlocked,
+    complete: () => (VUnlocks.raUnlock.isUnlocked ? 1 : 0),
+    node: {
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "#9063de",
+      position: Positions.raReality,
+      ring: {
+        rMajor: 90,
+        rMinor: 80,
+        gapCenterDeg: -14,
+        gapDeg: 316,
+      },
+    }
+  },
+  "laitela-unlock": {
+    visible: () => Ra.unlocks.vUnlock.isUnlocked,
+    complete: () => {
+      if (DarkMatterDimension(1).unlockUpgrade.canBeBought || Laitela.isUnlocked) return 1;
+      if (MachineHandler.isIMUnlocked) {
+        if (player.requirementChecks.reality.maxID1.neq(0)) return 0.5;
+        return Math.clampMax(0.999, player.antimatter.exponent / 1.5e12);
+      }
+      return Math.clampMax(0.25, Currency.realityMachines.value.pLog10() / MachineHandler.baseRMCap.exponent);
+    },
+    drawOrder: -1,
+    node: {
+      clickAction: () => Tab.celestials.laitela.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      symbol: "ᛝ",
+      symbolScale: 1.6,
+      symbolOffset: "0.6",
+      fill: "white",
+      position: Positions.laitelaFirstCenter,
+      ring: {
+        rMajor: 15,
+      },
+      alwaysShowLegend: true,
+      legend: {
+        text: complete => {
+          const realityName = "Lai'tela's Reality";
+          if (complete >= 1) return [realityName];
 
-            const hasIDs = player.requirementChecks.reality.maxID1.neq(0);
-            if (hasIDs) return [
-              realityName,
-              "The Power of Infinity Dimensions",
-              "blocks your path."
-            ];
-
-            const antimatter = Currency.antimatter.value;
-            const amGoal = DC.E1_5E12;
+          if (!MachineHandler.isIMUnlocked) {
+            const realityMachines = Currency.realityMachines.value;
+            const realityMachineCap = MachineHandler.baseRMCap;
             return [
               realityName,
-              `${format(antimatter)} / ${format(amGoal)}`
+              "The limits of Reality Machines bind you",
+              `${format(realityMachines)} / ${format(realityMachineCap)}`
             ];
-          },
-          angle: 260,
-          diagonal: 15,
-          horizontal: 8,
+          }
+
+          const hasIDs = player.requirementChecks.reality.maxID1.neq(0);
+          if (hasIDs) return [
+            realityName,
+            "The Power of Infinity Dimensions",
+            "blocks your path."
+          ];
+
+          const antimatter = Currency.antimatter.value;
+          const amGoal = DC.E1_5E12;
+          return [
+            realityName,
+            `${format(antimatter)} / ${format(amGoal)}`
+          ];
         },
+        angle: 260,
+        diagonal: 15,
+        horizontal: 8,
       },
-      connector: {
-        pathStart: 0.05,
-        pathEnd: 1,
-        path: new LinearPath(Positions.raReality, Positions.laitelaFirstCenter),
-        fill: "url(#gradRaLaitela)",
-        completeWidth: 6,
-        incompleteWidth: 4,
-      }
     },
-    "laitela-2nd-dim": {
-      visible: () => Laitela.isUnlocked,
-      complete: () => {
-        const upgrade = DarkMatterDimension(2).unlockUpgrade;
-        if (upgrade.canBeBought || upgrade.isBought) return 1;
-        if (upgrade.isAvailableForPurchase) return upgrade.currency.value / upgrade.cost;
-        return Laitela.difficultyTier < 1
-          ? 0
-          : 30 / player.celestials.laitela.fastestCompletion;
+    connector: {
+      pathStart: 0.05,
+      pathEnd: 1,
+      path: new LinearPath(Positions.raReality, Positions.laitelaFirstCenter),
+      fill: "url(#gradRaLaitela)",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "laitela-2nd-dim": {
+    visible: () => Laitela.isUnlocked,
+    complete: () => {
+      const upgrade = DarkMatterDimension(2).unlockUpgrade;
+      if (upgrade.canBeBought || upgrade.isBought) return 1;
+      if (upgrade.isAvailableForPurchase) return upgrade.currency.value / upgrade.cost;
+      return Laitela.difficultyTier < 1
+        ? 0
+        : 30 / player.celestials.laitela.fastestCompletion;
+    },
+    node: {
+      clickAction: () => Tab.celestials.laitela.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "white",
+      position: Positions.laitelaFirstLeft,
+      ring: {
+        rMajor: 8,
       },
-      node: {
-        clickAction: () => Tab.celestials.laitela.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "white",
-        position: Positions.laitelaFirstLeft,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => {
-            const dmdText = "2nd Dark Matter Dimension";
-            const dim = DarkMatterDimension(2);
-            if (dim.isUnlocked) return [dmdText];
-
-            const goal = dim.adjustedStartingCost;
-            if (complete >= 1) return [
-              dmdText,
-              `Dark Matter ${format(Currency.darkMatter.max.min(goal), dim.isUnlocked ? 0 : 2)} / ${format(goal)}`
-            ];
-
-            const upgrade = dim.unlockUpgrade;
-            if (upgrade.isAvailableForPurchase) return [
-              dmdText,
-              `Imaginary Machines
-              ${format(Math.min(upgrade.currency.value, upgrade.cost), upgrade.canBeBought ? 0 : 2)}
-              / ${format(upgrade.cost)}`
-            ];
-
-            if (player.celestials.laitela.fastestCompletion > 30 && Laitela.difficultyTier < 0) return [
-              dmdText,
-              `Beat Lai'tela's Reality in less that ${format(30)} seconds`
-            ];
-            return [
-              dmdText,
-              `Beat Lai'tela's Reality`
-            ];
-          },
-          angle: 135,
-          diagonal: 30,
-          horizontal: 16,
+      legend: {
+        text: complete => {
+          const dmdText = "2nd Dark Matter Dimension";
+          const dim = DarkMatterDimension(2);
+          if (dim.isUnlocked) return [dmdText];
+
+          const goal = dim.adjustedStartingCost;
+          if (complete >= 1) return [
+            dmdText,
+            `Dark Matter ${format(Currency.darkMatter.max.min(goal), dim.isUnlocked ? 0 : 2)} / ${format(goal)}`
+          ];
+
+          const upgrade = dim.unlockUpgrade;
+          if (upgrade.isAvailableForPurchase) return [
+            dmdText,
+            `Imaginary Machines
+            ${format(Math.min(upgrade.currency.value, upgrade.cost), upgrade.canBeBought ? 0 : 2)}
+            / ${format(upgrade.cost)}`
+          ];
+
+          if (player.celestials.laitela.fastestCompletion > 30 && Laitela.difficultyTier < 0) return [
+            dmdText,
+            `Beat Lai'tela's Reality in less that ${format(30)} seconds`
+          ];
+          return [
+            dmdText,
+            `Beat Lai'tela's Reality`
+          ];
         },
+        angle: 135,
+        diagonal: 30,
+        horizontal: 16,
       },
-      connector: {
-        pathStart: 0.17,
+    },
+    connector: {
+      pathStart: 0.17,
+      pathEnd: 0.89,
+      path: new LinearPath(Positions.laitelaFirstCenter, Positions.laitelaFirstLeft),
+      fill: "white",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "laitela-singularity": {
+    visible: () => Laitela.isUnlocked,
+    complete: () => (Currency.singularities.gte(1)
+      ? 1
+      : Math.clampMax(0.999, Currency.darkEnergy.value / Singularity.cap)),
+    node: {
+      clickAction: () => Tab.celestials.laitela.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "white",
+      position: Positions.laitelaFirstRight,
+      ring: {
+        rMajor: 8,
+      },
+      legend: {
+        text: complete => {
+          if (complete >= 1) return ["Obtain a Singularity"];
+          const darkEnergy = Currency.darkEnergy.value;
+          const singularityGoal = Singularity.cap;
+          return [
+            "Condense your Dark Energy",
+            "Into a Singularity",
+            `${format(darkEnergy)} / ${format(singularityGoal)}`
+          ];
+        },
+        angle: 45,
+        diagonal: 65,
+        horizontal: 16,
+      },
+    },
+    connector: {
+      pathStart: 0.17,
+      pathEnd: 0.89,
+      path: new LinearPath(Positions.laitelaFirstCenter, Positions.laitelaFirstRight),
+      fill: "white",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    }
+  },
+  "laitela-3rd-dim": {
+    visible: () => DarkMatterDimension(2).isUnlocked && Currency.singularities.gte(1),
+    complete: () => {
+      const upgrade = DarkMatterDimension(3).unlockUpgrade;
+      if (upgrade.canBeBought || upgrade.isBought) return 1;
+      if (upgrade.isAvailableForPurchase) return upgrade.currency.value / upgrade.cost;
+      if (!player.auto.singularity.isActive) return 0.5;
+      return Math.clampMax(0.999, Singularity.singularitiesGained / 20);
+    },
+    node: {
+      clickAction: () => Tab.celestials.laitela.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "white",
+      position: Positions.laitelaSecondCenter,
+      ring: {
+        rMajor: 8,
+      },
+      legend: {
+        text: complete => {
+          const dmdText = "3rd Dark Matter Dimension";
+          const dim = DarkMatterDimension(3);
+          if (dim.isUnlocked) return [dmdText];
+
+          const goal = dim.adjustedStartingCost;
+          if (complete >= 1) return [
+            dmdText,
+            `Dark Matter ${format(Currency.darkMatter.max.min(goal), dim.isUnlocked ? 0 : 2)} / ${format(goal)}`
+          ];
+
+          const upgrade = dim.unlockUpgrade;
+          if (upgrade.isAvailableForPurchase) return [
+            dmdText,
+            `Imaginary Machines
+            ${format(Math.min(upgrade.currency.value, upgrade.cost), upgrade.canBeBought ? 0 : 2)}
+            / ${format(upgrade.cost)}`
+          ];
+
+          if (!player.auto.singularity.isActive) return [
+            dmdText,
+            "Unlock Automatic Singularities",
+            `${format(Currency.singularities.value)} / ${format(SingularityMilestone.autoCondense.start)}`
+          ];
+
+          return [
+            dmdText,
+            `Automatically Condense ${format(20)} Singularities at once`,
+            `${format(Math.clampMax(Singularity.singularitiesGained, 20))} / ${format(20)}`
+          ];
+        },
+        angle: 15,
+        diagonal: 30,
+        horizontal: 16,
+      },
+    },
+    connector: [
+      {
+        pathStart: 0.10,
         pathEnd: 0.89,
-        path: new LinearPath(Positions.laitelaFirstCenter, Positions.laitelaFirstLeft),
+        path: new LinearPath(Positions.laitelaFirstLeft, Positions.laitelaSecondCenter),
         fill: "white",
         completeWidth: 6,
         incompleteWidth: 4,
-      }
-    },
-    "laitela-singularity": {
-      visible: () => Laitela.isUnlocked,
-      complete: () => (Currency.singularities.gte(1)
-        ? 1
-        : Math.clampMax(0.999, Currency.darkEnergy.value / Singularity.cap)),
-      node: {
-        clickAction: () => Tab.celestials.laitela.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "white",
-        position: Positions.laitelaFirstRight,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => {
-            if (complete >= 1) return ["Obtain a Singularity"];
-            const darkEnergy = Currency.darkEnergy.value;
-            const singularityGoal = Singularity.cap;
-            return [
-              "Condense your Dark Energy",
-              "Into a Singularity",
-              `${format(darkEnergy)} / ${format(singularityGoal)}`
-            ];
-          },
-          angle: 45,
-          diagonal: 65,
-          horizontal: 16,
-        },
-      },
-      connector: {
-        pathStart: 0.17,
+      }, {
+        pathStart: 0.10,
         pathEnd: 0.89,
-        path: new LinearPath(Positions.laitelaFirstCenter, Positions.laitelaFirstRight),
+        path: new LinearPath(Positions.laitelaFirstRight, Positions.laitelaSecondCenter),
         fill: "white",
         completeWidth: 6,
         incompleteWidth: 4,
-      }
+
+      },
+    ],
+  },
+  "laitela-4th-dim": {
+    visible: () => DarkMatterDimension(3).isUnlocked,
+    complete: () => {
+      const upgrade = DarkMatterDimension(4).unlockUpgrade;
+      if (upgrade.canBeBought || upgrade.isBought) return 1;
+      if (upgrade.isAvailableForPurchase) return upgrade.currency.value / upgrade.cost;
+      return (Replicanti.galaxies.total + player.galaxies + player.dilation.totalTachyonGalaxies) / 80000;
     },
-    "laitela-3rd-dim": {
-      visible: () => DarkMatterDimension(2).isUnlocked && Currency.singularities.gte(1),
-      complete: () => {
-        const upgrade = DarkMatterDimension(3).unlockUpgrade;
-        if (upgrade.canBeBought || upgrade.isBought) return 1;
-        if (upgrade.isAvailableForPurchase) return upgrade.currency.value / upgrade.cost;
-        if (!player.auto.singularity.isActive) return 0.5;
-        return Math.clampMax(0.999, Singularity.singularitiesGained / 20);
+    node: {
+      clickAction: () => Tab.celestials.laitela.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "white",
+      position: Positions.laitelaSecondLeft,
+      ring: {
+        rMajor: 8,
       },
-      node: {
-        clickAction: () => Tab.celestials.laitela.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "white",
-        position: Positions.laitelaSecondCenter,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => {
-            const dmdText = "3rd Dark Matter Dimension";
-            const dim = DarkMatterDimension(3);
-            if (dim.isUnlocked) return [dmdText];
-
-            const goal = dim.adjustedStartingCost;
-            if (complete >= 1) return [
-              dmdText,
-              `Dark Matter ${format(Currency.darkMatter.max.min(goal), dim.isUnlocked ? 0 : 2)} / ${format(goal)}`
-            ];
-
-            const upgrade = dim.unlockUpgrade;
-            if (upgrade.isAvailableForPurchase) return [
-              dmdText,
-              `Imaginary Machines
-              ${format(Math.min(upgrade.currency.value, upgrade.cost), upgrade.canBeBought ? 0 : 2)}
-              / ${format(upgrade.cost)}`
-            ];
-
-            if (!player.auto.singularity.isActive) return [
-              dmdText,
-              "Unlock Automatic Singularities",
-              `${format(Currency.singularities.value)} / ${format(SingularityMilestone.autoCondense.start)}`
-            ];
-
-            return [
-              dmdText,
-              `Automatically Condense ${format(20)} Singularities at once`,
-              `${format(Math.clampMax(Singularity.singularitiesGained, 20))} / ${format(20)}`
-            ];
-          },
-          angle: 15,
-          diagonal: 30,
-          horizontal: 16,
+      legend: {
+        text: complete => {
+          const dmdText = "4th Dark Matter Dimension";
+          const dim = DarkMatterDimension(4);
+          if (dim.isUnlocked) return [dmdText];
+
+          const goal = dim.adjustedStartingCost;
+          if (complete >= 1) return [
+            dmdText,
+            `Dark Matter ${format(Currency.darkMatter.max.min(goal), dim.isUnlocked ? 0 : 2)} / ${format(goal)}`
+          ];
+
+          const upgrade = dim.unlockUpgrade;
+          if (upgrade.isAvailableForPurchase) return [
+            dmdText,
+            `Imaginary Machines
+            ${format(Math.min(upgrade.currency.value, upgrade.cost), upgrade.canBeBought ? 0 : 2)}
+            / ${format(upgrade.cost)}`
+          ];
+
+          const allGalaxies = Replicanti.galaxies.total + player.galaxies + player.dilation.totalTachyonGalaxies;
+          return [
+            dmdText,
+            `Have ${format(80000)} total Galaxies`,
+            `${format(Math.clampMax(allGalaxies, 80000))} / ${format(80000)}`
+          ];
         },
+        angle: 135,
+        diagonal: 30,
+        horizontal: 16,
       },
-      connector: [
-        {
-          pathStart: 0.10,
-          pathEnd: 0.89,
-          path: new LinearPath(Positions.laitelaFirstLeft, Positions.laitelaSecondCenter),
-          fill: "white",
-          completeWidth: 6,
-          incompleteWidth: 4,
-        }, {
-          pathStart: 0.10,
-          pathEnd: 0.89,
-          path: new LinearPath(Positions.laitelaFirstRight, Positions.laitelaSecondCenter),
-          fill: "white",
-          completeWidth: 6,
-          incompleteWidth: 4,
-
-        },
-      ],
     },
-    "laitela-4th-dim": {
-      visible: () => DarkMatterDimension(3).isUnlocked,
-      complete: () => {
-        const upgrade = DarkMatterDimension(4).unlockUpgrade;
-        if (upgrade.canBeBought || upgrade.isBought) return 1;
-        if (upgrade.isAvailableForPurchase) return upgrade.currency.value / upgrade.cost;
-        return (Replicanti.galaxies.total + player.galaxies + player.dilation.totalTachyonGalaxies) / 80000;
+    connector: {
+      pathStart: 0.11,
+      pathEnd: 0.89,
+      path: new LinearPath(Positions.laitelaSecondCenter, Positions.laitelaSecondLeft),
+      fill: "white",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    },
+  },
+  "laitela-annihilation": {
+    visible: () => DarkMatterDimension(4).isUnlocked,
+    complete: () => {
+      const upgrade = ImaginaryUpgrade(19);
+      if (upgrade.canBeBought || upgrade.isBought) return 1;
+      if (upgrade.isAvailableForPurchase) return Currency.imaginaryMachines.value / upgrade.cost;
+      return upgrade.isPossible
+        ? Tickspeed.continuumValue / 3850000
+        : 0;
+    },
+    node: {
+      clickAction: () => Tab.celestials.laitela.show(true),
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      fill: "white",
+      position: Positions.laitelaSecondRight,
+      ring: {
+        rMajor: 8,
       },
-      node: {
-        clickAction: () => Tab.celestials.laitela.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "white",
-        position: Positions.laitelaSecondLeft,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: complete => {
-            const dmdText = "4th Dark Matter Dimension";
-            const dim = DarkMatterDimension(4);
-            if (dim.isUnlocked) return [dmdText];
-
-            const goal = dim.adjustedStartingCost;
-            if (complete >= 1) return [
-              dmdText,
-              `Dark Matter ${format(Currency.darkMatter.max.min(goal), dim.isUnlocked ? 0 : 2)} / ${format(goal)}`
-            ];
-
-            const upgrade = dim.unlockUpgrade;
-            if (upgrade.isAvailableForPurchase) return [
-              dmdText,
-              `Imaginary Machines
-              ${format(Math.min(upgrade.currency.value, upgrade.cost), upgrade.canBeBought ? 0 : 2)}
-              / ${format(upgrade.cost)}`
-            ];
-
-            const allGalaxies = Replicanti.galaxies.total + player.galaxies + player.dilation.totalTachyonGalaxies;
-            return [
-              dmdText,
-              `Have ${format(80000)} total Galaxies`,
-              `${format(Math.clampMax(allGalaxies, 80000))} / ${format(80000)}`
-            ];
-          },
-          angle: 135,
-          diagonal: 30,
-          horizontal: 16,
-        },
+      legend: {
+        text: [
+          "Annihilate your",
+          "Dark Matter Dimensions"
+        ],
+        angle: 315,
+        diagonal: 30,
+        horizontal: 16,
       },
-      connector: {
+    },
+    connector: {
+      pathStart: 0.11,
+      pathEnd: 0.89,
+      path: new LinearPath(Positions.laitelaSecondCenter, Positions.laitelaSecondRight),
+      fill: "white",
+      completeWidth: 6,
+      incompleteWidth: 4,
+    },
+  },
+  "laitela-destabilization": {
+    visible: () => DarkMatterDimension(4).isUnlocked && ImaginaryUpgrade(19).isBought,
+    complete: () => Laitela.difficultyTier / 8,
+    node: {
+      incompleteClass: "c-celestial-nav__test-incomplete",
+      symbol: "ᛝ",
+      symbolScale: 1.6,
+      symbolOffset: "0.6",
+      fill: "white",
+      position: Positions.laitelaThirdCenter,
+      ring: {
+        rMajor: 15,
+      },
+      alwaysShowLegend: true,
+      legend: {
+        text: complete => {
+          if (complete < 1) return [
+            "Destabalize Lai'tela's Reality",
+            "To the point where you cannot",
+            "use any Dimensions",
+            `${format(Laitela.difficultyTier)} / ${format(8)}`
+          ];
+          return [
+            "Completely destabilized",
+            "Lai'tela's Reality",
+          ];
+        },
+        angle: 0,
+        diagonal: 15,
+        horizontal: 8,
+      },
+    },
+    connector: [
+      {
         pathStart: 0.11,
-        pathEnd: 0.89,
-        path: new LinearPath(Positions.laitelaSecondCenter, Positions.laitelaSecondLeft),
+        pathEnd: 0.83,
+        path: new LinearPath(Positions.laitelaSecondLeft, Positions.laitelaThirdCenter),
         fill: "white",
         completeWidth: 6,
         incompleteWidth: 4,
-      },
-    },
-    "laitela-annihilation": {
-      visible: () => DarkMatterDimension(4).isUnlocked,
-      complete: () => {
-        const upgrade = ImaginaryUpgrade(19);
-        if (upgrade.canBeBought || upgrade.isBought) return 1;
-        if (upgrade.isAvailableForPurchase) return Currency.imaginaryMachines.value / upgrade.cost;
-        return upgrade.isPossible
-          ? Tickspeed.continuumValue / 3850000
-          : 0;
-      },
-      node: {
-        clickAction: () => Tab.celestials.laitela.show(true),
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        fill: "white",
-        position: Positions.laitelaSecondRight,
-        ring: {
-          rMajor: 8,
-        },
-        legend: {
-          text: [
-            "Annihilate your",
-            "Dark Matter Dimensions"
-          ],
-          angle: 315,
-          diagonal: 30,
-          horizontal: 16,
-        },
-      },
-      connector: {
+      }, {
         pathStart: 0.11,
-        pathEnd: 0.89,
-        path: new LinearPath(Positions.laitelaSecondCenter, Positions.laitelaSecondRight),
+        pathEnd: 0.83,
+        path: new LinearPath(Positions.laitelaSecondRight, Positions.laitelaThirdCenter),
         fill: "white",
         completeWidth: 6,
         incompleteWidth: 4,
-      },
-    },
-    "laitela-destabilization": {
-      visible: () => DarkMatterDimension(4).isUnlocked && ImaginaryUpgrade(19).isBought,
-      complete: () => Laitela.difficultyTier / 8,
-      node: {
-        incompleteClass: "c-celestial-nav__test-incomplete",
-        symbol: "ᛝ",
-        symbolScale: 1.6,
-        symbolOffset: "0.6",
-        fill: "white",
-        position: Positions.laitelaThirdCenter,
-        ring: {
-          rMajor: 15,
-        },
-        alwaysShowLegend: true,
-        legend: {
-          text: complete => {
-            if (complete < 1) return [
-              "Destabalize Lai'tela's Reality",
-              "To the point where you cannot",
-              "use any Dimensions",
-              `${format(Laitela.difficultyTier)} / ${format(8)}`
-            ];
-            return [
-              "Completely destabilized",
-              "Lai'tela's Reality",
-            ];
-          },
-          angle: 0,
-          diagonal: 15,
-          horizontal: 8,
-        },
-      },
-      connector: [
-        {
-          pathStart: 0.11,
-          pathEnd: 0.83,
-          path: new LinearPath(Positions.laitelaSecondLeft, Positions.laitelaThirdCenter),
-          fill: "white",
-          completeWidth: 6,
-          incompleteWidth: 4,
-        }, {
-          pathStart: 0.11,
-          pathEnd: 0.83,
-          path: new LinearPath(Positions.laitelaSecondRight, Positions.laitelaThirdCenter),
-          fill: "white",
-          completeWidth: 6,
-          incompleteWidth: 4,
-        }
-      ]
-    },
-  };
-}());
+      }
+    ]
+  },
+};
diff --git a/javascripts/core/secret-formula/celestials/pelle-upgrades.js b/javascripts/core/secret-formula/celestials/pelle-upgrades.js
index b1c51007d..afa3886b5 100644
--- a/javascripts/core/secret-formula/celestials/pelle-upgrades.js
+++ b/javascripts/core/secret-formula/celestials/pelle-upgrades.js
@@ -1,190 +1,189 @@
 import { GameDatabase } from "../game-database";
 
-GameDatabase.celestials.pelle.upgrades = (function() {
-  const formatCost = c => format(c, 2);
-  // eslint-disable-next-line max-params
-  const expWithIncreasedScale = (base1, base2, incScale, coeff, x) =>
-    Decimal.pow(base1, x).times(Decimal.pow(base2, x - incScale).max(1)).times(coeff);
+const formatCost = c => format(c, 2);
+// eslint-disable-next-line max-params
+const expWithIncreasedScale = (base1, base2, incScale, coeff, x) =>
+  Decimal.pow(base1, x).times(Decimal.pow(base2, x - incScale).max(1)).times(coeff);
 
-  const rebuyable = config => {
-    const { id, description, cost, effect, formatEffect, cap } = config;
-    return {
-      id,
-      description,
-      cost: () => expWithIncreasedScale(...cost, player.celestials.pelle.rebuyables[id]),
-      formatCost,
-      cap,
-      effect: (x = player.celestials.pelle.rebuyables[id]) => effect(x),
-      formatEffect,
-      rebuyable: true
-    };
-  };
+const rebuyable = config => {
+  const { id, description, cost, effect, formatEffect, cap } = config;
   return {
-    antimatterDimensionMult: rebuyable({
-      id: "antimatterDimensionMult",
-      description: "Gain a multiplier to Antimatter Dimensions",
-      cost: [10, 1e3, 41, 100],
-      effect: x => Pelle.antimatterDimensionMult(x),
-      formatEffect: x => formatX(x, 2, 2),
-      cap: 44
-    }),
-    timeSpeedMult: rebuyable({
-      id: "timeSpeedMult",
-      description: "Gain a multiplier to game speed",
-      cost: [20, 1e3, 30, 1e5],
-      effect: x => Decimal.pow(1.3, x),
-      formatEffect: x => formatX(x, 2, 2),
-      cap: 35
-    }),
-    glyphLevels: rebuyable({
-      id: "glyphLevels",
-      description: "Increase the Glyph level allowed in Pelle",
-      cost: [30, 1e3, 25, 1e15],
-      effect: x => Math.floor(((3 * (x + 1)) - 2) ** 1.6),
-      formatEffect: x => formatInt(x),
-      cap: 26
-    }),
-    infConversion: rebuyable({
-      id: "infConversion",
-      description: "Increase Infinity Power conversion rate",
-      cost: [40, 1e3, 20, 1e18],
-      effect: x => (x * 3.5) ** 0.37,
-      formatEffect: x => `+${format(x, 2, 2)}`,
-      cap: 21
-    }),
-    galaxyPower: rebuyable({
-      id: "galaxyPower",
-      description: "Multiply Galaxy power",
-      cost: [1000, 1e3, 10, 1e30],
-      effect: x => 1 + x / 50,
-      formatEffect: x => formatX(x, 2, 2),
-      cap: 9
-    }),
-    antimatterDimAutobuyers1: {
-      id: 0,
-      description: "Gain back Autobuyers for Antimatter Dimensions 1-4",
-      cost: 1e5,
-      formatCost,
-    },
-    dimBoostAutobuyer: {
-      id: 1,
-      description: "Gain back the Autobuyer for Dimension Boosts",
-      cost: 5e5,
-      formatCost,
-    },
-    keepAutobuyers: {
-      id: 2,
-      description: "Keep your Autobuyer upgrades on Armageddon",
-      cost: 5e6,
-      formatCost,
-    },
-    antimatterDimAutobuyers2: {
-      id: 3,
-      description: "Gain back Autobuyers for Antimatter Dimensions 5-8",
-      cost: 2.5e7,
-      formatCost,
-    },
-    galaxyAutobuyer: {
-      id: 4,
-      description: "Gain back the Autobuyer for Antimatter Galaxies",
-      cost: 1e8,
-      formatCost,
-    },
-    tickspeedAutobuyer: {
-      id: 5,
-      description: "Gain back the Autobuyer for Tickspeed",
-      cost: 1e9,
-      formatCost,
-    },
-    keepInfinityUpgrades: {
-      id: 6,
-      description: "Keep Infinity Upgrades on Armageddon",
-      cost: 1e10,
-      formatCost,
-    },
-    keepBreakInfinityUpgrades: {
-      id: 7,
-      description: "Keep Break Infinity Upgrades on Armageddon",
-      cost: 1e12,
-      formatCost,
-    },
-    IDAutobuyers: {
-      id: 8,
-      description: "Gain back Infinity Dimension Autobuyers",
-      cost: 1e14,
-      formatCost,
-    },
-    keepInfinityChallenges: {
-      id: 9,
-      description: "You keep your Infinity Challenge unlocks and completions through Armageddons",
-      cost: 1e15,
-      formatCost,
-    },
-    replicantiAutobuyers: {
-      id: 10,
-      description: "Gain back Replicanti Upgrade Autobuyers",
-      cost: 1e17,
-      formatCost,
-    },
-    replicantiGalaxyNoReset: {
-      id: 11,
-      description: "Replicanti Galaxies don't reset on Infinity",
-      cost: 1e19,
-      formatCost,
-    },
-    eternitiesNoReset: {
-      id: 12,
-      description: "Eternities do not reset on Armageddon",
-      cost: 1e20,
-      formatCost,
-    },
-    timeStudiesNoReset: {
-      id: 13,
-      description: "Time Studies and Theorems do not reset on Armageddon",
-      cost: 1e21,
-      formatCost,
-    },
-    replicantiStayUnlocked: {
-      id: 14,
-      description: "Replicanti stays unlocked on Armageddon",
-      cost: 1e22,
-      formatCost,
-    },
-    keepEternityUpgrades: {
-      id: 15,
-      description: "Keep Eternity Upgrades on Armageddon",
-      cost: 1e24,
-      formatCost,
-    },
-    TDAutobuyers: {
-      id: 16,
-      description: "Gain back Time Dimension Autobuyers",
-      cost: 1e25,
-      formatCost,
-    },
-    keepEternityChallenges: {
-      id: 17,
-      description: "You keep your Eternity Challenge completions through Armageddons",
-      cost: 1e26,
-      formatCost,
-    },
-    dimBoostResetsNothing: {
-      id: 18,
-      description: "Dimension Boosts no longer reset anything",
-      cost: 1e30,
-      formatCost,
-    },
-    dilationUpgradesNoReset: {
-      id: 19,
-      description: "Keep Dilation Upgrades on Armageddon",
-      cost: 1e45,
-      formatCost,
-    },
-    tachyonParticlesNoReset: {
-      id: 20,
-      description: "Keep Tachyon Particles on Armageddon",
-      cost: 1e50,
-      formatCost,
-    }
+    id,
+    description,
+    cost: () => expWithIncreasedScale(...cost, player.celestials.pelle.rebuyables[id]),
+    formatCost,
+    cap,
+    effect: (x = player.celestials.pelle.rebuyables[id]) => effect(x),
+    formatEffect,
+    rebuyable: true
   };
-}());
+};
+
+GameDatabase.celestials.pelle.upgrades = {
+  antimatterDimensionMult: rebuyable({
+    id: "antimatterDimensionMult",
+    description: "Gain a multiplier to Antimatter Dimensions",
+    cost: [10, 1e3, 41, 100],
+    effect: x => Pelle.antimatterDimensionMult(x),
+    formatEffect: x => formatX(x, 2, 2),
+    cap: 44
+  }),
+  timeSpeedMult: rebuyable({
+    id: "timeSpeedMult",
+    description: "Gain a multiplier to game speed",
+    cost: [20, 1e3, 30, 1e5],
+    effect: x => Decimal.pow(1.3, x),
+    formatEffect: x => formatX(x, 2, 2),
+    cap: 35
+  }),
+  glyphLevels: rebuyable({
+    id: "glyphLevels",
+    description: "Increase the Glyph level allowed in Pelle",
+    cost: [30, 1e3, 25, 1e15],
+    effect: x => Math.floor(((3 * (x + 1)) - 2) ** 1.6),
+    formatEffect: x => formatInt(x),
+    cap: 26
+  }),
+  infConversion: rebuyable({
+    id: "infConversion",
+    description: "Increase Infinity Power conversion rate",
+    cost: [40, 1e3, 20, 1e18],
+    effect: x => (x * 3.5) ** 0.37,
+    formatEffect: x => `+${format(x, 2, 2)}`,
+    cap: 21
+  }),
+  galaxyPower: rebuyable({
+    id: "galaxyPower",
+    description: "Multiply Galaxy power",
+    cost: [1000, 1e3, 10, 1e30],
+    effect: x => 1 + x / 50,
+    formatEffect: x => formatX(x, 2, 2),
+    cap: 9
+  }),
+  antimatterDimAutobuyers1: {
+    id: 0,
+    description: "Gain back Autobuyers for Antimatter Dimensions 1-4",
+    cost: 1e5,
+    formatCost,
+  },
+  dimBoostAutobuyer: {
+    id: 1,
+    description: "Gain back the Autobuyer for Dimension Boosts",
+    cost: 5e5,
+    formatCost,
+  },
+  keepAutobuyers: {
+    id: 2,
+    description: "Keep your Autobuyer upgrades on Armageddon",
+    cost: 5e6,
+    formatCost,
+  },
+  antimatterDimAutobuyers2: {
+    id: 3,
+    description: "Gain back Autobuyers for Antimatter Dimensions 5-8",
+    cost: 2.5e7,
+    formatCost,
+  },
+  galaxyAutobuyer: {
+    id: 4,
+    description: "Gain back the Autobuyer for Antimatter Galaxies",
+    cost: 1e8,
+    formatCost,
+  },
+  tickspeedAutobuyer: {
+    id: 5,
+    description: "Gain back the Autobuyer for Tickspeed",
+    cost: 1e9,
+    formatCost,
+  },
+  keepInfinityUpgrades: {
+    id: 6,
+    description: "Keep Infinity Upgrades on Armageddon",
+    cost: 1e10,
+    formatCost,
+  },
+  keepBreakInfinityUpgrades: {
+    id: 7,
+    description: "Keep Break Infinity Upgrades on Armageddon",
+    cost: 1e12,
+    formatCost,
+  },
+  IDAutobuyers: {
+    id: 8,
+    description: "Gain back Infinity Dimension Autobuyers",
+    cost: 1e14,
+    formatCost,
+  },
+  keepInfinityChallenges: {
+    id: 9,
+    description: "You keep your Infinity Challenge unlocks and completions through Armageddons",
+    cost: 1e15,
+    formatCost,
+  },
+  replicantiAutobuyers: {
+    id: 10,
+    description: "Gain back Replicanti Upgrade Autobuyers",
+    cost: 1e17,
+    formatCost,
+  },
+  replicantiGalaxyNoReset: {
+    id: 11,
+    description: "Replicanti Galaxies don't reset on Infinity",
+    cost: 1e19,
+    formatCost,
+  },
+  eternitiesNoReset: {
+    id: 12,
+    description: "Eternities do not reset on Armageddon",
+    cost: 1e20,
+    formatCost,
+  },
+  timeStudiesNoReset: {
+    id: 13,
+    description: "Time Studies and Theorems do not reset on Armageddon",
+    cost: 1e21,
+    formatCost,
+  },
+  replicantiStayUnlocked: {
+    id: 14,
+    description: "Replicanti stays unlocked on Armageddon",
+    cost: 1e22,
+    formatCost,
+  },
+  keepEternityUpgrades: {
+    id: 15,
+    description: "Keep Eternity Upgrades on Armageddon",
+    cost: 1e24,
+    formatCost,
+  },
+  TDAutobuyers: {
+    id: 16,
+    description: "Gain back Time Dimension Autobuyers",
+    cost: 1e25,
+    formatCost,
+  },
+  keepEternityChallenges: {
+    id: 17,
+    description: "You keep your Eternity Challenge completions through Armageddons",
+    cost: 1e26,
+    formatCost,
+  },
+  dimBoostResetsNothing: {
+    id: 18,
+    description: "Dimension Boosts no longer reset anything",
+    cost: 1e30,
+    formatCost,
+  },
+  dilationUpgradesNoReset: {
+    id: 19,
+    description: "Keep Dilation Upgrades on Armageddon",
+    cost: 1e45,
+    formatCost,
+  },
+  tachyonParticlesNoReset: {
+    id: 20,
+    description: "Keep Tachyon Particles on Armageddon",
+    cost: 1e50,
+    formatCost,
+  }
+};
diff --git a/javascripts/core/secret-formula/celestials/perk-shop.js b/javascripts/core/secret-formula/celestials/perk-shop.js
index af1c23607..8d5d26a7a 100644
--- a/javascripts/core/secret-formula/celestials/perk-shop.js
+++ b/javascripts/core/secret-formula/celestials/perk-shop.js
@@ -1,87 +1,86 @@
 import { GameDatabase } from "../game-database";
 
-GameDatabase.celestials.perkShop = (function() {
-  function rebuyableCost(initialCost, increment, id) {
-    return initialCost * Math.pow(increment, player.celestials.teresa.perkShop[id]);
-  }
-  function rebuyable(config) {
-    return {
-      id: config.id,
-      cost: () => (config.cost ? config.cost() : rebuyableCost(config.initialCost, config.increment, config.id)),
-      otherReq: config.otherReq,
-      cap: config.cap,
-      costCap: config.costCap,
-      description: config.description,
-      effect: () => config.effect(player.celestials.teresa.perkShop[config.id]),
-      formatEffect: config.formatEffect,
-      formatCost: config.formatCost,
-      rebuyable: true
-    };
-  }
+function rebuyableCost(initialCost, increment, id) {
+  return initialCost * Math.pow(increment, player.celestials.teresa.perkShop[id]);
+}
+function rebuyable(config) {
   return {
-    glyphLevel: rebuyable({
-      id: 0,
-      initialCost: 1,
-      increment: 2,
-      description: () => `Increase Glyph levels by ${formatPercents(0.05)}`,
-      effect: bought => Math.pow(1.05, bought),
-      formatEffect: value => formatX(value, 2, 2),
-      formatCost: value => format(value, 2),
-      costCap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 1048576 : 2048),
-      cap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? Math.pow(1.05, 20) : Math.pow(1.05, 11))
-    }),
-    rmMult: rebuyable({
-      id: 1,
-      initialCost: 1,
-      increment: 2,
-      description: "Double Reality Machine gain",
-      effect: bought => Math.pow(2, bought),
-      formatEffect: value => formatX(value, 2),
-      formatCost: value => format(value, 2),
-      costCap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 1048576 : 2048),
-      cap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 1048576 : 2048)
-    }),
-    bulkDilation: rebuyable({
-      id: 2,
-      initialCost: 100,
-      increment: 2,
-      description: "Buy twice as many Dilation Upgrades at once.",
-      effect: bought => Math.pow(2, bought),
-      formatEffect: value => formatX(value, 2),
-      formatCost: value => format(value, 2),
-      costCap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 1638400 : 1600),
-      cap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 16384 : 16),
-    }),
-    autoSpeed: rebuyable({
-      id: 3,
-      initialCost: 1000,
-      increment: 2,
-      description: () => `Infinity Dimension, Time Dimension, Dilation,
-        and Replicanti autobuyers are ${formatX(2)} faster.`,
-      effect: bought => Math.pow(2, bought),
-      formatEffect: value => formatX(value, 2),
-      formatCost: value => format(value, 2),
-      costCap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 64000 : 4000),
-      cap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 64 : 4)
-    }),
-    musicGlyph: rebuyable({
-      id: 4,
-      description: () => `Receive a Music Glyph of a random type that is ${formatPercents(0.8)} of your highest level.
-        (Try clicking it!)`,
-      cost: () => 1,
-      formatCost: value => formatInt(value),
-      costCap: () => Number.MAX_VALUE,
-      cap: () => Number.MAX_VALUE
-    }),
-    // Only appears with the perk shop increase upgrade
-    fillMusicGlyph: rebuyable({
-      id: 5,
-      description: () => `Fill all empty slots in your inventory with Music Glyphs`,
-      cost: () => Math.clampMin(Glyphs.freeInventorySpace, 1),
-      otherReq: () => Glyphs.freeInventorySpace > 0,
-      formatCost: value => formatInt(value),
-      costCap: () => Number.MAX_VALUE,
-      cap: () => Number.MAX_VALUE
-    }),
+    id: config.id,
+    cost: () => (config.cost ? config.cost() : rebuyableCost(config.initialCost, config.increment, config.id)),
+    otherReq: config.otherReq,
+    cap: config.cap,
+    costCap: config.costCap,
+    description: config.description,
+    effect: () => config.effect(player.celestials.teresa.perkShop[config.id]),
+    formatEffect: config.formatEffect,
+    formatCost: config.formatCost,
+    rebuyable: true
   };
-}());
+}
+
+GameDatabase.celestials.perkShop = {
+  glyphLevel: rebuyable({
+    id: 0,
+    initialCost: 1,
+    increment: 2,
+    description: () => `Increase Glyph levels by ${formatPercents(0.05)}`,
+    effect: bought => Math.pow(1.05, bought),
+    formatEffect: value => formatX(value, 2, 2),
+    formatCost: value => format(value, 2),
+    costCap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 1048576 : 2048),
+    cap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? Math.pow(1.05, 20) : Math.pow(1.05, 11))
+  }),
+  rmMult: rebuyable({
+    id: 1,
+    initialCost: 1,
+    increment: 2,
+    description: "Double Reality Machine gain",
+    effect: bought => Math.pow(2, bought),
+    formatEffect: value => formatX(value, 2),
+    formatCost: value => format(value, 2),
+    costCap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 1048576 : 2048),
+    cap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 1048576 : 2048)
+  }),
+  bulkDilation: rebuyable({
+    id: 2,
+    initialCost: 100,
+    increment: 2,
+    description: "Buy twice as many Dilation Upgrades at once.",
+    effect: bought => Math.pow(2, bought),
+    formatEffect: value => formatX(value, 2),
+    formatCost: value => format(value, 2),
+    costCap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 1638400 : 1600),
+    cap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 16384 : 16),
+  }),
+  autoSpeed: rebuyable({
+    id: 3,
+    initialCost: 1000,
+    increment: 2,
+    description: () => `Infinity Dimension, Time Dimension, Dilation,
+      and Replicanti autobuyers are ${formatX(2)} faster.`,
+    effect: bought => Math.pow(2, bought),
+    formatEffect: value => formatX(value, 2),
+    formatCost: value => format(value, 2),
+    costCap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 64000 : 4000),
+    cap: () => (Ra.unlocks.perkShopIncrease.canBeApplied ? 64 : 4)
+  }),
+  musicGlyph: rebuyable({
+    id: 4,
+    description: () => `Receive a Music Glyph of a random type that is ${formatPercents(0.8)} of your highest level.
+      (Try clicking it!)`,
+    cost: () => 1,
+    formatCost: value => formatInt(value),
+    costCap: () => Number.MAX_VALUE,
+    cap: () => Number.MAX_VALUE
+  }),
+  // Only appears with the perk shop increase upgrade
+  fillMusicGlyph: rebuyable({
+    id: 5,
+    description: () => `Fill all empty slots in your inventory with Music Glyphs`,
+    cost: () => Math.clampMin(Glyphs.freeInventorySpace, 1),
+    otherReq: () => Glyphs.freeInventorySpace > 0,
+    formatCost: value => formatInt(value),
+    costCap: () => Number.MAX_VALUE,
+    cap: () => Number.MAX_VALUE
+  }),
+};
diff --git a/javascripts/core/secret-formula/eternity/dilation-upgrades.js b/javascripts/core/secret-formula/eternity/dilation-upgrades.js
index 44db5a33a..741af3767 100644
--- a/javascripts/core/secret-formula/eternity/dilation-upgrades.js
+++ b/javascripts/core/secret-formula/eternity/dilation-upgrades.js
@@ -1,190 +1,189 @@
 import { DC } from "../../constants";
 import { GameDatabase } from "../game-database";
 
-GameDatabase.eternity.dilation = (function() {
-  function rebuyableCost(initialCost, increment, id) {
-    return Decimal.multiply(initialCost, Decimal.pow(increment, player.dilation.rebuyables[id]));
-  }
-  function rebuyable(config) {
-    return {
-      id: config.id,
-      cost: () => rebuyableCost(config.initialCost, config.increment, config.id),
-      initialCost: config.initialCost,
-      increment: config.increment,
-      description: config.description,
-      effect: () => config.effect(player.dilation.rebuyables[config.id]),
-      formatEffect: config.formatEffect,
-      formatCost: config.formatCost,
-      purchaseCap: config.purchaseCap,
-      reachedCap: () => player.dilation.rebuyables[config.id] >= config.purchaseCap,
-      pelleOnly: Boolean(config.pelleOnly),
-      rebuyable: true
-    };
-  }
+function rebuyableCost(initialCost, increment, id) {
+  return Decimal.multiply(initialCost, Decimal.pow(increment, player.dilation.rebuyables[id]));
+}
+function rebuyable(config) {
   return {
-    dtGain: rebuyable({
-      id: 1,
-      initialCost: 1e5,
-      increment: 10,
-      description: () =>
-        (SingularityMilestone.dilatedTimeFromSingularities.isUnlocked
-          ? `${formatX(2 * SingularityMilestone.dilatedTimeFromSingularities.effectValue, 2, 2)} Dilated Time gain`
-          : "Double Dilated Time gain"),
-      effect: bought => {
-        const base = SingularityMilestone.dilatedTimeFromSingularities.isUnlocked
-          ? 2 * SingularityMilestone.dilatedTimeFromSingularities.effectValue
-          : 2;
-        return Decimal.pow(base, bought);
-      },
-      formatEffect: value => formatX(value, 2),
-      formatCost: value => format(value, 2),
-      purchaseCap: Number.MAX_VALUE
-    }),
-    galaxyThreshold: rebuyable({
-      id: 2,
-      initialCost: 1e6,
-      increment: 100,
-      description: () =>
-        (Perk.bypassTGReset.isBought
-          ? "Reset Tachyon Galaxies, but lower their threshold"
-          : "Reset Dilated Time and Tachyon Galaxies, but lower their threshold"),
-      // The 38th purchase is at 1e80, and is the last purchase.
-      effect: bought => (bought < 38 ? Math.pow(0.8, bought) : 0),
-      formatEffect: effect => {
-        if (effect === 0) return `${formatX(getTachyonGalaxyMult(effect), 4, 4)}`;
-        const nextEffect = effect === Math.pow(0.8, 37) ? 0 : 0.8 * effect;
-        return `${formatX(getTachyonGalaxyMult(effect), 4, 4)} ➜
-          Next: ${formatX(getTachyonGalaxyMult(nextEffect), 4, 4)}`;
-      },
-      formatCost: value => format(value, 2),
-      purchaseCap: 38
-    }),
-    tachyonGain: rebuyable({
-      id: 3,
-      initialCost: 1e7,
-      increment: 20,
-      description: () => {
-        if (Pelle.isDoomed) return `Multiply the amount of Tachyon Particles gained by ${formatInt(1)}`;
-        if (Enslaved.isRunning) return `Multiply the amount of Tachyon Particles gained
-        by ${Math.pow(3, Enslaved.tachyonNerf).toFixed(2)}`;
-        return "Triple the amount of Tachyon Particles gained";
-      },
-      effect: bought => {
-        if (Pelle.isDoomed) return DC.D1.pow(bought);
-        return DC.D3.pow(bought);
-      },
-      formatEffect: value => formatX(value, 2),
-      formatCost: value => format(value, 2),
-      purchaseCap: Number.MAX_VALUE
-    }),
-    doubleGalaxies: {
-      id: 4,
-      cost: 5e6,
-      description: () => `Gain twice as many Tachyon Galaxies, up to ${formatInt(1000)}`,
-      effect: 2
-    },
-    tdMultReplicanti: {
-      id: 5,
-      cost: 1e9,
-      description: () => {
-        const rep10 = replicantiMult().pLog10();
-        let multiplier = "0.1";
-        if (rep10 > 9000) {
-          const ratio = DilationUpgrade.tdMultReplicanti.effectValue.pLog10() / rep10;
-          if (ratio < 0.095) {
-            multiplier = ratio.toFixed(2);
-          }
-        }
-        return `Time Dimensions are affected by Replicanti multiplier ${formatPow(multiplier, 1, 3)}, reduced
-          effect above ${formatX(DC.E9000)}`;
-      },
-      effect: () => {
-        let rep10 = replicantiMult().pLog10() * 0.1;
-        rep10 = rep10 > 9000 ? 9000 + 0.5 * (rep10 - 9000) : rep10;
-        return Decimal.pow10(rep10);
-      },
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    ndMultDT: {
-      id: 6,
-      cost: 5e7,
-      description: "Antimatter Dimension multiplier based on Dilated Time, unaffected by Time Dilation",
-      effect: () => Currency.dilatedTime.value.pow(308).clampMin(1),
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    ipMultDT: {
-      id: 7,
-      cost: 2e12,
-      description: "Gain a multiplier to Infinity Points based on Dilated Time",
-      effect: () => Currency.dilatedTime.value.pow(1000).clampMin(1),
-      formatEffect: value => formatX(value, 2, 1),
-      cap: () => Effarig.eternityCap
-    },
-    timeStudySplit: {
-      id: 8,
-      cost: 1e10,
-      description: "You can buy all three Time Study paths from the Dimension Split"
-    },
-    dilationPenalty: {
-      id: 9,
-      cost: 1e11,
-      description: () => `Reduce the Dilation penalty (${formatPow(1.05, 2, 2)} after reduction)`,
-      effect: 1.05,
-    },
-    ttGenerator: {
-      id: 10,
-      cost: 1e15,
-      description: "Generate Time Theorems based on Tachyon Particles",
-      effect: () => Currency.tachyonParticles.value.div(20000),
-      formatEffect: value => `${format(value, 2, 1)}/sec`
-    },
-    dtGainPelle: rebuyable({
-      id: 11,
-      initialCost: 1e14,
-      increment: 100,
-      pelleOnly: true,
-      description: () => `${formatX(5)} Dilated Time gain`,
-      effect: bought => Decimal.pow(5, bought),
-      formatEffect: value => formatX(value, 2),
-      formatCost: value => format(value, 2),
-      purchaseCap: Number.MAX_VALUE
-    }),
-    galaxyMultiplier: rebuyable({
-      id: 12,
-      initialCost: 1e15,
-      increment: 1000,
-      pelleOnly: true,
-      description: () => "Multiply Tachyon Galaxies gained",
-      effect: bought => bought + 1,
-      formatEffect: value => `${formatX(value, 2)} ➜ ${formatX(value + 1, 2)}`,
-      formatCost: value => format(value, 2),
-      purchaseCap: Number.MAX_VALUE
-    }),
-    tickspeedPower: rebuyable({
-      id: 13,
-      initialCost: 1e16,
-      increment: 1e4,
-      pelleOnly: true,
-      description: () => `Gain a power to tickspeed effect`,
-      effect: bought => 1 + bought * 0.03,
-      formatEffect: value => `${formatPow(value, 2, 2)} ➜ ${formatPow(value + 0.03, 2, 2)}`,
-      formatCost: value => format(value, 2),
-      purchaseCap: Number.MAX_VALUE
-    }),
-    galaxyThresholdPelle: {
-      id: 14,
-      cost: 1e45,
-      pelleOnly: true,
-      description: "Cubic root Tachyon Galaxy threshold",
-      effect: 1 / 3
-    },
-    flatDilationMult: {
-      id: 15,
-      cost: 1e55,
-      pelleOnly: true,
-      description: () => `Gain more Dilated Time based on EP`,
-      effect: () => 1e9 ** Math.min((Math.max(player.eternityPoints.log10() - 1500, 0) / 2500) ** 1.2, 1),
-      formatEffect: value => formatX(value, 2, 2)
-    },
+    id: config.id,
+    cost: () => rebuyableCost(config.initialCost, config.increment, config.id),
+    initialCost: config.initialCost,
+    increment: config.increment,
+    description: config.description,
+    effect: () => config.effect(player.dilation.rebuyables[config.id]),
+    formatEffect: config.formatEffect,
+    formatCost: config.formatCost,
+    purchaseCap: config.purchaseCap,
+    reachedCap: () => player.dilation.rebuyables[config.id] >= config.purchaseCap,
+    pelleOnly: Boolean(config.pelleOnly),
+    rebuyable: true
   };
-}());
+}
+
+GameDatabase.eternity.dilation = {
+  dtGain: rebuyable({
+    id: 1,
+    initialCost: 1e5,
+    increment: 10,
+    description: () =>
+      (SingularityMilestone.dilatedTimeFromSingularities.isUnlocked
+        ? `${formatX(2 * SingularityMilestone.dilatedTimeFromSingularities.effectValue, 2, 2)} Dilated Time gain`
+        : "Double Dilated Time gain"),
+    effect: bought => {
+      const base = SingularityMilestone.dilatedTimeFromSingularities.isUnlocked
+        ? 2 * SingularityMilestone.dilatedTimeFromSingularities.effectValue
+        : 2;
+      return Decimal.pow(base, bought);
+    },
+    formatEffect: value => formatX(value, 2),
+    formatCost: value => format(value, 2),
+    purchaseCap: Number.MAX_VALUE
+  }),
+  galaxyThreshold: rebuyable({
+    id: 2,
+    initialCost: 1e6,
+    increment: 100,
+    description: () =>
+      (Perk.bypassTGReset.isBought
+        ? "Reset Tachyon Galaxies, but lower their threshold"
+        : "Reset Dilated Time and Tachyon Galaxies, but lower their threshold"),
+    // The 38th purchase is at 1e80, and is the last purchase.
+    effect: bought => (bought < 38 ? Math.pow(0.8, bought) : 0),
+    formatEffect: effect => {
+      if (effect === 0) return `${formatX(getTachyonGalaxyMult(effect), 4, 4)}`;
+      const nextEffect = effect === Math.pow(0.8, 37) ? 0 : 0.8 * effect;
+      return `${formatX(getTachyonGalaxyMult(effect), 4, 4)} ➜
+        Next: ${formatX(getTachyonGalaxyMult(nextEffect), 4, 4)}`;
+    },
+    formatCost: value => format(value, 2),
+    purchaseCap: 38
+  }),
+  tachyonGain: rebuyable({
+    id: 3,
+    initialCost: 1e7,
+    increment: 20,
+    description: () => {
+      if (Pelle.isDoomed) return `Multiply the amount of Tachyon Particles gained by ${formatInt(1)}`;
+      if (Enslaved.isRunning) return `Multiply the amount of Tachyon Particles gained
+      by ${Math.pow(3, Enslaved.tachyonNerf).toFixed(2)}`;
+      return "Triple the amount of Tachyon Particles gained";
+    },
+    effect: bought => {
+      if (Pelle.isDoomed) return DC.D1.pow(bought);
+      return DC.D3.pow(bought);
+    },
+    formatEffect: value => formatX(value, 2),
+    formatCost: value => format(value, 2),
+    purchaseCap: Number.MAX_VALUE
+  }),
+  doubleGalaxies: {
+    id: 4,
+    cost: 5e6,
+    description: () => `Gain twice as many Tachyon Galaxies, up to ${formatInt(1000)}`,
+    effect: 2
+  },
+  tdMultReplicanti: {
+    id: 5,
+    cost: 1e9,
+    description: () => {
+      const rep10 = replicantiMult().pLog10();
+      let multiplier = "0.1";
+      if (rep10 > 9000) {
+        const ratio = DilationUpgrade.tdMultReplicanti.effectValue.pLog10() / rep10;
+        if (ratio < 0.095) {
+          multiplier = ratio.toFixed(2);
+        }
+      }
+      return `Time Dimensions are affected by Replicanti multiplier ${formatPow(multiplier, 1, 3)}, reduced
+        effect above ${formatX(DC.E9000)}`;
+    },
+    effect: () => {
+      let rep10 = replicantiMult().pLog10() * 0.1;
+      rep10 = rep10 > 9000 ? 9000 + 0.5 * (rep10 - 9000) : rep10;
+      return Decimal.pow10(rep10);
+    },
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  ndMultDT: {
+    id: 6,
+    cost: 5e7,
+    description: "Antimatter Dimension multiplier based on Dilated Time, unaffected by Time Dilation",
+    effect: () => Currency.dilatedTime.value.pow(308).clampMin(1),
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  ipMultDT: {
+    id: 7,
+    cost: 2e12,
+    description: "Gain a multiplier to Infinity Points based on Dilated Time",
+    effect: () => Currency.dilatedTime.value.pow(1000).clampMin(1),
+    formatEffect: value => formatX(value, 2, 1),
+    cap: () => Effarig.eternityCap
+  },
+  timeStudySplit: {
+    id: 8,
+    cost: 1e10,
+    description: "You can buy all three Time Study paths from the Dimension Split"
+  },
+  dilationPenalty: {
+    id: 9,
+    cost: 1e11,
+    description: () => `Reduce the Dilation penalty (${formatPow(1.05, 2, 2)} after reduction)`,
+    effect: 1.05,
+  },
+  ttGenerator: {
+    id: 10,
+    cost: 1e15,
+    description: "Generate Time Theorems based on Tachyon Particles",
+    effect: () => Currency.tachyonParticles.value.div(20000),
+    formatEffect: value => `${format(value, 2, 1)}/sec`
+  },
+  dtGainPelle: rebuyable({
+    id: 11,
+    initialCost: 1e14,
+    increment: 100,
+    pelleOnly: true,
+    description: () => `${formatX(5)} Dilated Time gain`,
+    effect: bought => Decimal.pow(5, bought),
+    formatEffect: value => formatX(value, 2),
+    formatCost: value => format(value, 2),
+    purchaseCap: Number.MAX_VALUE
+  }),
+  galaxyMultiplier: rebuyable({
+    id: 12,
+    initialCost: 1e15,
+    increment: 1000,
+    pelleOnly: true,
+    description: () => "Multiply Tachyon Galaxies gained",
+    effect: bought => bought + 1,
+    formatEffect: value => `${formatX(value, 2)} ➜ ${formatX(value + 1, 2)}`,
+    formatCost: value => format(value, 2),
+    purchaseCap: Number.MAX_VALUE
+  }),
+  tickspeedPower: rebuyable({
+    id: 13,
+    initialCost: 1e16,
+    increment: 1e4,
+    pelleOnly: true,
+    description: () => `Gain a power to tickspeed effect`,
+    effect: bought => 1 + bought * 0.03,
+    formatEffect: value => `${formatPow(value, 2, 2)} ➜ ${formatPow(value + 0.03, 2, 2)}`,
+    formatCost: value => format(value, 2),
+    purchaseCap: Number.MAX_VALUE
+  }),
+  galaxyThresholdPelle: {
+    id: 14,
+    cost: 1e45,
+    pelleOnly: true,
+    description: "Cubic root Tachyon Galaxy threshold",
+    effect: 1 / 3
+  },
+  flatDilationMult: {
+    id: 15,
+    cost: 1e55,
+    pelleOnly: true,
+    description: () => `Gain more Dilated Time based on EP`,
+    effect: () => 1e9 ** Math.min((Math.max(player.eternityPoints.log10() - 1500, 0) / 2500) ** 1.2, 1),
+    formatEffect: value => formatX(value, 2, 2)
+  },
+};
diff --git a/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js b/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js
index 3c42f10f6..6f6d3bd13 100644
--- a/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js
+++ b/javascripts/core/secret-formula/eternity/time-studies/normal-time-studies.js
@@ -1,6 +1,21 @@
 import { DC } from "../../../constants";
 import { GameDatabase } from "../../game-database";
 
+const thisInfinityMult = thisInfinity => {
+  // All "this inf time" or "best inf time" mults are * 10
+  const scaledInfinity = thisInfinity * 10 + 1;
+  const cappedInfinity = Math.min(Math.pow(scaledInfinity, 0.125), 500);
+  return DC.D15.pow(Math.log(scaledInfinity) * cappedInfinity);
+};
+const passiveIPMult = () => {
+  const isEffarigLimited = Effarig.isRunning && Effarig.currentStage === EFFARIG_STAGES.ETERNITY;
+  const normalValue = Perk.studyPassive.isBought ? 1e50 : 1e25;
+  return isEffarigLimited
+    ? Math.min(normalValue, Effarig.eternityCap.toNumber())
+    : normalValue;
+};
+
+
 /**
  * List of time study specifications and attributes
  * {
@@ -17,669 +32,654 @@ import { GameDatabase } from "../../game-database";
  *  @property {String} formatEffect   Formatting function for effects, if the default formatting isn't appropriate
  * }
  */
-GameDatabase.eternity.timeStudies.normal = (function() {
-  const thisInfinityMult = thisInfinity => {
-    // All "this inf time" or "best inf time" mults are * 10
-    const scaledInfinity = thisInfinity * 10 + 1;
-    const cappedInfinity = Math.min(Math.pow(scaledInfinity, 0.125), 500);
-    return DC.D15.pow(Math.log(scaledInfinity) * cappedInfinity);
-  };
-  const passiveIPMult = () => {
-    const isEffarigLimited = Effarig.isRunning && Effarig.currentStage === EFFARIG_STAGES.ETERNITY;
-    const normalValue = Perk.studyPassive.isBought ? 1e50 : 1e25;
-    return isEffarigLimited
-      ? Math.min(normalValue, Effarig.eternityCap.toNumber())
-      : normalValue;
-  };
-  return [
-    {
-      id: 11,
-      cost: 1,
-      // All requirements of an empty array will always evaluate to true, so this study is always purchasable
-      requirement: [],
-      reqType: TS_REQUIREMENT_TYPE.ALL,
-      description: "Tickspeed affects 1st Time Dimension with reduced effect",
-      effect: () => {
-        const tickspeed = Tickspeed.current.dividedBy(1000);
-        const firstPart = tickspeed.pow(0.005).times(0.95);
-        const secondPart = tickspeed.pow(0.0003).times(0.05);
-        return firstPart.plus(secondPart).reciprocate();
-      },
-      cap: DC.E2500,
-      formatEffect: value => formatX(value, 2, 1)
+GameDatabase.eternity.timeStudies.normal = [
+  {
+    id: 11,
+    cost: 1,
+    // All requirements of an empty array will always evaluate to true, so this study is always purchasable
+    requirement: [],
+    reqType: TS_REQUIREMENT_TYPE.ALL,
+    description: "Tickspeed affects 1st Time Dimension with reduced effect",
+    effect: () => {
+      const tickspeed = Tickspeed.current.dividedBy(1000);
+      const firstPart = tickspeed.pow(0.005).times(0.95);
+      const secondPart = tickspeed.pow(0.0003).times(0.05);
+      return firstPart.plus(secondPart).reciprocate();
     },
-    {
-      id: 21,
-      cost: 3,
-      requirement: [11],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `Improve Replicanti multiplier formula to
-      (log2(x)${formatPow(2)})+x${formatPow(0.032, 3, 3)}`,
-      effect: () => Replicanti.amount.pow(0.032)
+    cap: DC.E2500,
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 21,
+    cost: 3,
+    requirement: [11],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `Improve Replicanti multiplier formula to
+    (log2(x)${formatPow(2)})+x${formatPow(0.032, 3, 3)}`,
+    effect: () => Replicanti.amount.pow(0.032)
+  },
+  {
+    id: 22,
+    cost: 2,
+    requirement: [11],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `Replicanti interval limit ${formatInt(50)}ms ➜ ${formatInt(1)}ms`,
+    effect: 1
+  },
+  {
+    id: 31,
+    cost: 3,
+    requirement: [21],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `Powers up bonuses that are based on your Infinities (Bonuses${formatPow(4)})`,
+    effect: 4
+  },
+  {
+    id: 32,
+    cost: 2,
+    requirement: [22],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: `You gain more Infinities based on Dimension Boosts`,
+    effect: () => Math.max(DimBoost.totalBoosts, 1),
+    formatEffect: value => formatX(value)
+  },
+  {
+    id: 33,
+    cost: 2,
+    requirement: [21],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "You keep half of your Replicanti Galaxies on Infinity"
+  },
+  {
+    id: 41,
+    cost: 4,
+    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),
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 42,
+    cost: 6,
+    requirement: [32],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `Antimatter Galaxy requirement increases by ${formatInt(52)}
+      8th Dimensions instead of ${formatInt(60)}`,
+    effect: 52
+  },
+  {
+    id: 51,
+    cost: 3,
+    requirement: [41, 42],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `You gain ${formatX(1e15)} more Infinity Points`,
+    effect: 1e15
+  },
+  {
+    id: 61,
+    cost: 3,
+    requirement: [51],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `You gain ${formatX(15)} more Eternity Points`,
+    effect: 15
+  },
+  {
+    id: 62,
+    cost: 3,
+    requirement: [42, () => Perk.bypassEC5Lock.isBought || EternityChallenge(5).completions > 0],
+    reqType: TS_REQUIREMENT_TYPE.ALL,
+    description: () => `You gain Replicanti ${formatInt(3)} times faster`,
+    effect: 3
+  },
+  {
+    id: 71,
+    cost: 4,
+    requirement: [61, () => Perk.studyECRequirement.isBought || !EternityChallenge(12).isUnlocked],
+    reqType: TS_REQUIREMENT_TYPE.DIMENSION_PATH,
+    description: "Dimensional Sacrifice affects all other Antimatter Dimensions with reduced effect",
+    effect: () => Sacrifice.totalBoost.pow(0.25).clampMin(1),
+    cap: DC.E210000,
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 72,
+    cost: 6,
+    requirement: [61,
+      () => Perk.studyECRequirement.isBought ||
+        (!EternityChallenge(11).isUnlocked && !EternityChallenge(12).isUnlocked)],
+    reqType: TS_REQUIREMENT_TYPE.DIMENSION_PATH,
+    description: "Dimensional Sacrifice affects 4th Infinity Dimension with greatly reduced effect",
+    effect: () => Sacrifice.totalBoost.pow(0.04).clampMin(1),
+    cap: DC.E30000,
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 73,
+    cost: 5,
+    requirement: [61, () => Perk.studyECRequirement.isBought || !EternityChallenge(11).isUnlocked],
+    reqType: TS_REQUIREMENT_TYPE.DIMENSION_PATH,
+    description: "Dimensional Sacrifice affects 3rd Time Dimension with greatly reduced effect",
+    effect: () => Sacrifice.totalBoost.pow(0.005).clampMin(1),
+    cap: DC.E1300,
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 81,
+    cost: 4,
+    requirement: [71],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `Base Dimension Boost power becomes ${formatX(10)}`,
+    effect: 10
+  },
+  {
+    id: 82,
+    cost: 6,
+    requirement: [72],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "Dimension Boosts affect Infinity Dimensions",
+    effect: () => DC.D1_0000109.pow(Math.pow(DimBoost.totalBoosts, 2)),
+    cap: DC.E1E7,
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 83,
+    cost: 5,
+    requirement: [73],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "Dimension Boost multiplier based on tick upgrades gained from TDs",
+    effect: () => DC.D1_0004.pow(player.totalTickGained),
+    cap: DC.E30,
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 91,
+    cost: 4,
+    requirement: [81],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "Antimatter Dimension multiplier based on time spent in this Eternity",
+    effect: () => Decimal.pow10(Math.min(Time.thisEternity.totalMinutes, 20) * 15),
+    cap: DC.E300,
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 92,
+    cost: 5,
+    requirement: [82],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "Infinity Dimension multiplier based on fastest Eternity time",
+    effect: () => DC.D2.pow(60 / Math.max(Time.bestEternity.totalSeconds, 2)),
+    cap: DC.C2P30,
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 93,
+    cost: 7,
+    requirement: [83],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "Time Dimension multiplier based on tick upgrades gained",
+    effect: () => Decimal.pow(player.totalTickGained, 0.25).clampMin(1),
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 101,
+    cost: 4,
+    requirement: [91],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "Antimatter Dimension multiplier equal to Replicanti amount",
+    effect: () => Decimal.max(Replicanti.amount, 1),
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 102,
+    cost: 6,
+    requirement: [92],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "Replicanti Galaxies boost Replicanti multiplier",
+    effect: () => DC.D5.pow(player.replicanti.galaxies),
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 103,
+    cost: 6,
+    requirement: [93],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "Time Dimension multiplier equal to Replicanti Galaxy amount",
+    effect: () => Math.max(player.replicanti.galaxies, 1),
+    formatEffect: value => formatX(value, 2, 0)
+  },
+  {
+    id: 111,
+    cost: 12,
+    requirement: [101, 102, 103],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => (Achievement(103).canBeApplied
+      ? `Make the Infinity Point formula better log(x/${formatFloat(307.8, 1)}) ➜ log(x/${formatInt(285)})`
+      : `Make the Infinity Point formula better log(x/${formatInt(308)}) ➜ log(x/${formatInt(285)})`),
+    effect: 285
+  },
+  {
+    id: 121,
+    cost: 9,
+    STCost: 2,
+    requirement: [111],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [122, 123],
+    description: () => (Perk.studyActiveEP.isBought
+      ? `You gain ${formatX(50)} more Eternity Points`
+      : `You gain more EP based on how fast your last ten Eternities
+      were${PlayerProgress.realityUnlocked() ? " (real time)" : ""}`),
+    effect: () => (Perk.studyActiveEP.isBought
+      ? 50
+      : Math.clamp(250 / Player.averageRealTimePerEternity, 1, 50)),
+    formatEffect: value => (Perk.studyActiveEP.isBought ? undefined : formatX(value, 1, 1)),
+    cap: 50
+  },
+  {
+    id: 122,
+    cost: 9,
+    STCost: 2,
+    requirement: [111],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [121, 123],
+    description: () => (Perk.studyPassive.isBought
+      ? `You gain ${formatX(50)} more Eternity Points`
+      : `You gain ${formatX(35)} more Eternity Points`),
+    effect: () => (Perk.studyPassive.isBought ? 50 : 35)
+  },
+  {
+    id: 123,
+    cost: 9,
+    STCost: 2,
+    requirement: [111],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [121, 122],
+    description: "You gain more Eternity Points based on time spent this Eternity",
+    effect: () => {
+      const perkEffect = TimeSpan.fromMinutes(Perk.studyIdleEP.effectOrDefault(0));
+      const totalSeconds = Time.thisEternity.plus(perkEffect).totalSeconds;
+      return Math.sqrt(1.39 * totalSeconds);
     },
-    {
-      id: 22,
-      cost: 2,
-      requirement: [11],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `Replicanti interval limit ${formatInt(50)}ms ➜ ${formatInt(1)}ms`,
-      effect: 1
+    formatEffect: value => formatX(value, 1, 1)
+  },
+  {
+    id: 131,
+    cost: 5,
+    STCost: 8,
+    requirement: [121],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [132, 133],
+    description: () => (Achievement(138).isUnlocked
+      ? `You can get ${formatPercents(0.5)} more Replicanti Galaxies`
+      : `Automatic Replicanti Galaxies are disabled, but you can get ${formatPercents(0.5)} more`),
+    effect: () => Math.floor(player.replicanti.boughtGalaxyCap / 2)
+  },
+  {
+    id: 132,
+    cost: 5,
+    STCost: 8,
+    requirement: [122],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [131, 133],
+    description: () => (Perk.studyPassive.isBought && !Pelle.isDoomed
+      ? `Replicanti Galaxies are ${formatPercents(0.4)} stronger and Replicanti are ${format(3)} times faster`
+      : `Replicanti Galaxies are ${formatPercents(0.4)} stronger`),
+    effect: 0.4
+  },
+  {
+    id: 133,
+    cost: 5,
+    STCost: 8,
+    requirement: [123],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [131, 132],
+    description: () => (Achievement(138).isUnlocked
+      ? `Replicanti Galaxies are ${formatPercents(0.5)} stronger`
+      : `Replicanti are ${formatX(10)} slower until ${format(Number.MAX_VALUE, 2)}` +
+    `, but Replicanti Galaxies are ${formatPercents(0.5)} stronger`),
+    effect: 0.5
+  },
+  {
+    id: 141,
+    cost: 4,
+    STCost: 2,
+    requirement: [131],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [142, 143],
+    description: () => (Perk.studyActiveEP.isBought
+      ? `You gain ${formatX(DC.E45)} more Infinity Points`
+      : "Multiplier to Infinity Points, which decays over this Infinity"),
+    effect: () => (Perk.studyActiveEP.isBought
+      ? DC.E45
+      : DC.E45.divide(thisInfinityMult(Time.thisInfinity.totalSeconds)).clampMin(1)),
+    formatEffect: value => (Perk.studyActiveEP.isBought ? undefined : formatX(value, 2, 1))
+  },
+  {
+    id: 142,
+    cost: 4,
+    STCost: 2,
+    requirement: [132],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [141, 143],
+    description: () => `You gain ${formatX(passiveIPMult())} more Infinity Points`,
+    effect: passiveIPMult,
+    cap: () => (Effarig.eternityCap === undefined ? undefined : Effarig.eternityCap.toNumber())
+  },
+  {
+    id: 143,
+    cost: 4,
+    STCost: 2,
+    requirement: [133],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [141, 142],
+    description: "Multiplier to Infinity Points, which increases over this Infinity",
+    effect: () => {
+      const perkEffect = TimeSpan.fromMinutes(Perk.studyIdleEP.effectOrDefault(0));
+      const totalSeconds = Time.thisInfinity.plus(perkEffect).totalSeconds;
+      return thisInfinityMult(totalSeconds);
     },
-    {
-      id: 31,
-      cost: 3,
-      requirement: [21],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `Powers up bonuses that are based on your Infinities (Bonuses${formatPow(4)})`,
-      effect: 4
+    formatEffect: value => formatX(value, 2, 1),
+    cap: () => Effarig.eternityCap
+  },
+  {
+    id: 151,
+    cost: 8,
+    requirement: [141, 142, 143],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `${formatX(1e4)} multiplier on all Time Dimensions`,
+    effect: 1e4
+  },
+  {
+    id: 161,
+    cost: 7,
+    requirement: [151],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `${formatX(DC.E616)} multiplier on all Antimatter Dimensions`,
+    effect: () => DC.E616
+  },
+  {
+    id: 162,
+    cost: 7,
+    requirement: [151],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `${formatX(1e11)} multiplier on all Infinity Dimensions`,
+    effect: 1e11
+  },
+  {
+    id: 171,
+    cost: 15,
+    requirement: [161, 162],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `Time Shard requirement for the next Tickspeed upgrade goes up slower
+      ${formatX(1.33, 0, 2)} ➜ ${formatX(1.25, 0, 2)}`,
+    effect: () => TS171_MULTIPLIER
+  },
+  {
+    id: 181,
+    cost: 200,
+    requirement: [171,
+      () => EternityChallenge(1).completions > 0 || Perk.bypassEC1Lock.isBought,
+      () => EternityChallenge(2).completions > 0 || Perk.bypassEC2Lock.isBought,
+      () => EternityChallenge(3).completions > 0 || Perk.bypassEC3Lock.isBought],
+    reqType: TS_REQUIREMENT_TYPE.ALL,
+    description: () => `You gain ${formatPercents(0.01)} of your Infinity Points gained on crunch each second`,
+    effect: () => gainedInfinityPoints().times(Time.deltaTime / 100)
+      .timesEffectOf(Ra.unlocks.continuousTTBoost.effects.autoPrestige)
+  },
+  {
+    id: 191,
+    cost: 400,
+    requirement: [181, () => EternityChallenge(10).completions > 0],
+    reqType: TS_REQUIREMENT_TYPE.ALL,
+    description: () => `After Eternity you permanently keep ${formatPercents(0.05)}
+    of your Infinities as Banked Infinities`,
+    effect: () => Currency.infinities.value.times(0.05).floor()
+  },
+  {
+    id: 192,
+    cost: 730,
+    requirement: [181, () => EternityChallenge(10).completions > 0, () => !Enslaved.isRunning],
+    reqType: TS_REQUIREMENT_TYPE.ALL,
+    description: () => (Enslaved.isRunning
+      ? "There is not enough space in this Reality"
+      : `Replicanti can go beyond ${format(replicantiCap(), 2, 1)}, but growth slows down at higher amounts`)
+  },
+  {
+    id: 193,
+    cost: 300,
+    requirement: [181, () => EternityChallenge(10).completions > 0],
+    reqType: TS_REQUIREMENT_TYPE.ALL,
+    description: "Antimatter Dimension multiplier based on Eternities",
+    effect: () => (DC.E13000.pow(Currency.eternities.value.div(1e6).clampMax(1))),
+    cap: DC.E13000,
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 201,
+    cost: 900,
+    requirement: [192],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "Pick a second path from the Dimension Split"
+  },
+  {
+    id: 211,
+    cost: 120,
+    requirement: [191],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `Dimension Boost requirement scaling is reduced by ${formatInt(5)}`,
+    effect: 5
+  },
+  {
+    id: 212,
+    cost: 150,
+    requirement: [191],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "All Galaxies are stronger based on your Time Shards",
+    effect: () => Math.pow(Currency.timeShards.value.clampMin(2).log2(), 0.005),
+    cap: 1.1,
+    formatEffect: value => `+${formatPercents(value - 1, 3)}`
+  },
+  {
+    id: 213,
+    cost: 200,
+    requirement: [193],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: () => `You gain Replicanti ${formatInt(20)} times faster`,
+    effect: 20
+  },
+  {
+    id: 214,
+    cost: 120,
+    requirement: [193],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    description: "Dimensional Sacrifice boosts the 8th Antimatter Dimension even more",
+    effect: () => {
+      const totalBoost = Sacrifice.totalBoost;
+      const firstPart = totalBoost.pow(7.6).clampMaxExponent(44000);
+      const secondPart = totalBoost.pow(1.05).clampMaxExponent(120000);
+      return firstPart.times(secondPart);
     },
-    {
-      id: 32,
-      cost: 2,
-      requirement: [22],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: `You gain more Infinities based on Dimension Boosts`,
-      effect: () => Math.max(DimBoost.totalBoosts, 1),
-      formatEffect: value => formatX(value)
+    cap: DC.E164000,
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 221,
+    cost: 900,
+    STCost: 4,
+    requirement: [211],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [222],
+    description: "Time Dimension multiplier based on Dimension Boosts",
+    effect: () => DC.D1_0025.pow(DimBoost.totalBoosts),
+    formatEffect: value => formatX(value, 2, 1)
+  },
+  {
+    id: 222,
+    cost: 900,
+    STCost: 4,
+    requirement: [211],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [221],
+    description: () => `Dimension Boost costs scale by another ${formatInt(2)} less`,
+    effect: 2
+  },
+  {
+    id: 223,
+    cost: 900,
+    STCost: 4,
+    requirement: [212],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [224],
+    description: () => `Distant Galaxy cost scaling starts ${formatInt(7)} Galaxies later`,
+    effect: 7
+  },
+  {
+    id: 224,
+    cost: 900,
+    STCost: 4,
+    requirement: [212],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [223],
+    description() {
+      const effect = TimeStudy(224).effectValue;
+      return `Distant Galaxy cost scaling starts ${quantifyInt("Galaxy", effect)} later
+        (${formatInt(1)} per ${formatInt(2000)} Dim Boosts)`;
     },
-    {
-      id: 33,
-      cost: 2,
-      requirement: [21],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "You keep half of your Replicanti Galaxies on Infinity"
-    },
-    {
-      id: 41,
-      cost: 4,
-      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),
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 42,
-      cost: 6,
-      requirement: [32],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `Antimatter Galaxy requirement increases by ${formatInt(52)}
-        8th Dimensions instead of ${formatInt(60)}`,
-      effect: 52
-    },
-    {
-      id: 51,
-      cost: 3,
-      requirement: [41, 42],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `You gain ${formatX(1e15)} more Infinity Points`,
-      effect: 1e15
-    },
-    {
-      id: 61,
-      cost: 3,
-      requirement: [51],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `You gain ${formatX(15)} more Eternity Points`,
-      effect: 15
-    },
-    {
-      id: 62,
-      cost: 3,
-      requirement: [42, () => Perk.bypassEC5Lock.isBought || EternityChallenge(5).completions > 0],
-      reqType: TS_REQUIREMENT_TYPE.ALL,
-      description: () => `You gain Replicanti ${formatInt(3)} times faster`,
-      effect: 3
-    },
-    {
-      id: 71,
-      cost: 4,
-      requirement: [61, () => Perk.studyECRequirement.isBought || !EternityChallenge(12).isUnlocked],
-      reqType: TS_REQUIREMENT_TYPE.DIMENSION_PATH,
-      description: "Dimensional Sacrifice affects all other Antimatter Dimensions with reduced effect",
-      effect: () => Sacrifice.totalBoost.pow(0.25).clampMin(1),
-      cap: DC.E210000,
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 72,
-      cost: 6,
-      requirement: [61,
-        () => Perk.studyECRequirement.isBought ||
-          (!EternityChallenge(11).isUnlocked && !EternityChallenge(12).isUnlocked)],
-      reqType: TS_REQUIREMENT_TYPE.DIMENSION_PATH,
-      description: "Dimensional Sacrifice affects 4th Infinity Dimension with greatly reduced effect",
-      effect: () => Sacrifice.totalBoost.pow(0.04).clampMin(1),
-      cap: DC.E30000,
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 73,
-      cost: 5,
-      requirement: [61, () => Perk.studyECRequirement.isBought || !EternityChallenge(11).isUnlocked],
-      reqType: TS_REQUIREMENT_TYPE.DIMENSION_PATH,
-      description: "Dimensional Sacrifice affects 3rd Time Dimension with greatly reduced effect",
-      effect: () => Sacrifice.totalBoost.pow(0.005).clampMin(1),
-      cap: DC.E1300,
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 81,
-      cost: 4,
-      requirement: [71],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `Base Dimension Boost power becomes ${formatX(10)}`,
-      effect: 10
-    },
-    {
-      id: 82,
-      cost: 6,
-      requirement: [72],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "Dimension Boosts affect Infinity Dimensions",
-      effect: () => DC.D1_0000109.pow(Math.pow(DimBoost.totalBoosts, 2)),
-      cap: DC.E1E7,
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 83,
-      cost: 5,
-      requirement: [73],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "Dimension Boost multiplier based on tick upgrades gained from TDs",
-      effect: () => DC.D1_0004.pow(player.totalTickGained),
-      cap: DC.E30,
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 91,
-      cost: 4,
-      requirement: [81],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "Antimatter Dimension multiplier based on time spent in this Eternity",
-      effect: () => Decimal.pow10(Math.min(Time.thisEternity.totalMinutes, 20) * 15),
-      cap: DC.E300,
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 92,
-      cost: 5,
-      requirement: [82],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "Infinity Dimension multiplier based on fastest Eternity time",
-      effect: () => DC.D2.pow(60 / Math.max(Time.bestEternity.totalSeconds, 2)),
-      cap: DC.C2P30,
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 93,
-      cost: 7,
-      requirement: [83],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "Time Dimension multiplier based on tick upgrades gained",
-      effect: () => Decimal.pow(player.totalTickGained, 0.25).clampMin(1),
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 101,
-      cost: 4,
-      requirement: [91],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "Antimatter Dimension multiplier equal to Replicanti amount",
-      effect: () => Decimal.max(Replicanti.amount, 1),
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 102,
-      cost: 6,
-      requirement: [92],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "Replicanti Galaxies boost Replicanti multiplier",
-      effect: () => DC.D5.pow(player.replicanti.galaxies),
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 103,
-      cost: 6,
-      requirement: [93],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "Time Dimension multiplier equal to Replicanti Galaxy amount",
-      effect: () => Math.max(player.replicanti.galaxies, 1),
-      formatEffect: value => formatX(value, 2, 0)
-    },
-    {
-      id: 111,
-      cost: 12,
-      requirement: [101, 102, 103],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => (Achievement(103).canBeApplied
-        ? `Make the Infinity Point formula better log(x/${formatFloat(307.8, 1)}) ➜ log(x/${formatInt(285)})`
-        : `Make the Infinity Point formula better log(x/${formatInt(308)}) ➜ log(x/${formatInt(285)})`),
-      effect: 285
-    },
-    {
-      id: 121,
-      cost: 9,
-      STCost: 2,
-      requirement: [111],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [122, 123],
-      description: () => (Perk.studyActiveEP.isBought
-        ? `You gain ${formatX(50)} more Eternity Points`
-        : `You gain more EP based on how fast your last ten Eternities
-        were${PlayerProgress.realityUnlocked() ? " (real time)" : ""}`),
-      effect: () => (Perk.studyActiveEP.isBought
-        ? 50
-        : Math.clamp(250 / Player.averageRealTimePerEternity, 1, 50)),
-      formatEffect: value => (Perk.studyActiveEP.isBought ? undefined : formatX(value, 1, 1)),
-      cap: 50
-    },
-    {
-      id: 122,
-      cost: 9,
-      STCost: 2,
-      requirement: [111],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [121, 123],
-      description: () => (Perk.studyPassive.isBought
-        ? `You gain ${formatX(50)} more Eternity Points`
-        : `You gain ${formatX(35)} more Eternity Points`),
-      effect: () => (Perk.studyPassive.isBought ? 50 : 35)
-    },
-    {
-      id: 123,
-      cost: 9,
-      STCost: 2,
-      requirement: [111],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [121, 122],
-      description: "You gain more Eternity Points based on time spent this Eternity",
-      effect: () => {
-        const perkEffect = TimeSpan.fromMinutes(Perk.studyIdleEP.effectOrDefault(0));
-        const totalSeconds = Time.thisEternity.plus(perkEffect).totalSeconds;
-        return Math.sqrt(1.39 * totalSeconds);
-      },
-      formatEffect: value => formatX(value, 1, 1)
-    },
-    {
-      id: 131,
-      cost: 5,
-      STCost: 8,
-      requirement: [121],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [132, 133],
-      description: () => (Achievement(138).isUnlocked
-        ? `You can get ${formatPercents(0.5)} more Replicanti Galaxies`
-        : `Automatic Replicanti Galaxies are disabled, but you can get ${formatPercents(0.5)} more`),
-      effect: () => Math.floor(player.replicanti.boughtGalaxyCap / 2)
-    },
-    {
-      id: 132,
-      cost: 5,
-      STCost: 8,
-      requirement: [122],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [131, 133],
-      description: () => (Perk.studyPassive.isBought && !Pelle.isDoomed
-        ? `Replicanti Galaxies are ${formatPercents(0.4)} stronger and Replicanti are ${format(3)} times faster`
-        : `Replicanti Galaxies are ${formatPercents(0.4)} stronger`),
-      effect: 0.4
-    },
-    {
-      id: 133,
-      cost: 5,
-      STCost: 8,
-      requirement: [123],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [131, 132],
-      description: () => (Achievement(138).isUnlocked
-        ? `Replicanti Galaxies are ${formatPercents(0.5)} stronger`
-        : `Replicanti are ${formatX(10)} slower until ${format(Number.MAX_VALUE, 2)}` +
-      `, but Replicanti Galaxies are ${formatPercents(0.5)} stronger`),
-      effect: 0.5
-    },
-    {
-      id: 141,
-      cost: 4,
-      STCost: 2,
-      requirement: [131],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [142, 143],
-      description: () => (Perk.studyActiveEP.isBought
-        ? `You gain ${formatX(DC.E45)} more Infinity Points`
-        : "Multiplier to Infinity Points, which decays over this Infinity"),
-      effect: () => (Perk.studyActiveEP.isBought
-        ? DC.E45
-        : DC.E45.divide(thisInfinityMult(Time.thisInfinity.totalSeconds)).clampMin(1)),
-      formatEffect: value => (Perk.studyActiveEP.isBought ? undefined : formatX(value, 2, 1))
-    },
-    {
-      id: 142,
-      cost: 4,
-      STCost: 2,
-      requirement: [132],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [141, 143],
-      description: () => `You gain ${formatX(passiveIPMult())} more Infinity Points`,
-      effect: passiveIPMult,
-      cap: () => (Effarig.eternityCap === undefined ? undefined : Effarig.eternityCap.toNumber())
-    },
-    {
-      id: 143,
-      cost: 4,
-      STCost: 2,
-      requirement: [133],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [141, 142],
-      description: "Multiplier to Infinity Points, which increases over this Infinity",
-      effect: () => {
-        const perkEffect = TimeSpan.fromMinutes(Perk.studyIdleEP.effectOrDefault(0));
-        const totalSeconds = Time.thisInfinity.plus(perkEffect).totalSeconds;
-        return thisInfinityMult(totalSeconds);
-      },
-      formatEffect: value => formatX(value, 2, 1),
-      cap: () => Effarig.eternityCap
-    },
-    {
-      id: 151,
-      cost: 8,
-      requirement: [141, 142, 143],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `${formatX(1e4)} multiplier on all Time Dimensions`,
-      effect: 1e4
-    },
-    {
-      id: 161,
-      cost: 7,
-      requirement: [151],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `${formatX(DC.E616)} multiplier on all Antimatter Dimensions`,
-      effect: () => DC.E616
-    },
-    {
-      id: 162,
-      cost: 7,
-      requirement: [151],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `${formatX(1e11)} multiplier on all Infinity Dimensions`,
-      effect: 1e11
-    },
-    {
-      id: 171,
-      cost: 15,
-      requirement: [161, 162],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `Time Shard requirement for the next Tickspeed upgrade goes up slower
-        ${formatX(1.33, 0, 2)} ➜ ${formatX(1.25, 0, 2)}`,
-      effect: () => TS171_MULTIPLIER
-    },
-    {
-      id: 181,
-      cost: 200,
-      requirement: [171,
-        () => EternityChallenge(1).completions > 0 || Perk.bypassEC1Lock.isBought,
-        () => EternityChallenge(2).completions > 0 || Perk.bypassEC2Lock.isBought,
-        () => EternityChallenge(3).completions > 0 || Perk.bypassEC3Lock.isBought],
-      reqType: TS_REQUIREMENT_TYPE.ALL,
-      description: () => `You gain ${formatPercents(0.01)} of your Infinity Points gained on crunch each second`,
-      effect: () => gainedInfinityPoints().times(Time.deltaTime / 100)
-        .timesEffectOf(Ra.unlocks.continuousTTBoost.effects.autoPrestige)
-    },
-    {
-      id: 191,
-      cost: 400,
-      requirement: [181, () => EternityChallenge(10).completions > 0],
-      reqType: TS_REQUIREMENT_TYPE.ALL,
-      description: () => `After Eternity you permanently keep ${formatPercents(0.05)}
-      of your Infinities as Banked Infinities`,
-      effect: () => Currency.infinities.value.times(0.05).floor()
-    },
-    {
-      id: 192,
-      cost: 730,
-      requirement: [181, () => EternityChallenge(10).completions > 0, () => !Enslaved.isRunning],
-      reqType: TS_REQUIREMENT_TYPE.ALL,
-      description: () => (Enslaved.isRunning
-        ? "There is not enough space in this Reality"
-        : `Replicanti can go beyond ${format(replicantiCap(), 2, 1)}, but growth slows down at higher amounts`)
-    },
-    {
-      id: 193,
-      cost: 300,
-      requirement: [181, () => EternityChallenge(10).completions > 0],
-      reqType: TS_REQUIREMENT_TYPE.ALL,
-      description: "Antimatter Dimension multiplier based on Eternities",
-      effect: () => (DC.E13000.pow(Currency.eternities.value.div(1e6).clampMax(1))),
-      cap: DC.E13000,
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 201,
-      cost: 900,
-      requirement: [192],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "Pick a second path from the Dimension Split"
-    },
-    {
-      id: 211,
-      cost: 120,
-      requirement: [191],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `Dimension Boost requirement scaling is reduced by ${formatInt(5)}`,
-      effect: 5
-    },
-    {
-      id: 212,
-      cost: 150,
-      requirement: [191],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "All Galaxies are stronger based on your Time Shards",
-      effect: () => Math.pow(Currency.timeShards.value.clampMin(2).log2(), 0.005),
-      cap: 1.1,
-      formatEffect: value => `+${formatPercents(value - 1, 3)}`
-    },
-    {
-      id: 213,
-      cost: 200,
-      requirement: [193],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: () => `You gain Replicanti ${formatInt(20)} times faster`,
-      effect: 20
-    },
-    {
-      id: 214,
-      cost: 120,
-      requirement: [193],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      description: "Dimensional Sacrifice boosts the 8th Antimatter Dimension even more",
-      effect: () => {
-        const totalBoost = Sacrifice.totalBoost;
-        const firstPart = totalBoost.pow(7.6).clampMaxExponent(44000);
-        const secondPart = totalBoost.pow(1.05).clampMaxExponent(120000);
-        return firstPart.times(secondPart);
-      },
-      cap: DC.E164000,
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 221,
-      cost: 900,
-      STCost: 4,
-      requirement: [211],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [222],
-      description: "Time Dimension multiplier based on Dimension Boosts",
-      effect: () => DC.D1_0025.pow(DimBoost.totalBoosts),
-      formatEffect: value => formatX(value, 2, 1)
-    },
-    {
-      id: 222,
-      cost: 900,
-      STCost: 4,
-      requirement: [211],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [221],
-      description: () => `Dimension Boost costs scale by another ${formatInt(2)} less`,
-      effect: 2
-    },
-    {
-      id: 223,
-      cost: 900,
-      STCost: 4,
-      requirement: [212],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [224],
-      description: () => `Distant Galaxy cost scaling starts ${formatInt(7)} Galaxies later`,
-      effect: 7
-    },
-    {
-      id: 224,
-      cost: 900,
-      STCost: 4,
-      requirement: [212],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [223],
-      description() {
-        const effect = TimeStudy(224).effectValue;
-        return `Distant Galaxy cost scaling starts ${quantifyInt("Galaxy", effect)} later
-          (${formatInt(1)} per ${formatInt(2000)} Dim Boosts)`;
-      },
-      effect: () => Math.floor(DimBoost.totalBoosts / 2000)
-    },
-    {
-      id: 225,
-      cost: 900,
-      STCost: 4,
-      requirement: [213],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [226],
-      description: "You gain extra Replicanti Galaxies based on your Replicanti amount",
-      effect: () => Math.floor(Replicanti.amount.exponent / 1000),
-      formatEffect: value => `+${quantifyInt("RG", value)}`
-    },
-    {
-      id: 226,
-      cost: 900,
-      STCost: 4,
-      requirement: [213],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [225],
-      description: "You gain extra Replicanti Galaxies based on their max",
-      effect: () => Math.floor(player.replicanti.boughtGalaxyCap / 15),
-      formatEffect: value => `+${quantifyInt("RG", value)}`
-    },
-    {
-      id: 227,
-      cost: 900,
-      STCost: 4,
-      requirement: [214],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [228],
-      description: "Dimensional Sacrifice affects 4th Time Dimension with reduced effect",
-      effect: () => Math.max(Math.pow(Sacrifice.totalBoost.pLog10(), 10), 1),
-      formatEffect: value => formatX(value, 2, 2)
-    },
-    {
-      id: 228,
-      cost: 900,
-      STCost: 4,
-      requirement: [214],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [227],
-      description: () => `Dimensional Sacrifice formula scales better
-        ${Sacrifice.getSacrificeDescription({ "TimeStudy228": false })} ➜
-        ${Sacrifice.getSacrificeDescription({ "TimeStudy228": true })}`,
-      effect: 0.2
-    },
-    {
-      id: 231,
-      cost: 500,
-      STCost: 5,
-      requirement: [221, 222],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [232],
-      description: "Dimension Boosts are stronger based on their amount",
-      effect: () => Decimal.pow(DimBoost.totalBoosts, 0.3).clampMin(1),
-      formatEffect: value => formatX(value, 2, 2)
-    },
-    {
-      id: 232,
-      cost: 500,
-      STCost: 5,
-      requirement: [223, 224],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [231],
-      description: "All Galaxies are stronger based on Antimatter Galaxies",
-      effect: () => Math.pow(1 + player.galaxies / 1000, 0.2),
-      formatEffect: value => `+${formatPercents(value - 1, 3)}`
-    },
-    {
-      id: 233,
-      cost: 500,
-      STCost: 5,
-      requirement: [225, 226],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [234],
-      description: "Max Replicanti Galaxy upgrade is cheaper based on current Replicanti",
-      effect: () => Replicanti.amount.pow(0.3),
-      formatEffect: value => `/ ${format(value, 1, 2)}`
-    },
-    {
-      id: 234,
-      cost: 500,
-      STCost: 5,
-      requirement: [227, 228],
-      reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
-      requiresST: [233],
-      description: "Dimensional Sacrifice applies to 1st Antimatter Dimension",
-      effect: () => Sacrifice.totalBoost,
-    },
-    // Note: These last 4 entries are the triad studies
-    {
-      id: 301,
-      cost: 0,
-      STCost: 12,
-      requirement: [() => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 1, 221, 222, 231],
-      reqType: TS_REQUIREMENT_TYPE.ALL,
-      requiresST: [221, 222, 231],
-      description: "Time Study 231 improves the effect of Time Study 221",
-      effect: () => TimeStudy(221).effectValue.pow(TimeStudy(231).effectValue.minus(1)).clampMin(1),
-      formatEffect: value => formatX(value, 2, 1),
-      unlocked: () => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 1
-    },
-    {
-      id: 302,
-      cost: 0,
-      STCost: 12,
-      requirement: [() => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 2, 223, 224, 232],
-      reqType: TS_REQUIREMENT_TYPE.ALL,
-      requiresST: [223, 224, 232],
-      description: () => `Distant Galaxy scaling threshold starts another ${formatInt(3000)} Antimatter Galaxies later`,
-      effect: 3000,
-      unlocked: () => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 2
-    },
-    {
-      id: 303,
-      cost: 0,
-      STCost: 12,
-      requirement: [() => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 3, 225, 226, 233],
-      reqType: TS_REQUIREMENT_TYPE.ALL,
-      requiresST: [225, 226, 233],
-      description: () => `Gain ${formatPercents(0.5)} more extra Replicanti Galaxies from Time Studies 225 and 226,
-        and from Effarig's Infinity`,
-      effect: 1.5,
-      unlocked: () => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 3
-    },
-    {
-      id: 304,
-      cost: 0,
-      STCost: 12,
-      requirement: [() => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 4, 227, 228, 234],
-      reqType: TS_REQUIREMENT_TYPE.ALL,
-      requiresST: [227, 228, 234],
-      description: "Dimensional Sacrifice multiplier is squared",
-      effect: 2,
-      unlocked: () => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 4
-    }
-  ];
-}());
+    effect: () => Math.floor(DimBoost.totalBoosts / 2000)
+  },
+  {
+    id: 225,
+    cost: 900,
+    STCost: 4,
+    requirement: [213],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [226],
+    description: "You gain extra Replicanti Galaxies based on your Replicanti amount",
+    effect: () => Math.floor(Replicanti.amount.exponent / 1000),
+    formatEffect: value => `+${quantifyInt("RG", value)}`
+  },
+  {
+    id: 226,
+    cost: 900,
+    STCost: 4,
+    requirement: [213],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [225],
+    description: "You gain extra Replicanti Galaxies based on their max",
+    effect: () => Math.floor(player.replicanti.boughtGalaxyCap / 15),
+    formatEffect: value => `+${quantifyInt("RG", value)}`
+  },
+  {
+    id: 227,
+    cost: 900,
+    STCost: 4,
+    requirement: [214],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [228],
+    description: "Dimensional Sacrifice affects 4th Time Dimension with reduced effect",
+    effect: () => Math.max(Math.pow(Sacrifice.totalBoost.pLog10(), 10), 1),
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  {
+    id: 228,
+    cost: 900,
+    STCost: 4,
+    requirement: [214],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [227],
+    description: () => `Dimensional Sacrifice formula scales better
+      ${Sacrifice.getSacrificeDescription({ "TimeStudy228": false })} ➜
+      ${Sacrifice.getSacrificeDescription({ "TimeStudy228": true })}`,
+    effect: 0.2
+  },
+  {
+    id: 231,
+    cost: 500,
+    STCost: 5,
+    requirement: [221, 222],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [232],
+    description: "Dimension Boosts are stronger based on their amount",
+    effect: () => Decimal.pow(DimBoost.totalBoosts, 0.3).clampMin(1),
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  {
+    id: 232,
+    cost: 500,
+    STCost: 5,
+    requirement: [223, 224],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [231],
+    description: "All Galaxies are stronger based on Antimatter Galaxies",
+    effect: () => Math.pow(1 + player.galaxies / 1000, 0.2),
+    formatEffect: value => `+${formatPercents(value - 1, 3)}`
+  },
+  {
+    id: 233,
+    cost: 500,
+    STCost: 5,
+    requirement: [225, 226],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [234],
+    description: "Max Replicanti Galaxy upgrade is cheaper based on current Replicanti",
+    effect: () => Replicanti.amount.pow(0.3),
+    formatEffect: value => `/ ${format(value, 1, 2)}`
+  },
+  {
+    id: 234,
+    cost: 500,
+    STCost: 5,
+    requirement: [227, 228],
+    reqType: TS_REQUIREMENT_TYPE.AT_LEAST_ONE,
+    requiresST: [233],
+    description: "Dimensional Sacrifice applies to 1st Antimatter Dimension",
+    effect: () => Sacrifice.totalBoost,
+  },
+  // Note: These last 4 entries are the triad studies
+  {
+    id: 301,
+    cost: 0,
+    STCost: 12,
+    requirement: [() => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 1, 221, 222, 231],
+    reqType: TS_REQUIREMENT_TYPE.ALL,
+    requiresST: [221, 222, 231],
+    description: "Time Study 231 improves the effect of Time Study 221",
+    effect: () => TimeStudy(221).effectValue.pow(TimeStudy(231).effectValue.minus(1)).clampMin(1),
+    formatEffect: value => formatX(value, 2, 1),
+    unlocked: () => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 1
+  },
+  {
+    id: 302,
+    cost: 0,
+    STCost: 12,
+    requirement: [() => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 2, 223, 224, 232],
+    reqType: TS_REQUIREMENT_TYPE.ALL,
+    requiresST: [223, 224, 232],
+    description: () => `Distant Galaxy scaling threshold starts another ${formatInt(3000)} Antimatter Galaxies later`,
+    effect: 3000,
+    unlocked: () => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 2
+  },
+  {
+    id: 303,
+    cost: 0,
+    STCost: 12,
+    requirement: [() => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 3, 225, 226, 233],
+    reqType: TS_REQUIREMENT_TYPE.ALL,
+    requiresST: [225, 226, 233],
+    description: () => `Gain ${formatPercents(0.5)} more extra Replicanti Galaxies from Time Studies 225 and 226,
+      and from Effarig's Infinity`,
+    effect: 1.5,
+    unlocked: () => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 3
+  },
+  {
+    id: 304,
+    cost: 0,
+    STCost: 12,
+    requirement: [() => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 4, 227, 228, 234],
+    reqType: TS_REQUIREMENT_TYPE.ALL,
+    requiresST: [227, 228, 234],
+    description: "Dimensional Sacrifice multiplier is squared",
+    effect: 2,
+    unlocked: () => Ra.unlocks.unlockHardV.effectOrDefault(0) >= 4
+  }
+];
diff --git a/javascripts/core/secret-formula/reality/imaginary-upgrades.js b/javascripts/core/secret-formula/reality/imaginary-upgrades.js
index 982bc7a9f..3f9f89017 100644
--- a/javascripts/core/secret-formula/reality/imaginary-upgrades.js
+++ b/javascripts/core/secret-formula/reality/imaginary-upgrades.js
@@ -1,293 +1,292 @@
 import { DC } from "../../constants";
 import { GameDatabase } from "../game-database";
 
-GameDatabase.reality.imaginaryUpgrades = (function() {
-  const rebuyable = props => {
-    props.cost = () => props.initialCost * Math.pow(props.costMult, player.reality.imaginaryRebuyables[props.id]);
-    const { effect } = props;
-    if (props.isDecimal) props.effect = () => Decimal.pow(effect, player.reality.imaginaryRebuyables[props.id]);
-    else props.effect = () => effect * player.reality.imaginaryRebuyables[props.id];
-    if (!props.formatEffect) props.formatEffect = value => `+${format(value, 2, 2)}`;
-    props.formatCost = value => format(value, 2, 0);
-    return props;
-  };
-  return [
-    rebuyable({
-      name: "Temporal Intensifier",
-      id: 1,
-      initialCost: 3,
-      costMult: 60,
-      description: () => `Increase Temporal Amplifier multiplier by +${format(0.15, 2, 2)}`,
-      effect: 0.15
-    }),
-    rebuyable({
-      name: "Replicative Intensifier",
-      id: 2,
-      initialCost: 4,
-      costMult: 60,
-      description: () => `Increase Replicative Amplifier multiplier by +${format(0.15, 2, 2)}`,
-      effect: 0.15
-    }),
-    rebuyable({
-      name: "Eternal Intensifier",
-      id: 3,
-      initialCost: 1,
-      costMult: 40,
-      description: () => `Increase Eternal Amplifier multiplier by +${format(0.4, 2, 2)}`,
-      effect: 0.4
-    }),
-    rebuyable({
-      name: "Superluminal Intensifier",
-      id: 4,
-      initialCost: 5,
-      costMult: 80,
-      description: () => `Increase Superluminal Amplifier multiplier by +${format(0.15, 2, 2)}`,
-      effect: 0.15
-    }),
-    rebuyable({
-      name: "Boundless Intensifier",
-      id: 5,
-      initialCost: 1,
-      costMult: 30,
-      description: () => `Increase Boundless Amplifier multiplier by +${format(0.6, 2, 2)}`,
-      effect: 0.6
-    }),
-    rebuyable({
-      name: "Elliptic Materiality",
-      id: 6,
-      initialCost: 1e4,
-      costMult: 500,
-      description: () => `Increase the Reality Machine cap by ${formatX(1e100)}`,
-      effect: 1e100,
-      formatEffect: value => `${formatX(value)}`,
-      isDecimal: true
-    }),
-    rebuyable({
-      name: "Runic Assurance",
-      id: 7,
-      initialCost: 2e5,
-      costMult: 500,
-      description: () => `Delay Glyph Instability starting level by ${formatInt(200)}`,
-      effect: 200,
-      formatEffect: value => `+${formatInt(value)} levels`
-    }),
-    rebuyable({
-      name: "Hyperbolic Apeirogon",
-      id: 8,
-      initialCost: 1e7,
-      costMult: 800,
-      description: () => `Multiply Infinity Dimensions by ${format("1e100000")}`,
-      effect: DC.E100000,
-      formatEffect: value => `${formatX(value)}`,
-      isDecimal: true
-    }),
-    rebuyable({
-      name: "Cosmic Filament",
-      id: 9,
-      initialCost: 1e9,
-      costMult: 1000,
-      description: () => `Increase Galaxy strength`,
-      effect: 0.03,
-      formatEffect: value => `+${formatPercents(value)}`
-    }),
-    rebuyable({
-      name: "Entropic Condensing",
-      id: 10,
-      initialCost: 8e9,
-      costMult: 2000,
-      description: () => `Increase Singularity gain`,
-      effect: 1,
-      formatEffect: value => `${formatX(1 + value, 2)}`,
-    }),
-    {
-      name: "Suspicion of Interference",
-      id: 11,
-      cost: 5e7,
-      requirement: () => `${format(1e90)} total Relic Shards
-        (You have ${format(player.celestials.effarig.relicShards, 2)})`,
-      hasFailed: () => false,
-      checkRequirement: () => player.celestials.effarig.relicShards >= 1e90,
-      checkEvent: GAME_EVENT.REALITY_RESET_AFTER,
-      description: "Time Dimension power based on total antimatter",
-      effect: () => 1 + Math.log10(player.records.totalAntimatter.log10()) / 100,
-      formatEffect: value => `${formatPow(value, 0, 4)}`,
-    },
-    {
-      name: "Consequences of Illusions",
-      id: 12,
-      cost: 5e7,
-      requirement: () => `Make a level ${formatInt(9000)} Glyph with a single Glyph level factor weight at
-      ${formatInt(100)}`,
-      hasFailed: () => false,
-      checkRequirement: () => Object.values(player.celestials.effarig.glyphWeights).some(w => w === 100) &&
-        gainedGlyphLevel().actualLevel >= 9000,
-      checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
-      description: "Gain free Dimboosts based on Imaginary rebuyable count",
-      effect: () => 2e4 * ImaginaryUpgrades.totalRebuyables,
-      formatEffect: value => `${format(value, 1)}`,
-    },
-    {
-      name: "Transience of Information",
-      id: 13,
-      cost: 5e7,
-      requirement: () => `Reach ${format(Number.MAX_VALUE, 2)} projected Reality Machines within
-      The Enslaved Ones' Reality`,
-      hasFailed: () => !Enslaved.isRunning,
-      checkRequirement: () => Enslaved.isRunning && MachineHandler.uncappedRM.gte(Number.MAX_VALUE),
-      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)}`,
-    },
-    {
-      name: "Recollection of Intrusion",
-      id: 14,
-      cost: 3.5e8,
-      requirement: () => `Reach a tickspeed of ${format("1e75000000000")} / sec within Eternity Challenge 5`,
-      hasFailed: () => false,
-      checkRequirement: () => EternityChallenge(5).isRunning && Tickspeed.perSecond.exponent >= 7.5e10,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: () => `Raise all Dimension per-purchase multipliers to ${formatPow(1.5, 0, 1)}`,
-      effect: 1.5
-    },
-    {
-      name: "Fabrication of Ideals",
-      id: 15,
-      cost: 1e9,
-      requirement: () => `Reach ${format("1e1500000000000")} antimatter without
-        ever having any 1st Infinity Dimensions`,
-      hasFailed: () => player.requirementChecks.reality.maxID1.gt(0),
-      checkRequirement: () => player.requirementChecks.reality.maxID1.eq(0) && player.antimatter.exponent >= 1.5e12,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: "Convert Antimatter Dimensions to Continuum and unlock Lai'tela, Celestial of Dimensions",
-    },
-    {
-      name: "Massless Momentum",
-      id: 16,
-      cost: 3.5e9,
-      formatCost: x => format(x, 1),
-      requirement: () => `Destabilize Lai'tela's Reality in under ${formatInt(30)} seconds twice`,
-      hasFailed: () => false,
-      checkRequirement: () => Laitela.maxAllowedDimension <= 6,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: "Unlock the 2nd Dark Matter Dimension",
-    },
-    {
-      name: "Chiral Oscillation",
-      id: 17,
-      cost: 6e9,
-      requirement: () => `Automatically condense at least ${formatInt(20)} Singularities at once`,
-      hasFailed: () => false,
-      checkRequirement: () => Singularity.singularitiesGained >= 20 &&
-        Currency.darkEnergy.gte(Singularity.cap * SingularityMilestone.autoCondense.effectValue),
-      checkEvent: GAME_EVENT.SINGULARITY_RESET_BEFORE,
-      description: "Unlock the 3rd Dark Matter Dimension",
-    },
-    {
-      name: "Dimensional Symmetry",
-      id: 18,
-      cost: 1.5e10,
-      formatCost: x => format(x, 1),
-      requirement: () => `Have ${formatInt(80000)} total Galaxies`,
-      hasFailed: () => false,
-      checkRequirement: () => Replicanti.galaxies.total + player.galaxies +
-        player.dilation.totalTachyonGalaxies >= 80000,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: "Unlock the 4th Dark Matter Dimension",
-    },
-    {
-      name: "Deterministic Radiation",
-      id: 19,
-      cost: 2.8e10,
-      formatCost: x => format(x, 1),
-      requirement: () => `Reach ${formatInt(3.85e6)} Tickspeed Continuum without ever having more than
-        ${formatInt(8)} Time Studies in this Reality`,
-      hasFailed: () => player.requirementChecks.reality.maxStudies > 8,
-      checkRequirement: () => player.requirementChecks.reality.maxStudies <= 8 &&
-        Tickspeed.continuumValue >= 3.85e6,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: "Unlock Dark Matter Annihilation",
-    },
-    {
-      name: "Vacuum Acceleration",
-      id: 20,
-      cost: 3e12,
-      requirement: () => `Have a Continuum increase of at least ${formatPercents(1)}`,
-      hasFailed: () => false,
-      checkRequirement: () => Laitela.matterExtraPurchaseFactor >= 2,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: () => `Unlock Autobuyers for repeatable Imaginary Upgrades and generate Imaginary Machines
-        ${formatInt(10)} times faster`,
-      effect: 10,
-    },
-    {
-      name: "Existential Elimination",
-      id: 21,
-      cost: 1e13,
-      requirement: () => `Reach ${format("1e7400000000000")} antimatter with Continuum disabled`,
-      hasFailed: () => !player.requirementChecks.reality.noContinuum,
-      checkRequirement: () => player.requirementChecks.reality.noContinuum &&
-        Currency.antimatter.value.log10() >= 7.4e12,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: "Annihilation multiplier gain is improved based on Imaginary Machines",
-      effect: () => Math.clampMin(Math.pow(Math.log10(Currency.imaginaryMachines.value) - 10, 3), 1),
-      formatEffect: value => `${formatX(value, 2, 1)}`,
-    },
-    {
-      name: "Total Termination",
-      id: 22,
-      cost: 1.5e14,
-      formatCost: x => format(x, 1),
-      requirement: () => `Reach ${format("1e150000000000")} antimatter in Effarig's Reality with
-        at least ${formatInt(4)} Cursed Glyphs equipped`,
-      // Note: 4 cursed glyphs is -12 glyph count, but equipping a positive glyph in the last slot is allowed
-      hasFailed: () => !Effarig.isRunning || player.requirementChecks.reality.maxGlyphs > -10,
-      checkRequirement: () => Effarig.isRunning && player.requirementChecks.reality.maxGlyphs < -10 &&
-        Currency.antimatter.value.exponent >= 1.5e11,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: () => `Glyph Sacrifice totals for basic Glyphs are increased to ${format(1e100)}`,
-      effect: 1e100,
-    },
-    {
-      name: "Planar Purification",
-      id: 23,
-      cost: 6e14,
-      requirement: () => `Reach Glyph level ${formatInt(20000)} in Ra's Reality with
-        at most ${formatInt(0)} Glyphs equipped`,
-      hasFailed: () => !Ra.isRunning || player.requirementChecks.reality.maxGlyphs > 0,
-      checkRequirement: () => Ra.isRunning && player.requirementChecks.reality.maxGlyphs <= 0 &&
-        gainedGlyphLevel().actualLevel >= 20000,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: "Increase free Dimboost count based on Tesseract count",
-      effect: () => Math.floor(0.25 * Math.pow(Tesseracts.effectiveCount, 2)),
-      formatEffect: value => `${formatX(value)}`,
-    },
-    {
-      name: "Absolute Annulment",
-      id: 24,
-      cost: 6e14,
-      requirement: () => `Have ${formatInt(13000)} Antimatter Galaxies in Ra's Reality
-        with a fully inverted Black Hole`,
-      hasFailed: () => !Ra.isRunning || player.requirementChecks.reality.slowestBH > 1e-300,
-      checkRequirement: () => Ra.isRunning && player.requirementChecks.reality.slowestBH <= 1e-300 &&
-        player.galaxies >= 13000,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: "Increase free Dimboost strength based on Singularity count",
-      effect: () => Decimal.pow(player.celestials.laitela.singularities, 300),
-      formatEffect: value => `${formatX(value, 2, 1)}`,
-    },
-    {
-      name: "Omnipresent Obliteration",
-      id: 25,
-      cost: 1.6e15,
-      formatCost: x => format(x, 1),
-      requirement: () => `Reach Reality in Lai'tela's Reality with all Dimensions disabled and
-        at least ${formatInt(4)} empty Glyph slots`,
-      hasFailed: () => !Laitela.isRunning || Laitela.maxAllowedDimension !== 0 || Glyphs.activeList.length > 1,
-      checkRequirement: () => Laitela.isRunning && Laitela.maxAllowedDimension === 0 &&
-        Glyphs.activeList.length <= 1,
-      checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
-      description: "Unlock Pelle, Celestial of Antimatter",
-    },
-  ];
-}());
+const rebuyable = props => {
+  props.cost = () => props.initialCost * Math.pow(props.costMult, player.reality.imaginaryRebuyables[props.id]);
+  const { effect } = props;
+  if (props.isDecimal) props.effect = () => Decimal.pow(effect, player.reality.imaginaryRebuyables[props.id]);
+  else props.effect = () => effect * player.reality.imaginaryRebuyables[props.id];
+  if (!props.formatEffect) props.formatEffect = value => `+${format(value, 2, 2)}`;
+  props.formatCost = value => format(value, 2, 0);
+  return props;
+};
+
+GameDatabase.reality.imaginaryUpgrades = [
+  rebuyable({
+    name: "Temporal Intensifier",
+    id: 1,
+    initialCost: 3,
+    costMult: 60,
+    description: () => `Increase Temporal Amplifier multiplier by +${format(0.15, 2, 2)}`,
+    effect: 0.15
+  }),
+  rebuyable({
+    name: "Replicative Intensifier",
+    id: 2,
+    initialCost: 4,
+    costMult: 60,
+    description: () => `Increase Replicative Amplifier multiplier by +${format(0.15, 2, 2)}`,
+    effect: 0.15
+  }),
+  rebuyable({
+    name: "Eternal Intensifier",
+    id: 3,
+    initialCost: 1,
+    costMult: 40,
+    description: () => `Increase Eternal Amplifier multiplier by +${format(0.4, 2, 2)}`,
+    effect: 0.4
+  }),
+  rebuyable({
+    name: "Superluminal Intensifier",
+    id: 4,
+    initialCost: 5,
+    costMult: 80,
+    description: () => `Increase Superluminal Amplifier multiplier by +${format(0.15, 2, 2)}`,
+    effect: 0.15
+  }),
+  rebuyable({
+    name: "Boundless Intensifier",
+    id: 5,
+    initialCost: 1,
+    costMult: 30,
+    description: () => `Increase Boundless Amplifier multiplier by +${format(0.6, 2, 2)}`,
+    effect: 0.6
+  }),
+  rebuyable({
+    name: "Elliptic Materiality",
+    id: 6,
+    initialCost: 1e4,
+    costMult: 500,
+    description: () => `Increase the Reality Machine cap by ${formatX(1e100)}`,
+    effect: 1e100,
+    formatEffect: value => `${formatX(value)}`,
+    isDecimal: true
+  }),
+  rebuyable({
+    name: "Runic Assurance",
+    id: 7,
+    initialCost: 2e5,
+    costMult: 500,
+    description: () => `Delay Glyph Instability starting level by ${formatInt(200)}`,
+    effect: 200,
+    formatEffect: value => `+${formatInt(value)} levels`
+  }),
+  rebuyable({
+    name: "Hyperbolic Apeirogon",
+    id: 8,
+    initialCost: 1e7,
+    costMult: 800,
+    description: () => `Multiply Infinity Dimensions by ${format("1e100000")}`,
+    effect: DC.E100000,
+    formatEffect: value => `${formatX(value)}`,
+    isDecimal: true
+  }),
+  rebuyable({
+    name: "Cosmic Filament",
+    id: 9,
+    initialCost: 1e9,
+    costMult: 1000,
+    description: () => `Increase Galaxy strength`,
+    effect: 0.03,
+    formatEffect: value => `+${formatPercents(value)}`
+  }),
+  rebuyable({
+    name: "Entropic Condensing",
+    id: 10,
+    initialCost: 8e9,
+    costMult: 2000,
+    description: () => `Increase Singularity gain`,
+    effect: 1,
+    formatEffect: value => `${formatX(1 + value, 2)}`,
+  }),
+  {
+    name: "Suspicion of Interference",
+    id: 11,
+    cost: 5e7,
+    requirement: () => `${format(1e90)} total Relic Shards
+      (You have ${format(player.celestials.effarig.relicShards, 2)})`,
+    hasFailed: () => false,
+    checkRequirement: () => player.celestials.effarig.relicShards >= 1e90,
+    checkEvent: GAME_EVENT.REALITY_RESET_AFTER,
+    description: "Time Dimension power based on total antimatter",
+    effect: () => 1 + Math.log10(player.records.totalAntimatter.log10()) / 100,
+    formatEffect: value => `${formatPow(value, 0, 4)}`,
+  },
+  {
+    name: "Consequences of Illusions",
+    id: 12,
+    cost: 5e7,
+    requirement: () => `Make a level ${formatInt(9000)} Glyph with a single Glyph level factor weight at
+    ${formatInt(100)}`,
+    hasFailed: () => false,
+    checkRequirement: () => Object.values(player.celestials.effarig.glyphWeights).some(w => w === 100) &&
+      gainedGlyphLevel().actualLevel >= 9000,
+    checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
+    description: "Gain free Dimboosts based on Imaginary rebuyable count",
+    effect: () => 2e4 * ImaginaryUpgrades.totalRebuyables,
+    formatEffect: value => `${format(value, 1)}`,
+  },
+  {
+    name: "Transience of Information",
+    id: 13,
+    cost: 5e7,
+    requirement: () => `Reach ${format(Number.MAX_VALUE, 2)} projected Reality Machines within
+    The Enslaved Ones' Reality`,
+    hasFailed: () => !Enslaved.isRunning,
+    checkRequirement: () => Enslaved.isRunning && MachineHandler.uncappedRM.gte(Number.MAX_VALUE),
+    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)}`,
+  },
+  {
+    name: "Recollection of Intrusion",
+    id: 14,
+    cost: 3.5e8,
+    requirement: () => `Reach a tickspeed of ${format("1e75000000000")} / sec within Eternity Challenge 5`,
+    hasFailed: () => false,
+    checkRequirement: () => EternityChallenge(5).isRunning && Tickspeed.perSecond.exponent >= 7.5e10,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: () => `Raise all Dimension per-purchase multipliers to ${formatPow(1.5, 0, 1)}`,
+    effect: 1.5
+  },
+  {
+    name: "Fabrication of Ideals",
+    id: 15,
+    cost: 1e9,
+    requirement: () => `Reach ${format("1e1500000000000")} antimatter without
+      ever having any 1st Infinity Dimensions`,
+    hasFailed: () => player.requirementChecks.reality.maxID1.gt(0),
+    checkRequirement: () => player.requirementChecks.reality.maxID1.eq(0) && player.antimatter.exponent >= 1.5e12,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: "Convert Antimatter Dimensions to Continuum and unlock Lai'tela, Celestial of Dimensions",
+  },
+  {
+    name: "Massless Momentum",
+    id: 16,
+    cost: 3.5e9,
+    formatCost: x => format(x, 1),
+    requirement: () => `Destabilize Lai'tela's Reality in under ${formatInt(30)} seconds twice`,
+    hasFailed: () => false,
+    checkRequirement: () => Laitela.maxAllowedDimension <= 6,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: "Unlock the 2nd Dark Matter Dimension",
+  },
+  {
+    name: "Chiral Oscillation",
+    id: 17,
+    cost: 6e9,
+    requirement: () => `Automatically condense at least ${formatInt(20)} Singularities at once`,
+    hasFailed: () => false,
+    checkRequirement: () => Singularity.singularitiesGained >= 20 &&
+      Currency.darkEnergy.gte(Singularity.cap * SingularityMilestone.autoCondense.effectValue),
+    checkEvent: GAME_EVENT.SINGULARITY_RESET_BEFORE,
+    description: "Unlock the 3rd Dark Matter Dimension",
+  },
+  {
+    name: "Dimensional Symmetry",
+    id: 18,
+    cost: 1.5e10,
+    formatCost: x => format(x, 1),
+    requirement: () => `Have ${formatInt(80000)} total Galaxies`,
+    hasFailed: () => false,
+    checkRequirement: () => Replicanti.galaxies.total + player.galaxies +
+      player.dilation.totalTachyonGalaxies >= 80000,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: "Unlock the 4th Dark Matter Dimension",
+  },
+  {
+    name: "Deterministic Radiation",
+    id: 19,
+    cost: 2.8e10,
+    formatCost: x => format(x, 1),
+    requirement: () => `Reach ${formatInt(3.85e6)} Tickspeed Continuum without ever having more than
+      ${formatInt(8)} Time Studies in this Reality`,
+    hasFailed: () => player.requirementChecks.reality.maxStudies > 8,
+    checkRequirement: () => player.requirementChecks.reality.maxStudies <= 8 &&
+      Tickspeed.continuumValue >= 3.85e6,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: "Unlock Dark Matter Annihilation",
+  },
+  {
+    name: "Vacuum Acceleration",
+    id: 20,
+    cost: 3e12,
+    requirement: () => `Have a Continuum increase of at least ${formatPercents(1)}`,
+    hasFailed: () => false,
+    checkRequirement: () => Laitela.matterExtraPurchaseFactor >= 2,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: () => `Unlock Autobuyers for repeatable Imaginary Upgrades and generate Imaginary Machines
+      ${formatInt(10)} times faster`,
+    effect: 10,
+  },
+  {
+    name: "Existential Elimination",
+    id: 21,
+    cost: 1e13,
+    requirement: () => `Reach ${format("1e7400000000000")} antimatter with Continuum disabled`,
+    hasFailed: () => !player.requirementChecks.reality.noContinuum,
+    checkRequirement: () => player.requirementChecks.reality.noContinuum &&
+      Currency.antimatter.value.log10() >= 7.4e12,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: "Annihilation multiplier gain is improved based on Imaginary Machines",
+    effect: () => Math.clampMin(Math.pow(Math.log10(Currency.imaginaryMachines.value) - 10, 3), 1),
+    formatEffect: value => `${formatX(value, 2, 1)}`,
+  },
+  {
+    name: "Total Termination",
+    id: 22,
+    cost: 1.5e14,
+    formatCost: x => format(x, 1),
+    requirement: () => `Reach ${format("1e150000000000")} antimatter in Effarig's Reality with
+      at least ${formatInt(4)} Cursed Glyphs equipped`,
+    // Note: 4 cursed glyphs is -12 glyph count, but equipping a positive glyph in the last slot is allowed
+    hasFailed: () => !Effarig.isRunning || player.requirementChecks.reality.maxGlyphs > -10,
+    checkRequirement: () => Effarig.isRunning && player.requirementChecks.reality.maxGlyphs < -10 &&
+      Currency.antimatter.value.exponent >= 1.5e11,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: () => `Glyph Sacrifice totals for basic Glyphs are increased to ${format(1e100)}`,
+    effect: 1e100,
+  },
+  {
+    name: "Planar Purification",
+    id: 23,
+    cost: 6e14,
+    requirement: () => `Reach Glyph level ${formatInt(20000)} in Ra's Reality with
+      at most ${formatInt(0)} Glyphs equipped`,
+    hasFailed: () => !Ra.isRunning || player.requirementChecks.reality.maxGlyphs > 0,
+    checkRequirement: () => Ra.isRunning && player.requirementChecks.reality.maxGlyphs <= 0 &&
+      gainedGlyphLevel().actualLevel >= 20000,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: "Increase free Dimboost count based on Tesseract count",
+    effect: () => Math.floor(0.25 * Math.pow(Tesseracts.effectiveCount, 2)),
+    formatEffect: value => `${formatX(value)}`,
+  },
+  {
+    name: "Absolute Annulment",
+    id: 24,
+    cost: 6e14,
+    requirement: () => `Have ${formatInt(13000)} Antimatter Galaxies in Ra's Reality
+      with a fully inverted Black Hole`,
+    hasFailed: () => !Ra.isRunning || player.requirementChecks.reality.slowestBH > 1e-300,
+    checkRequirement: () => Ra.isRunning && player.requirementChecks.reality.slowestBH <= 1e-300 &&
+      player.galaxies >= 13000,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: "Increase free Dimboost strength based on Singularity count",
+    effect: () => Decimal.pow(player.celestials.laitela.singularities, 300),
+    formatEffect: value => `${formatX(value, 2, 1)}`,
+  },
+  {
+    name: "Omnipresent Obliteration",
+    id: 25,
+    cost: 1.6e15,
+    formatCost: x => format(x, 1),
+    requirement: () => `Reach Reality in Lai'tela's Reality with all Dimensions disabled and
+      at least ${formatInt(4)} empty Glyph slots`,
+    hasFailed: () => !Laitela.isRunning || Laitela.maxAllowedDimension !== 0 || Glyphs.activeList.length > 1,
+    checkRequirement: () => Laitela.isRunning && Laitela.maxAllowedDimension === 0 &&
+      Glyphs.activeList.length <= 1,
+    checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
+    description: "Unlock Pelle, Celestial of Antimatter",
+  },
+];
diff --git a/javascripts/core/secret-formula/reality/reality-upgrades.js b/javascripts/core/secret-formula/reality/reality-upgrades.js
index 7f35f3233..e40ee731b 100644
--- a/javascripts/core/secret-formula/reality/reality-upgrades.js
+++ b/javascripts/core/secret-formula/reality/reality-upgrades.js
@@ -1,345 +1,345 @@
 import { DC } from "../../constants";
 import { GameDatabase } from "../game-database";
 
-GameDatabase.reality.upgrades = (function() {
-  const rebuyable = props => {
-    props.cost = () => getHybridCostScaling(
-      player.reality.rebuyables[props.id],
-      1e30,
-      props.initialCost,
-      props.costMult,
-      props.costMult / 10,
-      DC.E309,
-      1e3,
-      props.initialCost * props.costMult
-    );
-    const { effect } = props;
-    props.effect = () => Math.pow(
-      effect + ImaginaryUpgrade(props.id).effectOrDefault(0),
-      player.reality.rebuyables[props.id] * getAdjustedGlyphEffect("realityrow1pow"));
-    props.description = () => props.textTemplate.replace("{value}",
-      ImaginaryUpgrade(props.id).effectValue === 0
-        ? formatInt(effect)
-        : format(effect + ImaginaryUpgrade(props.id).effectValue, 2, 2));
-    props.formatEffect = value => formatX(value, 2, 0);
-    props.formatCost = value => format(value, 2, 0);
-    return props;
-  };
-  return [
-    rebuyable({
-      name: "Temporal Amplifier",
-      id: 1,
-      initialCost: 1,
-      costMult: 30,
-      textTemplate: "You gain Dilated Time {value} times faster",
-      effect: 3
-    }),
-    rebuyable({
-      name: "Replicative Amplifier",
-      id: 2,
-      initialCost: 1,
-      costMult: 30,
-      textTemplate: "You gain Replicanti {value} times faster",
-      effect: 3
-    }),
-    rebuyable({
-      name: "Eternal Amplifier",
-      id: 3,
-      initialCost: 2,
-      costMult: 30,
-      textTemplate: "You gain {value} times more Eternities",
-      effect: 3
-    }),
-    rebuyable({
-      name: "Superluminal Amplifier",
-      id: 4,
-      initialCost: 2,
-      costMult: 30,
-      textTemplate: "You gain {value} times more Tachyon Particles",
-      effect: 3
-    }),
-    rebuyable({
-      name: "Boundless Amplifier",
-      id: 5,
-      initialCost: 3,
-      costMult: 50,
-      textTemplate: "You gain {value} times more Infinities",
-      effect: 5
-    }),
-    {
-      name: "Cosmically Duplicate",
-      id: 6,
-      cost: 15,
-      requirement: "Complete your first Eternity without using Replicanti Galaxies",
-      // Note that while noRG resets on eternity, the reality-level check will be false after the first eternity.
-      // The noRG variable is eternity-level as it's also used for an achievement check
-      hasFailed: () => !(player.requirementChecks.eternity.noRG && player.requirementChecks.reality.noEternities),
-      checkRequirement: () => player.requirementChecks.eternity.noRG && player.requirementChecks.reality.noEternities,
-      checkEvent: GAME_EVENT.ETERNITY_RESET_BEFORE,
-      description: "Replicanti speed is multiplied based on Replicanti Galaxies",
-      effect: () => 1 + Replicanti.galaxies.total / 50,
-      formatEffect: value => formatX(value, 2, 2)
+const rebuyable = props => {
+  props.cost = () => getHybridCostScaling(
+    player.reality.rebuyables[props.id],
+    1e30,
+    props.initialCost,
+    props.costMult,
+    props.costMult / 10,
+    DC.E309,
+    1e3,
+    props.initialCost * props.costMult
+  );
+  const { effect } = props;
+  props.effect = () => Math.pow(
+    effect + ImaginaryUpgrade(props.id).effectOrDefault(0),
+    player.reality.rebuyables[props.id] * getAdjustedGlyphEffect("realityrow1pow"));
+  props.description = () => props.textTemplate.replace("{value}",
+    ImaginaryUpgrade(props.id).effectValue === 0
+      ? formatInt(effect)
+      : format(effect + ImaginaryUpgrade(props.id).effectValue, 2, 2));
+  props.formatEffect = value => formatX(value, 2, 0);
+  props.formatCost = value => format(value, 2, 0);
+  return props;
+};
+
+
+GameDatabase.reality.upgrades = [
+  rebuyable({
+    name: "Temporal Amplifier",
+    id: 1,
+    initialCost: 1,
+    costMult: 30,
+    textTemplate: "You gain Dilated Time {value} times faster",
+    effect: 3
+  }),
+  rebuyable({
+    name: "Replicative Amplifier",
+    id: 2,
+    initialCost: 1,
+    costMult: 30,
+    textTemplate: "You gain Replicanti {value} times faster",
+    effect: 3
+  }),
+  rebuyable({
+    name: "Eternal Amplifier",
+    id: 3,
+    initialCost: 2,
+    costMult: 30,
+    textTemplate: "You gain {value} times more Eternities",
+    effect: 3
+  }),
+  rebuyable({
+    name: "Superluminal Amplifier",
+    id: 4,
+    initialCost: 2,
+    costMult: 30,
+    textTemplate: "You gain {value} times more Tachyon Particles",
+    effect: 3
+  }),
+  rebuyable({
+    name: "Boundless Amplifier",
+    id: 5,
+    initialCost: 3,
+    costMult: 50,
+    textTemplate: "You gain {value} times more Infinities",
+    effect: 5
+  }),
+  {
+    name: "Cosmically Duplicate",
+    id: 6,
+    cost: 15,
+    requirement: "Complete your first Eternity without using Replicanti Galaxies",
+    // Note that while noRG resets on eternity, the reality-level check will be false after the first eternity.
+    // The noRG variable is eternity-level as it's also used for an achievement check
+    hasFailed: () => !(player.requirementChecks.eternity.noRG && player.requirementChecks.reality.noEternities),
+    checkRequirement: () => player.requirementChecks.eternity.noRG && player.requirementChecks.reality.noEternities,
+    checkEvent: GAME_EVENT.ETERNITY_RESET_BEFORE,
+    description: "Replicanti speed is multiplied based on Replicanti Galaxies",
+    effect: () => 1 + Replicanti.galaxies.total / 50,
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  {
+    name: "Innumerably Construct",
+    id: 7,
+    cost: 15,
+    requirement: "Complete your first Infinity with at most 1 Antimatter Galaxy",
+    hasFailed: () => !(player.galaxies <= 1 && player.requirementChecks.reality.noInfinities),
+    checkRequirement: () => player.galaxies <= 1 && player.requirementChecks.reality.noInfinities,
+    checkEvent: GAME_EVENT.BIG_CRUNCH_BEFORE,
+    description: "Infinity gain is boosted from Antimatter Galaxy count",
+    effect: () => 1 + player.galaxies / 30,
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  {
+    name: "Paradoxically Attain",
+    id: 8,
+    cost: 15,
+    requirement: "Get to Eternity without any automatic Achievements",
+    hasFailed: () => player.reality.gainedAutoAchievements,
+    checkRequirement: () => !player.reality.gainedAutoAchievements,
+    checkEvent: GAME_EVENT.ETERNITY_RESET_BEFORE,
+    description: "Tachyon Particle gain is boosted based on Achievement multiplier",
+    effect: () => Math.sqrt(Achievements.power),
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  {
+    name: "Linguistically Expand",
+    id: 9,
+    cost: 15,
+    requirement: () => `Eternity for ${format("1e4000")} Eternity Points using
+      only a single level ${formatInt(3)}+ Glyph.`,
+    hasFailed: () => {
+      const invalidEquippedGlyphs = Glyphs.activeList.length > 1 ||
+        (Glyphs.activeList.length === 1 && Glyphs.activeList[0].level < 3);
+      const hasValidGlyphInInventory = Glyphs.inventory.countWhere(g => g && g.level >= 3) > 0;
+      return invalidEquippedGlyphs || (Glyphs.activeList.length === 0 && !hasValidGlyphInInventory);
     },
-    {
-      name: "Innumerably Construct",
-      id: 7,
-      cost: 15,
-      requirement: "Complete your first Infinity with at most 1 Antimatter Galaxy",
-      hasFailed: () => !(player.galaxies <= 1 && player.requirementChecks.reality.noInfinities),
-      checkRequirement: () => player.galaxies <= 1 && player.requirementChecks.reality.noInfinities,
-      checkEvent: GAME_EVENT.BIG_CRUNCH_BEFORE,
-      description: "Infinity gain is boosted from Antimatter Galaxy count",
-      effect: () => 1 + player.galaxies / 30,
-      formatEffect: value => formatX(value, 2, 2)
+    checkRequirement: () => Currency.eternityPoints.exponent >= 4000 &&
+      Glyphs.activeList.length === 1 && Glyphs.activeList[0].level >= 3,
+    checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
+    description: "Gain another Glyph slot",
+    effect: () => 1
+  },
+  {
+    name: "Existentially Prolong",
+    id: 10,
+    cost: 15,
+    requirement: () => `Complete your first Eternity with at least ${formatPostBreak(DC.E450)} Infinity Points`,
+    hasFailed: () => !player.requirementChecks.reality.noEternities,
+    checkRequirement: () => Currency.infinityPoints.exponent >= 450 &&
+      player.requirementChecks.reality.noEternities,
+    checkEvent: GAME_EVENT.ETERNITY_RESET_BEFORE,
+    description: () => `Start every Reality with ${formatInt(100)} Eternities (also applies to current Reality)`,
+    automatorPoints: 15,
+    shortDescription: () => `Start with ${formatInt(100)} Eternities`,
+    effect: () => 100
+  },
+  {
+    name: "The Boundless Flow",
+    id: 11,
+    cost: 50,
+    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],
+    description: "Every second, gain 10% of the Infinities you would normally gain by Infinitying",
+    automatorPoints: 5,
+    shortDescription: () => `Continuous Infinity generation`,
+    effect: () => gainedInfinities().times(0.1),
+    formatEffect: value => `${format(value)} per second`
+  },
+  {
+    name: "The Knowing Existence",
+    id: 12,
+    cost: 50,
+    requirement: () => `Eternity for ${format(DC.E70)} Eternity Points without Eternity Challenge 1`,
+    hasFailed: () => EternityChallenge(1).completions !== 0,
+    checkRequirement: () => Currency.eternityPoints.exponent >= 70 && EternityChallenge(1).completions === 0,
+    checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
+    description: "Eternity Point multiplier based on Reality and Time Theorem count",
+    effect: () => Currency.timeTheorems.value
+      .minus(DC.E3).clampMin(2)
+      .pow(Math.log2(Math.min(Currency.realities.value, 1e4))).clampMin(1),
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  {
+    name: "The Telemechanical Process",
+    id: 13,
+    cost: 50,
+    requirement: () => `Eternity for ${format(DC.E4000)} Eternity Points without Time Dimensions 5-8`,
+    hasFailed: () => !Array.range(5, 4).every(i => TimeDimension(i).amount.equals(0)),
+    checkRequirement: () => Currency.eternityPoints.exponent >= 4000 &&
+      Array.range(5, 4).every(i => TimeDimension(i).amount.equals(0)),
+    checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
+    description: () => `Unlock Time Dimension, ${formatX(5)} Eternity Point multiplier,
+      and improved Eternity autobuyers`,
+    automatorPoints: 10,
+    shortDescription: () => `TD and ${formatX(5)} EP Autobuyers, improved Eternity Autobuyer`,
+  },
+  {
+    name: "The Eternal Flow",
+    id: 14,
+    cost: 50,
+    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],
+    description: "Gain Eternities per second equal to your Reality count",
+    automatorPoints: 5,
+    shortDescription: () => `Continuous Eternity generation`,
+    effect: () => Currency.realities.value * Ra.unlocks.continuousTTBoost.effects.eternity.effectOrDefault(1),
+    formatEffect: value => `${format(value)} per second`
+  },
+  {
+    name: "The Paradoxical Forever",
+    id: 15,
+    cost: 50,
+    requirement: () => `Have ${format(DC.E10)} Eternity Points without purchasing
+    the ${formatX(5)} Eternity Point upgrade`,
+    hasFailed: () => player.epmultUpgrades !== 0,
+    checkRequirement: () => Currency.eternityPoints.exponent >= 10 && player.epmultUpgrades === 0,
+    checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
+    description: () => `Boost Tachyon Particle gain based on ${formatX(5)} Eternity Point multiplier`,
+    effect: () => Math.max(Math.sqrt(Decimal.log10(EternityUpgrade.epMult.effectValue)) / 3, 1),
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  {
+    name: "Disparity of Rarity",
+    id: 16,
+    cost: 1500,
+    requirement: () => `Reality with ${formatInt(4)} Glyphs equipped of uncommon or better rarity
+      (${formatInt(Glyphs.activeList.countWhere(g => g && g.strength >= 1.5))} equipped)`,
+    hasFailed: () => {
+      const availableGlyphs = Glyphs.inventory.countWhere(g => g && g.strength >= 1.5);
+      const equipped = Glyphs.activeList.countWhere(g => g.strength >= 1.5);
+      const availableSlots = Glyphs.activeSlotCount - Glyphs.activeList.length;
+      return equipped + Math.min(availableGlyphs, availableSlots) < 4;
     },
-    {
-      name: "Paradoxically Attain",
-      id: 8,
-      cost: 15,
-      requirement: "Get to Eternity without any automatic Achievements",
-      hasFailed: () => player.reality.gainedAutoAchievements,
-      checkRequirement: () => !player.reality.gainedAutoAchievements,
-      checkEvent: GAME_EVENT.ETERNITY_RESET_BEFORE,
-      description: "Tachyon Particle gain is boosted based on Achievement multiplier",
-      effect: () => Math.sqrt(Achievements.power),
-      formatEffect: value => formatX(value, 2, 2)
+    checkRequirement: () => Glyphs.activeList.countWhere(g => g.strength >= 1.5) === 4,
+    checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
+    description: "Improve the Glyph rarity formula",
+    effect: 1.3,
+    formatCost: value => format(value, 1, 0)
+  },
+  {
+    name: "Duplicity of Potency",
+    id: 17,
+    cost: 1500,
+    requirement: () => `Reality with ${formatInt(4)} Glyphs equipped, each having at least ${formatInt(2)} effects
+      (${formatInt(Glyphs.activeList.countWhere(g => g && countValuesFromBitmask(g.effects) >= 2))} equipped)`,
+    hasFailed: () => {
+      const availableGlyphs = Glyphs.inventory.countWhere(g => g && countValuesFromBitmask(g.effects) >= 2);
+      const equipped = Glyphs.activeList.countWhere(g => countValuesFromBitmask(g.effects) >= 2);
+      const availableSlots = Glyphs.activeSlotCount - Glyphs.activeList.length;
+      return equipped + Math.min(availableGlyphs, availableSlots) < 4;
     },
-    {
-      name: "Linguistically Expand",
-      id: 9,
-      cost: 15,
-      requirement: () => `Eternity for ${format("1e4000")} Eternity Points using
-        only a single level ${formatInt(3)}+ Glyph.`,
-      hasFailed: () => {
-        const invalidEquippedGlyphs = Glyphs.activeList.length > 1 ||
-          (Glyphs.activeList.length === 1 && Glyphs.activeList[0].level < 3);
-        const hasValidGlyphInInventory = Glyphs.inventory.countWhere(g => g && g.level >= 3) > 0;
-        return invalidEquippedGlyphs || (Glyphs.activeList.length === 0 && !hasValidGlyphInInventory);
-      },
-      checkRequirement: () => Currency.eternityPoints.exponent >= 4000 &&
-        Glyphs.activeList.length === 1 && Glyphs.activeList[0].level >= 3,
-      checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
-      description: "Gain another Glyph slot",
-      effect: () => 1
+    checkRequirement: () => Glyphs.activeList.countWhere(g => countValuesFromBitmask(g.effects) >= 2) === 4,
+    checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
+    description: () => `${formatPercents(0.5)} chance to get an additional effect on Glyphs`,
+    effect: 0.5,
+    formatCost: value => format(value, 1, 0)
+  },
+  {
+    name: "Measure of Forever",
+    id: 18,
+    cost: 1500,
+    requirement: () => `Reality with ${formatInt(4)} Glyphs equipped, each at level ${formatInt(10)} or higher
+      (${formatInt(Glyphs.activeList.countWhere(g => g && g.level >= 10))} equipped)`,
+    hasFailed: () => {
+      const availableGlyphs = Glyphs.inventory.countWhere(g => g && g.level >= 10);
+      const equipped = Glyphs.activeList.countWhere(g => g.level >= 10);
+      const availableSlots = Glyphs.activeSlotCount - Glyphs.activeList.length;
+      return equipped + Math.min(availableGlyphs, availableSlots) < 4;
     },
-    {
-      name: "Existentially Prolong",
-      id: 10,
-      cost: 15,
-      requirement: () => `Complete your first Eternity with at least ${formatPostBreak(DC.E450)} Infinity Points`,
-      hasFailed: () => !player.requirementChecks.reality.noEternities,
-      checkRequirement: () => Currency.infinityPoints.exponent >= 450 &&
-        player.requirementChecks.reality.noEternities,
-      checkEvent: GAME_EVENT.ETERNITY_RESET_BEFORE,
-      description: () => `Start every Reality with ${formatInt(100)} Eternities (also applies to current Reality)`,
-      automatorPoints: 15,
-      shortDescription: () => `Start with ${formatInt(100)} Eternities`,
-      effect: () => 100
-    },
-    {
-      name: "The Boundless Flow",
-      id: 11,
-      cost: 50,
-      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],
-      description: "Every second, gain 10% of the Infinities you would normally gain by Infinitying",
-      automatorPoints: 5,
-      shortDescription: () => `Continuous Infinity generation`,
-      effect: () => gainedInfinities().times(0.1),
-      formatEffect: value => `${format(value)} per second`
-    },
-    {
-      name: "The Knowing Existence",
-      id: 12,
-      cost: 50,
-      requirement: () => `Eternity for ${format(DC.E70)} Eternity Points without Eternity Challenge 1`,
-      hasFailed: () => EternityChallenge(1).completions !== 0,
-      checkRequirement: () => Currency.eternityPoints.exponent >= 70 && EternityChallenge(1).completions === 0,
-      checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
-      description: "Eternity Point multiplier based on Reality and Time Theorem count",
-      effect: () => Currency.timeTheorems.value
-        .minus(DC.E3).clampMin(2)
-        .pow(Math.log2(Math.min(Currency.realities.value, 1e4))).clampMin(1),
-      formatEffect: value => formatX(value, 2, 2)
-    },
-    {
-      name: "The Telemechanical Process",
-      id: 13,
-      cost: 50,
-      requirement: () => `Eternity for ${format(DC.E4000)} Eternity Points without Time Dimensions 5-8`,
-      hasFailed: () => !Array.range(5, 4).every(i => TimeDimension(i).amount.equals(0)),
-      checkRequirement: () => Currency.eternityPoints.exponent >= 4000 &&
-        Array.range(5, 4).every(i => TimeDimension(i).amount.equals(0)),
-      checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
-      description: () => `Unlock Time Dimension, ${formatX(5)} Eternity Point multiplier,
-        and improved Eternity autobuyers`,
-      automatorPoints: 10,
-      shortDescription: () => `TD and ${formatX(5)} EP Autobuyers, improved Eternity Autobuyer`,
-    },
-    {
-      name: "The Eternal Flow",
-      id: 14,
-      cost: 50,
-      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],
-      description: "Gain Eternities per second equal to your Reality count",
-      automatorPoints: 5,
-      shortDescription: () => `Continuous Eternity generation`,
-      effect: () => Currency.realities.value * Ra.unlocks.continuousTTBoost.effects.eternity.effectOrDefault(1),
-      formatEffect: value => `${format(value)} per second`
-    },
-    {
-      name: "The Paradoxical Forever",
-      id: 15,
-      cost: 50,
-      requirement: () => `Have ${format(DC.E10)} Eternity Points without purchasing
-      the ${formatX(5)} Eternity Point upgrade`,
-      hasFailed: () => player.epmultUpgrades !== 0,
-      checkRequirement: () => Currency.eternityPoints.exponent >= 10 && player.epmultUpgrades === 0,
-      checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
-      description: () => `Boost Tachyon Particle gain based on ${formatX(5)} Eternity Point multiplier`,
-      effect: () => Math.max(Math.sqrt(Decimal.log10(EternityUpgrade.epMult.effectValue)) / 3, 1),
-      formatEffect: value => formatX(value, 2, 2)
-    },
-    {
-      name: "Disparity of Rarity",
-      id: 16,
-      cost: 1500,
-      requirement: () => `Reality with ${formatInt(4)} Glyphs equipped of uncommon or better rarity
-        (${formatInt(Glyphs.activeList.countWhere(g => g && g.strength >= 1.5))} equipped)`,
-      hasFailed: () => {
-        const availableGlyphs = Glyphs.inventory.countWhere(g => g && g.strength >= 1.5);
-        const equipped = Glyphs.activeList.countWhere(g => g.strength >= 1.5);
-        const availableSlots = Glyphs.activeSlotCount - Glyphs.activeList.length;
-        return equipped + Math.min(availableGlyphs, availableSlots) < 4;
-      },
-      checkRequirement: () => Glyphs.activeList.countWhere(g => g.strength >= 1.5) === 4,
-      checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
-      description: "Improve the Glyph rarity formula",
-      effect: 1.3,
-      formatCost: value => format(value, 1, 0)
-    },
-    {
-      name: "Duplicity of Potency",
-      id: 17,
-      cost: 1500,
-      requirement: () => `Reality with ${formatInt(4)} Glyphs equipped, each having at least ${formatInt(2)} effects
-        (${formatInt(Glyphs.activeList.countWhere(g => g && countValuesFromBitmask(g.effects) >= 2))} equipped)`,
-      hasFailed: () => {
-        const availableGlyphs = Glyphs.inventory.countWhere(g => g && countValuesFromBitmask(g.effects) >= 2);
-        const equipped = Glyphs.activeList.countWhere(g => countValuesFromBitmask(g.effects) >= 2);
-        const availableSlots = Glyphs.activeSlotCount - Glyphs.activeList.length;
-        return equipped + Math.min(availableGlyphs, availableSlots) < 4;
-      },
-      checkRequirement: () => Glyphs.activeList.countWhere(g => countValuesFromBitmask(g.effects) >= 2) === 4,
-      checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
-      description: () => `${formatPercents(0.5)} chance to get an additional effect on Glyphs`,
-      effect: 0.5,
-      formatCost: value => format(value, 1, 0)
-    },
-    {
-      name: "Measure of Forever",
-      id: 18,
-      cost: 1500,
-      requirement: () => `Reality with ${formatInt(4)} Glyphs equipped, each at level ${formatInt(10)} or higher
-        (${formatInt(Glyphs.activeList.countWhere(g => g && g.level >= 10))} equipped)`,
-      hasFailed: () => {
-        const availableGlyphs = Glyphs.inventory.countWhere(g => g && g.level >= 10);
-        const equipped = Glyphs.activeList.countWhere(g => g.level >= 10);
-        const availableSlots = Glyphs.activeSlotCount - Glyphs.activeList.length;
-        return equipped + Math.min(availableGlyphs, availableSlots) < 4;
-      },
-      checkRequirement: () => Glyphs.activeList.countWhere(g => g.level >= 10) === 4,
-      checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
-      description: "Eternity count boosts Glyph level",
-      effect: () => Math.max(Math.sqrt(Currency.eternities.value.plus(1).log10()) * 0.45, 1),
-      formatCost: value => format(value, 1, 0)
-    },
-    {
-      name: "Scour to Empower",
-      id: 19,
-      cost: 1500,
-      requirement: () => `Have a total of ${formatInt(30)} or more Glyphs at once
-        (You have ${formatInt(Glyphs.allGlyphs.countWhere(g => g))})`,
-      hasFailed: () => Glyphs.allGlyphs.countWhere(g => g) < 30,
-      checkRequirement: () => Glyphs.allGlyphs.countWhere(g => g) >= 30,
-      checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
-      description: "You can sacrifice Glyphs for permanent bonuses (Shift + click)",
-      formatCost: value => format(value, 1, 0)
-    },
-    {
-      name: "Parity of Singularity",
-      id: 20,
-      cost: 1500,
-      requirement: () => `${formatInt(1)} year total play time and the Black Hole unlocked
-        (Currently: ${Time.totalTimePlayed.toStringShort(false)})`,
-      hasFailed: () => !BlackHole(1).isUnlocked && Currency.realityMachines.lt(100),
-      checkRequirement: () => Time.totalTimePlayed.totalYears >= 1 && BlackHole(1).isUnlocked,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: "Unlock Black Hole 2",
-      automatorPoints: 10,
-      shortDescription: () => `Second Black Hole`,
-      formatCost: value => format(value, 1, 0)
-    },
-    {
-      name: "Cosmic Conglomerate",
-      id: 21,
-      cost: 100000,
-      requirement: () => `${formatInt(Replicanti.galaxies.total + player.galaxies +
-        player.dilation.totalTachyonGalaxies)}/${formatInt(2800)} total Galaxies from all types`,
-      checkRequirement: () =>
-        Replicanti.galaxies.total + player.galaxies + player.dilation.totalTachyonGalaxies >= 2800,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: () => `Remote Antimatter Galaxy scaling is moved to ${formatInt(1e5)} galaxies`,
-      effect: 1e5
-    },
-    {
-      name: "Temporal Transcendence",
-      id: 22,
-      cost: 100000,
-      requirement: () => `${format(Currency.timeShards.value, 1)}/${format(DC.E28000)} Time Shards`,
-      checkRequirement: () => Currency.timeShards.exponent >= 28000,
-      checkEvent: GAME_EVENT.GAME_TICK_AFTER,
-      description: "Time Dimension multiplier based on days spent in this Reality",
-      effect: () => Decimal.pow10(Math.pow(1 + 2 * Math.log10(Time.thisReality.totalDays + 1), 1.6)),
-      formatEffect: value => formatX(value, 2, 2)
-    },
-    {
-      name: "Replicative Rapidity",
-      id: 23,
-      cost: 100000,
-      requirement: () => `Reality in under ${formatInt(15)} minutes (Best: ${Time.bestReality.toStringShort()})`,
-      hasFailed: () => Time.thisReality.totalMinutes >= 15,
-      checkRequirement: () => Time.thisReality.totalMinutes < 15,
-      checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
-      description: "Replicanti speed is boosted based on your fastest Reality",
-      effect: () => 15 / Math.clamp(Time.bestReality.totalMinutes, 1 / 12, 15),
-      cap: 180,
-      formatEffect: value => formatX(value, 2, 2)
-    },
-    {
-      name: "Synthetic Symbolism",
-      id: 24,
-      cost: 100000,
-      requirement: () => `Reality for ${formatInt(5000)} Reality Machines without Glyphs`,
-      hasFailed: () => Glyphs.activeList.length > 0,
-      checkRequirement: () => MachineHandler.gainedRealityMachines.gte(5000) && Glyphs.activeList.length === 0,
-      checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
-      description: "Gain another Glyph slot",
-      effect: () => 1
-    },
-    {
-      name: "Effortless Existence",
-      id: 25,
-      cost: 100000,
-      requirement: () => `Reach ${format(DC.E11111)} EP (Best: ${format(player.records.bestReality.bestEP, 2)} EP)`,
-      checkRequirement: () => player.records.bestReality.bestEP.exponent >= 11111,
-      checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
-      description: "Unlock the Reality autobuyer and Automator command",
-      automatorPoints: 100,
-      shortDescription: () => `Reality Autobuyer`,
-    },
-  ];
-}());
+    checkRequirement: () => Glyphs.activeList.countWhere(g => g.level >= 10) === 4,
+    checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
+    description: "Eternity count boosts Glyph level",
+    effect: () => Math.max(Math.sqrt(Currency.eternities.value.plus(1).log10()) * 0.45, 1),
+    formatCost: value => format(value, 1, 0)
+  },
+  {
+    name: "Scour to Empower",
+    id: 19,
+    cost: 1500,
+    requirement: () => `Have a total of ${formatInt(30)} or more Glyphs at once
+      (You have ${formatInt(Glyphs.allGlyphs.countWhere(g => g))})`,
+    hasFailed: () => Glyphs.allGlyphs.countWhere(g => g) < 30,
+    checkRequirement: () => Glyphs.allGlyphs.countWhere(g => g) >= 30,
+    checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
+    description: "You can sacrifice Glyphs for permanent bonuses (Shift + click)",
+    formatCost: value => format(value, 1, 0)
+  },
+  {
+    name: "Parity of Singularity",
+    id: 20,
+    cost: 1500,
+    requirement: () => `${formatInt(1)} year total play time and the Black Hole unlocked
+      (Currently: ${Time.totalTimePlayed.toStringShort(false)})`,
+    hasFailed: () => !BlackHole(1).isUnlocked && Currency.realityMachines.lt(100),
+    checkRequirement: () => Time.totalTimePlayed.totalYears >= 1 && BlackHole(1).isUnlocked,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: "Unlock Black Hole 2",
+    automatorPoints: 10,
+    shortDescription: () => `Second Black Hole`,
+    formatCost: value => format(value, 1, 0)
+  },
+  {
+    name: "Cosmic Conglomerate",
+    id: 21,
+    cost: 100000,
+    requirement: () => `${formatInt(Replicanti.galaxies.total + player.galaxies +
+      player.dilation.totalTachyonGalaxies)}/${formatInt(2800)} total Galaxies from all types`,
+    checkRequirement: () =>
+      Replicanti.galaxies.total + player.galaxies + player.dilation.totalTachyonGalaxies >= 2800,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: () => `Remote Antimatter Galaxy scaling is moved to ${formatInt(1e5)} galaxies`,
+    effect: 1e5
+  },
+  {
+    name: "Temporal Transcendence",
+    id: 22,
+    cost: 100000,
+    requirement: () => `${format(Currency.timeShards.value, 1)}/${format(DC.E28000)} Time Shards`,
+    checkRequirement: () => Currency.timeShards.exponent >= 28000,
+    checkEvent: GAME_EVENT.GAME_TICK_AFTER,
+    description: "Time Dimension multiplier based on days spent in this Reality",
+    effect: () => Decimal.pow10(Math.pow(1 + 2 * Math.log10(Time.thisReality.totalDays + 1), 1.6)),
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  {
+    name: "Replicative Rapidity",
+    id: 23,
+    cost: 100000,
+    requirement: () => `Reality in under ${formatInt(15)} minutes (Best: ${Time.bestReality.toStringShort()})`,
+    hasFailed: () => Time.thisReality.totalMinutes >= 15,
+    checkRequirement: () => Time.thisReality.totalMinutes < 15,
+    checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
+    description: "Replicanti speed is boosted based on your fastest Reality",
+    effect: () => 15 / Math.clamp(Time.bestReality.totalMinutes, 1 / 12, 15),
+    cap: 180,
+    formatEffect: value => formatX(value, 2, 2)
+  },
+  {
+    name: "Synthetic Symbolism",
+    id: 24,
+    cost: 100000,
+    requirement: () => `Reality for ${formatInt(5000)} Reality Machines without Glyphs`,
+    hasFailed: () => Glyphs.activeList.length > 0,
+    checkRequirement: () => MachineHandler.gainedRealityMachines.gte(5000) && Glyphs.activeList.length === 0,
+    checkEvent: GAME_EVENT.REALITY_RESET_BEFORE,
+    description: "Gain another Glyph slot",
+    effect: () => 1
+  },
+  {
+    name: "Effortless Existence",
+    id: 25,
+    cost: 100000,
+    requirement: () => `Reach ${format(DC.E11111)} EP (Best: ${format(player.records.bestReality.bestEP, 2)} EP)`,
+    checkRequirement: () => player.records.bestReality.bestEP.exponent >= 11111,
+    checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
+    description: "Unlock the Reality autobuyer and Automator command",
+    automatorPoints: 100,
+    shortDescription: () => `Reality Autobuyer`,
+  },
+];

From 07b692d281e9256788b09aaaf5b26b7fffb4ee19 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 19:26:26 -0700
Subject: [PATCH 48/89] clean up perk shop upgrade gamedatabase

---
 javascripts/core/celestials/teresa.js             | 15 ++++-----------
 .../core/secret-formula/celestials/perk-shop.js   | 15 ++++++++-------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/javascripts/core/celestials/teresa.js b/javascripts/core/celestials/teresa.js
index e8e99da69..e33d7d3cb 100644
--- a/javascripts/core/celestials/teresa.js
+++ b/javascripts/core/celestials/teresa.js
@@ -173,17 +173,10 @@ export const TeresaUnlocks = mapGameDataToObject(
   config => new TeresaUnlockState(config)
 );
 
-export const PerkShopUpgrade = (function() {
-  const db = GameDatabase.celestials.perkShop;
-  return {
-    glyphLevel: new PerkShopUpgradeState(db.glyphLevel),
-    rmMult: new PerkShopUpgradeState(db.rmMult),
-    bulkDilation: new PerkShopUpgradeState(db.bulkDilation),
-    autoSpeed: new PerkShopUpgradeState(db.autoSpeed),
-    musicGlyph: new PerkShopUpgradeState(db.musicGlyph),
-    fillMusicGlyph: new PerkShopUpgradeState(db.fillMusicGlyph),
-  };
-}());
+export const PerkShopUpgrade = mapGameDataToObject(
+  GameDatabase.celestials.perkShop,
+  config => new PerkShopUpgradeState(config)
+);
 
 EventHub.logic.on(GAME_EVENT.TAB_CHANGED, () => {
   if (Tab.celestials.teresa.isOpen) Teresa.quotes.show(Teresa.quotes.INITIAL);
diff --git a/javascripts/core/secret-formula/celestials/perk-shop.js b/javascripts/core/secret-formula/celestials/perk-shop.js
index 8d5d26a7a..6e0696d9f 100644
--- a/javascripts/core/secret-formula/celestials/perk-shop.js
+++ b/javascripts/core/secret-formula/celestials/perk-shop.js
@@ -4,16 +4,17 @@ function rebuyableCost(initialCost, increment, id) {
   return initialCost * Math.pow(increment, player.celestials.teresa.perkShop[id]);
 }
 function rebuyable(config) {
+  const { id, otherReq, cap, costCap, description, formatEffect, formatCost } = config;
   return {
-    id: config.id,
+    id,
     cost: () => (config.cost ? config.cost() : rebuyableCost(config.initialCost, config.increment, config.id)),
-    otherReq: config.otherReq,
-    cap: config.cap,
-    costCap: config.costCap,
-    description: config.description,
+    otherReq,
+    cap,
+    costCap,
+    description,
     effect: () => config.effect(player.celestials.teresa.perkShop[config.id]),
-    formatEffect: config.formatEffect,
-    formatCost: config.formatCost,
+    formatEffect,
+    formatCost,
     rebuyable: true
   };
 }

From 81a14eee42878c28c7d0609d5c856ff9360cd741 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 20:10:32 -0700
Subject: [PATCH 49/89] apply mapGameDataToObject to more places

---
 .../infinity-dimension-autobuyer.js           |  2 +-
 .../core/celestials/laitela/singularity.js    | 49 ++++-----------
 javascripts/core/dilation.js                  | 34 +++--------
 javascripts/core/eternity.js                  | 61 ++++---------------
 javascripts/core/kong.js                      | 15 ++---
 javascripts/core/perks.js                     | 58 ++----------------
 .../achievements/normal-achievements.js       |  2 +-
 .../secret-formula/speedrun-milestones.js     |  2 +-
 javascripts/core/ui/tab-notifications.js      | 20 ++----
 javascripts/game.js                           |  2 +-
 .../tabs/glyphs/RealityReminder.vue           |  2 +-
 11 files changed, 48 insertions(+), 199 deletions(-)

diff --git a/javascripts/core/autobuyers/infinity-dimension-autobuyer.js b/javascripts/core/autobuyers/infinity-dimension-autobuyer.js
index fa3e5a0eb..8fb98a8b7 100644
--- a/javascripts/core/autobuyers/infinity-dimension-autobuyer.js
+++ b/javascripts/core/autobuyers/infinity-dimension-autobuyer.js
@@ -28,7 +28,7 @@ class InfinityDimensionAutobuyerState extends IntervaledAutobuyerState {
   }
 
   get isUnlocked() {
-    return EternityMilestone.autobuyerID(this.tier).isReached || PelleUpgrade.IDAutobuyers.canBeApplied;
+    return EternityMilestone[`autobuyerID${this.tier}`].isReached || PelleUpgrade.IDAutobuyers.canBeApplied;
   }
 
   get resetTickOn() {
diff --git a/javascripts/core/celestials/laitela/singularity.js b/javascripts/core/celestials/laitela/singularity.js
index bfc172164..809617688 100644
--- a/javascripts/core/celestials/laitela/singularity.js
+++ b/javascripts/core/celestials/laitela/singularity.js
@@ -31,14 +31,18 @@ class SingularityMilestoneState extends GameMechanicState {
     return Currency.singularities.gte(this.start);
   }
 
+  get increaseThreshold() {
+    return this.config.increaseThreshold;
+  }
+
   nerfCompletions(completions) {
-    const softcap = this.config.increaseThreshold;
+    const softcap = this.increaseThreshold;
     if (!softcap || (completions < softcap)) return completions;
     return softcap + (completions - softcap) / 3;
   }
 
   unnerfCompletions(completions) {
-    const softcap = this.config.increaseThreshold;
+    const softcap = this.increaseThreshold;
     if (!softcap || (completions < softcap)) return completions;
     return softcap + (completions - softcap) * 3;
   }
@@ -95,42 +99,13 @@ class SingularityMilestoneState extends GameMechanicState {
   }
 }
 
-export const SingularityMilestone = (function() {
-  const db = GameDatabase.celestials.singularityMilestones;
-  return {
-    continuumMult: new SingularityMilestoneState(db.continuumMult),
-    darkMatterMult: new SingularityMilestoneState(db.darkMatterMult),
-    darkEnergyMult: new SingularityMilestoneState(db.darkEnergyMult),
-    darkDimensionCostReduction: new SingularityMilestoneState(db.darkDimensionCostReduction),
-    singularityMult: new SingularityMilestoneState(db.singularityMult),
-    darkDimensionIntervalReduction: new SingularityMilestoneState(db.darkDimensionIntervalReduction),
-    ascensionIntervalScaling: new SingularityMilestoneState(db.ascensionIntervalScaling),
-    autoCondense: new SingularityMilestoneState(db.autoCondense),
-    darkDimensionAutobuyers: new SingularityMilestoneState(db.darkDimensionAutobuyers),
-    darkAutobuyerSpeed: new SingularityMilestoneState(db.darkAutobuyerSpeed),
-    improvedSingularityCap: new SingularityMilestoneState(db.improvedSingularityCap),
-    darkFromTesseracts: new SingularityMilestoneState(db.darkFromTesseracts),
-    dilatedTimeFromSingularities: new SingularityMilestoneState(db.dilatedTimeFromSingularities),
-    darkFromGlyphLevel: new SingularityMilestoneState(db.darkFromGlyphLevel),
-    gamespeedFromSingularities: new SingularityMilestoneState(db.gamespeedFromSingularities),
-    darkFromTheorems: new SingularityMilestoneState(db.darkFromTheorems),
-    dim4Generation: new SingularityMilestoneState(db.dim4Generation),
-    darkFromDM4: new SingularityMilestoneState(db.darkFromDM4),
-    theoremPowerFromSingularities: new SingularityMilestoneState(db.theoremPowerFromSingularities),
-    darkFromGamespeed: new SingularityMilestoneState(db.darkFromGamespeed),
-    glyphLevelFromSingularities: new SingularityMilestoneState(db.glyphLevelFromSingularities),
-    darkFromDilatedTime: new SingularityMilestoneState(db.darkFromDilatedTime),
-    tesseractMultFromSingularities: new SingularityMilestoneState(db.tesseractMultFromSingularities),
-    improvedAscensionDM: new SingularityMilestoneState(db.improvedAscensionDM),
-    realityDEMultiplier: new SingularityMilestoneState(db.realityDEMultiplier),
-    intervalCostScalingReduction: new SingularityMilestoneState(db.intervalCostScalingReduction),
-    multFromInfinitied: new SingularityMilestoneState(db.multFromInfinitied),
-    infinitiedPow: new SingularityMilestoneState(db.infinitiedPow),
-  };
-}());
+export const SingularityMilestone = mapGameDataToObject(
+  GameDatabase.celestials.singularityMilestones,
+  config => new SingularityMilestoneState(config)
+);
 
 export const SingularityMilestones = {
-  all: Object.values(SingularityMilestone),
+  all: SingularityMilestone.all,
   lastNotified: player.celestials.laitela.lastCheckedMilestones,
 
   get sorted() {
@@ -228,7 +203,7 @@ export const SingularityMilestones = {
 
 // Sorted list of all the values where a singularity milestone exists, used for "new milestone" styling
 const SingularityMilestoneThresholds = (function() {
-  return Object.values(GameDatabase.celestials.singularityMilestones)
+  return SingularityMilestones.all
     .map(m => Array.range(0, Math.min(50, m.limit))
       .filter(r => !m.increaseThreshold || r <= m.increaseThreshold ||
         (r > m.increaseThreshold && ((r - m.increaseThreshold) % 3) === 2))
diff --git a/javascripts/core/dilation.js b/javascripts/core/dilation.js
index 00e780749..2be445ee1 100644
--- a/javascripts/core/dilation.js
+++ b/javascripts/core/dilation.js
@@ -227,26 +227,12 @@ class RebuyableDilationUpgradeState extends RebuyableMechanicState {
   }
 }
 
-export const DilationUpgrade = (function() {
-  const db = GameDatabase.eternity.dilation;
-  return {
-    dtGain: new RebuyableDilationUpgradeState(db.dtGain),
-    galaxyThreshold: new RebuyableDilationUpgradeState(db.galaxyThreshold),
-    tachyonGain: new RebuyableDilationUpgradeState(db.tachyonGain),
-    doubleGalaxies: new DilationUpgradeState(db.doubleGalaxies),
-    tdMultReplicanti: new DilationUpgradeState(db.tdMultReplicanti),
-    ndMultDT: new DilationUpgradeState(db.ndMultDT),
-    ipMultDT: new DilationUpgradeState(db.ipMultDT),
-    timeStudySplit: new DilationUpgradeState(db.timeStudySplit),
-    dilationPenalty: new DilationUpgradeState(db.dilationPenalty),
-    ttGenerator: new DilationUpgradeState(db.ttGenerator),
-    dtGainPelle: new RebuyableDilationUpgradeState(db.dtGainPelle),
-    galaxyMultiplier: new RebuyableDilationUpgradeState(db.galaxyMultiplier),
-    tickspeedPower: new RebuyableDilationUpgradeState(db.tickspeedPower),
-    galaxyThresholdPelle: new DilationUpgradeState(db.galaxyThresholdPelle),
-    flatDilationMult: new DilationUpgradeState(db.flatDilationMult),
-  };
-}());
+export const DilationUpgrade = mapGameDataToObject(
+  GameDatabase.eternity.dilation,
+  config => (config.rebuyable
+    ? new RebuyableDilationUpgradeState(config)
+    : new DilationUpgradeState(config))
+);
 
 export const DilationUpgrades = {
   rebuyable: [
@@ -254,11 +240,5 @@ export const DilationUpgrades = {
     DilationUpgrade.galaxyThreshold,
     DilationUpgrade.tachyonGain,
   ],
-  fromId: (function() {
-    const upgradesById = [];
-    for (const upgrade of Object.values(DilationUpgrade)) {
-      upgradesById[upgrade.id] = upgrade;
-    }
-    return id => upgradesById[id];
-  }()),
+  fromId: id => DilationUpgrade.all.find(x => x.id === id)
 };
diff --git a/javascripts/core/eternity.js b/javascripts/core/eternity.js
index 0475eb0cc..1cb2509b2 100644
--- a/javascripts/core/eternity.js
+++ b/javascripts/core/eternity.js
@@ -196,44 +196,12 @@ export class EternityMilestoneState {
     return Currency.eternities.gte(this.config.eternities);
   }
 }
-
-export const EternityMilestone = (function() {
-  const db = GameDatabase.eternity.milestones;
-  const infinityDims = Array.dimensionTiers
-    .map(tier => new EternityMilestoneState(db[`autobuyerID${tier}`]));
-  return {
-    autobuyerIPMult: new EternityMilestoneState(db.autobuyerIPMult),
-    keepAutobuyers: new EternityMilestoneState(db.keepAutobuyers),
-    autobuyerReplicantiGalaxy: new EternityMilestoneState(db.autobuyerReplicantiGalaxy),
-    keepInfinityUpgrades: new EternityMilestoneState(db.keepInfinityUpgrades),
-    bigCrunchModes: new EternityMilestoneState(db.bigCrunchModes),
-    autoEP: new EternityMilestoneState(db.autoEP),
-    autoIC: new EternityMilestoneState(db.autoIC),
-    autobuyMaxGalaxies: new EternityMilestoneState(db.autobuyMaxGalaxies),
-    unlockReplicanti: new EternityMilestoneState(db.unlockReplicanti),
-    autobuyerID: tier => infinityDims[tier - 1],
-    keepBreakUpgrades: new EternityMilestoneState(db.keepBreakUpgrades),
-    autoUnlockID: new EternityMilestoneState(db.autoUnlockID),
-    unlockAllND: new EternityMilestoneState(db.unlockAllND),
-    replicantiNoReset: new EternityMilestoneState(db.replicantiNoReset),
-    autobuyerReplicantiChance: new EternityMilestoneState(db.autobuyerReplicantiChance),
-    autobuyerReplicantiInterval: new EternityMilestoneState(db.autobuyerReplicantiInterval),
-    autobuyerReplicantiMaxGalaxies: new EternityMilestoneState(db.autobuyerReplicantiMaxGalaxies),
-    autobuyerEternity: new EternityMilestoneState(db.autobuyerEternity),
-    autoEternities: new EternityMilestoneState(db.autoEternities),
-    autoInfinities: new EternityMilestoneState(db.autoInfinities),
-  };
-}());
-
-export const EternityMilestones = {
-  // This is a bit of a hack because autobuyerID is a function that returns EternityMilestoneState objects instead of a
-  // EternityMilestoneState object itself
-  all: Object.values(EternityMilestone)
-    .filter(m => typeof m !== "function")
-    .concat(Array.dimensionTiers
-      .map(tier => new EternityMilestoneState(GameDatabase.eternity.milestones[`autobuyerID${tier}`]))
-    )
-};
+export const EternityMilestone = mapGameDataToObject(
+  GameDatabase.eternity.milestones,
+  config => (config.isBaseResource
+    ? new EternityMilestoneState(config)
+    : new EternityMilestoneState(config))
+);
 
 class EternityUpgradeState extends SetPurchasableMechanicState {
   get currency() {
@@ -321,16 +289,9 @@ class EPMultiplierState extends GameMechanicState {
   }
 }
 
+export const EternityUpgrade = mapGameDataToObject(
+  GameDatabase.eternity.upgrades,
+  config => new EternityUpgradeState(config)
+);
 
-export const EternityUpgrade = (function() {
-  const db = GameDatabase.eternity.upgrades;
-  return {
-    idMultEP: new EternityUpgradeState(db.idMultEP),
-    idMultEternities: new EternityUpgradeState(db.idMultEternities),
-    idMultICRecords: new EternityUpgradeState(db.idMultICRecords),
-    tdMultAchs: new EternityUpgradeState(db.tdMultAchs),
-    tdMultTheorems: new EternityUpgradeState(db.tdMultTheorems),
-    tdMultRealTime: new EternityUpgradeState(db.tdMultRealTime),
-    epMult: new EPMultiplierState(),
-  };
-}());
+EternityUpgrade.epMult = new EPMultiplierState();
diff --git a/javascripts/core/kong.js b/javascripts/core/kong.js
index f38387381..fa5914162 100644
--- a/javascripts/core/kong.js
+++ b/javascripts/core/kong.js
@@ -60,17 +60,10 @@ class ShopPurchaseState extends RebuyableMechanicState {
   }
 }
 
-export const ShopPurchase = (function() {
-  const db = GameDatabase.shopPurchases;
-  return {
-    dimPurchases: new ShopPurchaseState(db.dimPurchases),
-    IPPurchases: new ShopPurchaseState(db.IPPurchases),
-    EPPurchases: new ShopPurchaseState(db.EPPurchases),
-    allDimPurchases: new ShopPurchaseState(db.allDimPurchases)
-  };
-}());
-
-ShopPurchase.all = Object.values(ShopPurchase);
+export const ShopPurchase = mapGameDataToObject(
+  GameDatabase.shopPurchases,
+  config => new ShopPurchaseState(config)
+);
 
 kong.purchaseTimeSkip = function(cost) {
   if (player.IAP.totalSTD - player.IAP.spentSTD < cost) return;
diff --git a/javascripts/core/perks.js b/javascripts/core/perks.js
index 2606bb25c..895196b64 100644
--- a/javascripts/core/perks.js
+++ b/javascripts/core/perks.js
@@ -49,61 +49,13 @@ class PerkState extends SetPurchasableMechanicState {
   }
 }
 
-export const Perk = (function() {
-  const db = GameDatabase.reality.perks;
-  return {
-    firstPerk: new PerkState(db.firstPerk),
-    startAM: new PerkState(db.startAM),
-    startIP1: new PerkState(db.startIP1),
-    startIP2: new PerkState(db.startIP2),
-    startEP1: new PerkState(db.startEP1),
-    startEP2: new PerkState(db.startEP2),
-    startEP3: new PerkState(db.startEP3),
-    startTP: new PerkState(db.startTP),
-    antimatterNoReset: new PerkState(db.antimatterNoReset),
-    studyPassive: new PerkState(db.studyPassive),
-    autounlockEU1: new PerkState(db.autounlockEU1),
-    autounlockEU2: new PerkState(db.autounlockEU2),
-    autounlockDilation1: new PerkState(db.autounlockDilation1),
-    autounlockDilation2: new PerkState(db.autounlockDilation2),
-    autounlockDilation3: new PerkState(db.autounlockDilation3),
-    autounlockTD: new PerkState(db.autounlockTD),
-    autounlockReality: new PerkState(db.autounlockReality),
-    bypassIDAntimatter: new PerkState(db.bypassIDAntimatter),
-    bypassTGReset: new PerkState(db.bypassTGReset),
-    bypassECDilation: new PerkState(db.bypassECDilation),
-    bypassEC1Lock: new PerkState(db.bypassEC1Lock),
-    bypassEC2Lock: new PerkState(db.bypassEC2Lock),
-    bypassEC3Lock: new PerkState(db.bypassEC3Lock),
-    bypassEC5Lock: new PerkState(db.bypassEC5Lock),
-    autocompleteEC1: new PerkState(db.autocompleteEC1),
-    autocompleteEC2: new PerkState(db.autocompleteEC2),
-    autocompleteEC3: new PerkState(db.autocompleteEC3),
-    studyActiveEP: new PerkState(db.studyActiveEP),
-    studyIdleEP: new PerkState(db.studyIdleEP),
-    studyECRequirement: new PerkState(db.studyECRequirement),
-    studyECBulk: new PerkState(db.studyECBulk),
-    retroactiveTP1: new PerkState(db.retroactiveTP1),
-    retroactiveTP2: new PerkState(db.retroactiveTP2),
-    retroactiveTP3: new PerkState(db.retroactiveTP3),
-    retroactiveTP4: new PerkState(db.retroactiveTP4),
-    autobuyerDilation: new PerkState(db.autobuyerDilation),
-    autobuyerFasterID: new PerkState(db.autobuyerFasterID),
-    autobuyerFasterReplicanti: new PerkState(db.autobuyerFasterReplicanti),
-    autobuyerFasterDilation: new PerkState(db.autobuyerFasterDilation),
-    ttFree: new PerkState(db.ttFree),
-    ttBuySingle: new PerkState(db.ttBuySingle),
-    ttBuyMax: new PerkState(db.ttBuyMax),
-    achievementGroup1: new PerkState(db.achievementGroup1),
-    achievementGroup2: new PerkState(db.achievementGroup2),
-    achievementGroup3: new PerkState(db.achievementGroup3),
-    achievementGroup4: new PerkState(db.achievementGroup4),
-    achievementGroup5: new PerkState(db.achievementGroup5)
-  };
-}());
+export const Perk = mapGameDataToObject(
+  GameDatabase.reality.perks,
+  config => new PerkState(config)
+);
 
 export const Perks = {
-  all: Object.values(Perk),
+  all: Perk.all,
   /**
    * @param {number} id
    * @returns {PerkState}
diff --git a/javascripts/core/secret-formula/achievements/normal-achievements.js b/javascripts/core/secret-formula/achievements/normal-achievements.js
index 07bc75268..e2d79fa82 100644
--- a/javascripts/core/secret-formula/achievements/normal-achievements.js
+++ b/javascripts/core/secret-formula/achievements/normal-achievements.js
@@ -702,7 +702,7 @@ GameDatabase.achievements.normal = [
     id: 102,
     name: "This mile took an eternity",
     description: "Get all Eternity milestones.",
-    checkRequirement: () => EternityMilestones.all.every(m => m.isReached),
+    checkRequirement: () => EternityMilestone.all.every(m => m.isReached),
     checkEvent: GAME_EVENT.GAME_TICK_AFTER
   },
   {
diff --git a/javascripts/core/secret-formula/speedrun-milestones.js b/javascripts/core/secret-formula/speedrun-milestones.js
index 226453045..3f9138baf 100644
--- a/javascripts/core/secret-formula/speedrun-milestones.js
+++ b/javascripts/core/secret-formula/speedrun-milestones.js
@@ -86,7 +86,7 @@ GameDatabase.speedrunMilestones = [
     key: "allEternityMilestones",
     name: "All Eternity Milestones",
     description: "Unlock all Eternity Milestones",
-    checkRequirement: () => EternityMilestones.all.every(m => m.isReached),
+    checkRequirement: () => EternityMilestone.all.every(m => m.isReached),
     checkEvent: GAME_EVENT.ETERNITY_RESET_AFTER,
   },
   {
diff --git a/javascripts/core/ui/tab-notifications.js b/javascripts/core/ui/tab-notifications.js
index a4555759d..1c5836dab 100644
--- a/javascripts/core/ui/tab-notifications.js
+++ b/javascripts/core/ui/tab-notifications.js
@@ -30,19 +30,7 @@ class TabNotificationState {
   }
 }
 
-export const TabNotification = (function() {
-  const db = GameDatabase.tabNotifications;
-  return {
-    firstInfinity: new TabNotificationState(db.firstInfinity),
-    IDUnlock: new TabNotificationState(db.ICUnlock),
-    ICUnlock: new TabNotificationState(db.ICUnlock),
-    breakInfinity: new TabNotificationState(db.breakInfinity),
-    firstEternity: new TabNotificationState(db.firstEternity),
-    dilationAfterUnlock: new TabNotificationState(db.dilationAfterUnlock),
-    realityUnlock: new TabNotificationState(db.realityUnlock),
-    blackHoleUnlock: new TabNotificationState(db.blackHoleUnlock),
-    automatorUnlock: new TabNotificationState(db.automatorUnlock),
-    teresaUnlock: new TabNotificationState(db.teresaUnlock),
-    alchemyUnlock: new TabNotificationState(db.alchemyUnlock),
-  };
-}());
+export const TabNotification = mapGameDataToObject(
+  GameDatabase.tabNotifications,
+  config => new TabNotificationState(config)
+);
diff --git a/javascripts/game.js b/javascripts/game.js
index f56e8d19e..c6c603624 100644
--- a/javascripts/game.js
+++ b/javascripts/game.js
@@ -683,7 +683,7 @@ function applyAutoUnlockPerks() {
   if (Perk.autounlockDilation3.isBought) buyDilationUpgrade(DilationUpgrade.ttGenerator.id);
   if (Perk.autounlockReality.isBought) TimeStudy.reality.purchase(true);
   if (player.eternityUpgrades.size < 6 && Perk.autounlockEU2.isBought) {
-    const secondRow = Object.values(EternityUpgrade).filter(u => u.id > 3);
+    const secondRow = EternityUpgrade.all.filter(u => u.id > 3);
     for (const upgrade of secondRow) {
       if (player.eternityPoints.gte(upgrade.cost / 1e10)) player.eternityUpgrades.add(upgrade.id);
     }
diff --git a/src/components/tabs/glyphs/RealityReminder.vue b/src/components/tabs/glyphs/RealityReminder.vue
index 42c0479f3..118188e4a 100644
--- a/src/components/tabs/glyphs/RealityReminder.vue
+++ b/src/components/tabs/glyphs/RealityReminder.vue
@@ -82,7 +82,7 @@ export default {
       this.ecCount = EternityChallenges.completions;
       this.missingAchievements = Achievements.preReality.countWhere(a => !a.isUnlocked);
       // Repeatable dilation upgrades don't have isBought, but do have boughtAmount
-      this.unpurchasedDilationUpgrades = Object.values(DilationUpgrade)
+      this.unpurchasedDilationUpgrades = DilationUpgrade.all
         .countWhere(u => (u.isBought === undefined ? u.boughtAmount === 0 : !u.isBought) && !u.config.pelleOnly);
       this.currLog10EP = player.eternityPoints.log10();
       this.cheapestLog10TD = Math.min(...TimeDimensions.all.map(x => x.cost.log10()));

From a4ef05596d2dc330a43264a19fcfa7c179c4a6b9 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 20:13:38 -0700
Subject: [PATCH 50/89] clean up glyph sacrifice gamedatabase

---
 javascripts/core/glyphs/glyph-core.js         | 16 ++++---------
 .../reality/glyph-sacrifices.js               | 24 ++++++++++++-------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/javascripts/core/glyphs/glyph-core.js b/javascripts/core/glyphs/glyph-core.js
index 131cf7f77..b462181ff 100644
--- a/javascripts/core/glyphs/glyph-core.js
+++ b/javascripts/core/glyphs/glyph-core.js
@@ -640,18 +640,10 @@ export const Glyphs = {
 
 class GlyphSacrificeState extends GameMechanicState { }
 
-export const GlyphSacrifice = (function() {
-  const db = GameDatabase.reality.glyphSacrifice;
-  return {
-    time: new GlyphSacrificeState(db.time),
-    dilation: new GlyphSacrificeState(db.dilation),
-    replication: new GlyphSacrificeState(db.replication),
-    infinity: new GlyphSacrificeState(db.infinity),
-    power: new GlyphSacrificeState(db.power),
-    effarig: new GlyphSacrificeState(db.effarig),
-    reality: new GlyphSacrificeState(db.reality),
-  };
-}());
+export const GlyphSacrifice = mapGameDataToObject(
+  GameDatabase.reality.glyphSacrifice,
+  config => new GlyphSacrificeState(config)
+);
 
 export function recalculateAllGlyphs() {
   for (let i = 0; i < player.reality.glyphs.active.length; i++) {
diff --git a/javascripts/core/secret-formula/reality/glyph-sacrifices.js b/javascripts/core/secret-formula/reality/glyph-sacrifices.js
index 7f54e1008..8a34c4d6b 100644
--- a/javascripts/core/secret-formula/reality/glyph-sacrifices.js
+++ b/javascripts/core/secret-formula/reality/glyph-sacrifices.js
@@ -1,7 +1,7 @@
 import { GameDatabase } from "../game-database";
 
-GameDatabase.reality.glyphSacrifice = [
-  {
+GameDatabase.reality.glyphSacrifice = {
+  "power": {
     id: "power",
     effect: added => {
       if (Pelle.isDisabled("glyphsac")) return 0;
@@ -19,7 +19,8 @@ GameDatabase.reality.glyphSacrifice = [
         : "";
       return `Distant Galaxy scaling starts ${formatInt(amount)} later${nextGalaxyText}`;
     }
-  }, {
+  },
+  "infinity": {
     id: "infinity",
     effect: added => {
       if (Pelle.isDisabled("glyphsac")) return 1;
@@ -31,7 +32,8 @@ GameDatabase.reality.glyphSacrifice = [
       if (Pelle.isDisabled("glyphsac")) return `Glyph Sacrifice is disabled in Pelle`;
       return `${formatX(amount, 2, 2)} bigger multiplier when buying 8th Infinity Dimension.`;
     }
-  }, {
+  },
+  "time": {
     id: "time",
     effect: added => {
       if (Pelle.isDisabled("glyphsac")) return 1;
@@ -43,7 +45,8 @@ GameDatabase.reality.glyphSacrifice = [
       if (Pelle.isDisabled("glyphsac")) return `Glyph Sacrifice is disabled in Pelle`;
       return `${formatX(amount, 2, 2)} bigger multiplier when buying 8th Time Dimension.`;
     }
-  }, {
+  },
+  "replication": {
     id: "replication",
     effect: added => {
       if (Pelle.isDisabled("glyphsac")) return 0;
@@ -61,7 +64,8 @@ GameDatabase.reality.glyphSacrifice = [
         : "";
       return `Replicanti Galaxy scaling starts ${formatInt(amount)} later${nextGalaxyText}`;
     }
-  }, {
+  },
+  "dilation": {
     id: "dilation",
     effect: added => {
       if (Pelle.isDisabled("glyphsac")) return 1;
@@ -75,7 +79,8 @@ GameDatabase.reality.glyphSacrifice = [
       if (Pelle.isDisabled("glyphsac")) return `Glyph Sacrifice is disabled in Pelle`;
       return `Multiply Tachyon Particle gain by ${formatX(amount, 2, 2)}`;
     }
-  }, {
+  },
+  "effarig": {
     id: "effarig",
     effect: added => {
       if (Pelle.isDisabled("glyphsac")) return 0;
@@ -87,7 +92,8 @@ GameDatabase.reality.glyphSacrifice = [
       if (Pelle.isDisabled("glyphsac")) return `Glyph Sacrifice is disabled in Pelle`;
       return `+${formatPercents(amount / 100, 2)} additional Glyph rarity`;
     }
-  }, {
+  },
+  "reality": {
     id: "reality",
     effect: added => {
       if (Pelle.isDisabled("glyphsac")) return 0;
@@ -99,4 +105,4 @@ GameDatabase.reality.glyphSacrifice = [
       return `${formatPercents(amount - 1, 2)} increased Alchemy yield`;
     }
   }
-].mapToObject(g => g.id, g => g);
+};

From c6eb545007a5bf71c8680ab8bb33995557f72a7f Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Wed, 18 May 2022 21:28:39 -0700
Subject: [PATCH 51/89] drop 4 more unneeded IIFEs related to
 mapGameDataToObject

---
 .../core/celestials/pelle/galaxy-generator.js    | 10 ++++------
 javascripts/core/celestials/pelle/pelle.js       | 16 +++++++---------
 javascripts/core/celestials/pelle/rifts.js       | 10 ++++------
 javascripts/core/celestials/pelle/strikes.js     | 10 ++++------
 4 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/javascripts/core/celestials/pelle/galaxy-generator.js b/javascripts/core/celestials/pelle/galaxy-generator.js
index b5249e0ad..6b1405e2e 100644
--- a/javascripts/core/celestials/pelle/galaxy-generator.js
+++ b/javascripts/core/celestials/pelle/galaxy-generator.js
@@ -115,9 +115,7 @@ export class GalaxyGeneratorUpgrade extends RebuyableMechanicState {
   }
 }
 
-export const GalaxyGeneratorUpgrades = (function() {
-  return mapGameDataToObject(
-    GameDatabase.celestials.pelle.galaxyGeneratorUpgrades,
-    config => new GalaxyGeneratorUpgrade(config)
-  );
-}());
+export const GalaxyGeneratorUpgrades = mapGameDataToObject(
+  GameDatabase.celestials.pelle.galaxyGeneratorUpgrades,
+  config => new GalaxyGeneratorUpgrade(config)
+);
diff --git a/javascripts/core/celestials/pelle/pelle.js b/javascripts/core/celestials/pelle/pelle.js
index e9d522e41..9761b24c0 100644
--- a/javascripts/core/celestials/pelle/pelle.js
+++ b/javascripts/core/celestials/pelle/pelle.js
@@ -455,15 +455,13 @@ export class PelleUpgradeState extends SetPurchasableMechanicState {
 
 }
 
-export const PelleUpgrade = (function() {
-  return mapGameDataToObject(
-    GameDatabase.celestials.pelle.upgrades,
-    config => (config.rebuyable
-      ? new RebuyablePelleUpgradeState(config)
-      : new PelleUpgradeState(config)
-    )
-  );
-}());
+export const PelleUpgrade = mapGameDataToObject(
+  GameDatabase.celestials.pelle.upgrades,
+  config => (config.rebuyable
+    ? new RebuyablePelleUpgradeState(config)
+    : new PelleUpgradeState(config)
+  )
+);
 
 PelleUpgrade.rebuyables = PelleUpgrade.all.filter(u => u.isRebuyable);
 PelleUpgrade.singles = PelleUpgrade.all.filter(u => !u.isRebuyable);
diff --git a/javascripts/core/celestials/pelle/rifts.js b/javascripts/core/celestials/pelle/rifts.js
index 3682e67fd..b1bd9bbc8 100644
--- a/javascripts/core/celestials/pelle/rifts.js
+++ b/javascripts/core/celestials/pelle/rifts.js
@@ -170,11 +170,9 @@ class RiftState extends GameMechanicState {
   }
 }
 
-export const PelleRifts = (function() {
-  return mapGameDataToObject(
-    GameDatabase.celestials.pelle.rifts,
-    config => new RiftState(config)
-  );
-}());
+export const PelleRifts = mapGameDataToObject(
+  GameDatabase.celestials.pelle.rifts,
+  config => new RiftState(config)
+);
 
 PelleRifts.totalMilestones = () => PelleRifts.all.flatMap(x => x.milestones).countWhere(x => x.canBeApplied);
diff --git a/javascripts/core/celestials/pelle/strikes.js b/javascripts/core/celestials/pelle/strikes.js
index b0a5ce7e8..9f9500ffa 100644
--- a/javascripts/core/celestials/pelle/strikes.js
+++ b/javascripts/core/celestials/pelle/strikes.js
@@ -56,9 +56,7 @@ class PelleStrikeState extends BitUpgradeState {
   }
 }
 
-export const PelleStrikes = (function() {
-  return mapGameDataToObject(
-    GameDatabase.celestials.pelle.strikes,
-    config => new PelleStrikeState(config)
-  );
-}());
+export const PelleStrikes = mapGameDataToObject(
+  GameDatabase.celestials.pelle.strikes,
+  config => new PelleStrikeState(config)
+);

From 205697d45560382c093ab4116b6c760d3a611911 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 24 Apr 2022 22:21:31 +0800
Subject: [PATCH 52/89] Fix some TimeStudyTree bug (see desc)

`73, 83, 103, 93`, for example, would get shortened to `time`, even though time has the behaviour of `73, 83, 93, 103`, which is different
This matters especially for orderings of light/dark studies
---
 javascripts/core/time-studies/time-study-tree.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/javascripts/core/time-studies/time-study-tree.js b/javascripts/core/time-studies/time-study-tree.js
index b994426c0..784d70447 100644
--- a/javascripts/core/time-studies/time-study-tree.js
+++ b/javascripts/core/time-studies/time-study-tree.js
@@ -110,16 +110,11 @@ export class TimeStudyTree {
 
   static formatStudyList(input) {
     let internal = input.toLowerCase().replaceAll(" ", "");
-    // \\b means 0-width word boundry, meaning "target = 11" doesnt match 111
-    const testRegex = target => new RegExp(`\\b${target}\\b,?`, "gu");
-    // If the studylist has all IDs, replace the first instance with the shorthand, then remove the rest
+    // If the studylist has the exact order of the ids, replace them with the shorthand
     this.sets.forEach((ids, name) => {
-      const hasAllIds = ids.every(x => testRegex(x).test(internal));
-      if (hasAllIds) {
-        internal = internal.replace(testRegex(ids[0]), `${name},`);
-        for (const i of ids) {
-          internal = internal.replace(testRegex(i), "");
-        }
+      const testString = ids.join(",");
+      if (internal.includes(testString)) {
+        internal = internal.replaceAll(testString, `${name}`);
       }
     });
     return internal.replaceAll(",", ", ").replace("|", " | ");

From 2de66f459eaf7e62fe4d1ea13188cab9e8e482c8 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Tue, 3 May 2022 20:11:28 +0800
Subject: [PATCH 53/89] Make conversion of shorthands manual

---
 .../core/time-studies/time-study-tree.js      | 20 ++++++++++++++-----
 src/components/modals/StudyStringModal.vue    | 13 +++++++++++-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/javascripts/core/time-studies/time-study-tree.js b/javascripts/core/time-studies/time-study-tree.js
index 784d70447..d6327cc6d 100644
--- a/javascripts/core/time-studies/time-study-tree.js
+++ b/javascripts/core/time-studies/time-study-tree.js
@@ -109,12 +109,22 @@ export class TimeStudyTree {
   }
 
   static formatStudyList(input) {
-    let internal = input.toLowerCase().replaceAll(" ", "");
-    // If the studylist has the exact order of the ids, replace them with the shorthand
+    const internal = input.toLowerCase().replaceAll(" ", "");
+    return internal.replaceAll(",", ", ").replace("|", " | ");
+  }
+
+  static collapseStudyShorthands(input) {
+    let internal = input.replaceAll(" ", "");
+    // \\b means 0-width word boundry, meaning "target = 11" doesnt match 111
+    const testRegex = target => new RegExp(`\\b${target}\\b,?`, "gu");
+    // If the studylist has all IDs, replace the first instance with the shorthand, then remove the rest
     this.sets.forEach((ids, name) => {
-      const testString = ids.join(",");
-      if (internal.includes(testString)) {
-        internal = internal.replaceAll(testString, `${name}`);
+      const hasAllIds = ids.every(x => testRegex(x).test(internal));
+      if (hasAllIds) {
+        internal = internal.replace(testRegex(ids[0]), `${name},`);
+        for (const i of ids) {
+          internal = internal.replace(testRegex(i), "");
+        }
       }
     });
     return internal.replaceAll(",", ", ").replace("|", " | ");
diff --git a/src/components/modals/StudyStringModal.vue b/src/components/modals/StudyStringModal.vue
index 420b02f72..567146b58 100644
--- a/src/components/modals/StudyStringModal.vue
+++ b/src/components/modals/StudyStringModal.vue
@@ -2,13 +2,15 @@
 import { sha512_256 } from "js-sha512";
 
 import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
+import PrimaryButton from "@/components/PrimaryButton";
 import StudyStringLine from "@/components/modals/StudyStringLine";
 
 export default {
   name: "StudyStringModal",
   components: {
     ModalWrapperChoice,
-    StudyStringLine
+    StudyStringLine,
+    PrimaryButton
   },
   props: {
     modalConfig: {
@@ -131,6 +133,9 @@ export default {
       if (this.isImporting) this.importTree();
       else this.savePreset();
     },
+    convertInputShorthands() {
+      this.input = TimeStudyTree.collapseStudyShorthands(this.input);
+    },
     importTree() {
       if (!this.inputIsValid) return;
       if (this.inputIsSecret) SecretAchievement(37).unlock();
@@ -216,6 +221,12 @@ export default {
         Not a valid tree
       </div>
     </div>
+    <div v-if="!isImporting && inputIsValidTree">
+      <br>
+      <PrimaryButton @click="convertInputShorthands">
+        Collapse Study ID list Shorthands
+      </PrimaryButton>
+    </div>
     <template #confirm-text>
       {{ isImporting ? "Import" : "Save" }}
     </template>

From dd0ba847041e16e7d90e94ba861cd45831d1b0fd Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 5 May 2022 20:42:49 +0800
Subject: [PATCH 54/89] Remove all auto study string formatting

---
 javascripts/core/time-studies/time-study-tree.js             | 5 -----
 src/components/modals/StudyStringModal.vue                   | 4 ++--
 .../tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue    | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/javascripts/core/time-studies/time-study-tree.js b/javascripts/core/time-studies/time-study-tree.js
index d6327cc6d..3a5e14268 100644
--- a/javascripts/core/time-studies/time-study-tree.js
+++ b/javascripts/core/time-studies/time-study-tree.js
@@ -109,11 +109,6 @@ export class TimeStudyTree {
   }
 
   static formatStudyList(input) {
-    const internal = input.toLowerCase().replaceAll(" ", "");
-    return internal.replaceAll(",", ", ").replace("|", " | ");
-  }
-
-  static collapseStudyShorthands(input) {
     let internal = input.replaceAll(" ", "");
     // \\b means 0-width word boundry, meaning "target = 11" doesnt match 111
     const testRegex = target => new RegExp(`\\b${target}\\b,?`, "gu");
diff --git a/src/components/modals/StudyStringModal.vue b/src/components/modals/StudyStringModal.vue
index 567146b58..aee83ad80 100644
--- a/src/components/modals/StudyStringModal.vue
+++ b/src/components/modals/StudyStringModal.vue
@@ -134,7 +134,7 @@ export default {
       else this.savePreset();
     },
     convertInputShorthands() {
-      this.input = TimeStudyTree.collapseStudyShorthands(this.input);
+      this.input = TimeStudyTree.formatStudyList(this.input);
     },
     importTree() {
       if (!this.inputIsValid) return;
@@ -146,7 +146,7 @@ export default {
     },
     savePreset() {
       if (this.inputIsValid) {
-        player.timestudy.presets[this.modalConfig.id].studies = TimeStudyTree.formatStudyList(this.input);
+        player.timestudy.presets[this.modalConfig.id].studies = this.input;
         GameUI.notify.eternity(`Study Tree ${this.name} successfully edited.`);
         this.emitClose();
       }
diff --git a/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue b/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue
index ac1919924..3bddf7093 100644
--- a/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue
+++ b/src/components/tabs/time-studies/tt-shop/TimeStudySaveLoadButton.vue
@@ -35,7 +35,7 @@ export default {
     },
     save() {
       this.hideContextMenu();
-      this.preset.studies = TimeStudyTree.formatStudyList(GameCache.currentStudyTree.value.exportString);
+      this.preset.studies = GameCache.currentStudyTree.value.exportString;
       const presetName = this.name ? `Study preset "${this.name}"` : "Study preset";
       GameUI.notify.eternity(`${presetName} saved in slot ${this.saveslot}`);
     },

From 66d00bcf6f64c6bd94c52a62e8c98f7b9d742de4 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 5 May 2022 22:26:59 +0800
Subject: [PATCH 55/89] Add back missing toLowerCase

brain farted
---
 javascripts/core/time-studies/time-study-tree.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascripts/core/time-studies/time-study-tree.js b/javascripts/core/time-studies/time-study-tree.js
index 3a5e14268..b994426c0 100644
--- a/javascripts/core/time-studies/time-study-tree.js
+++ b/javascripts/core/time-studies/time-study-tree.js
@@ -109,7 +109,7 @@ export class TimeStudyTree {
   }
 
   static formatStudyList(input) {
-    let internal = input.replaceAll(" ", "");
+    let internal = input.toLowerCase().replaceAll(" ", "");
     // \\b means 0-width word boundry, meaning "target = 11" doesnt match 111
     const testRegex = target => new RegExp(`\\b${target}\\b,?`, "gu");
     // If the studylist has all IDs, replace the first instance with the shorthand, then remove the rest

From 957c7b124304c176209d2e113432ab782ab7c2d6 Mon Sep 17 00:00:00 2001
From: L4R5W <66326188+L4R5W@users.noreply.github.com>
Date: Thu, 19 May 2022 12:14:51 +0200
Subject: [PATCH 56/89] keep infinity broken on eternity in doomed (#2607)

---
 javascripts/core/eternity.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascripts/core/eternity.js b/javascripts/core/eternity.js
index 0475eb0cc..07bf10b35 100644
--- a/javascripts/core/eternity.js
+++ b/javascripts/core/eternity.js
@@ -89,7 +89,7 @@ export function eternity(force, auto, specialConditions = {}) {
   initializeChallengeCompletions();
   initializeResourcesAfterEternity();
 
-  if (!EternityMilestone.keepAutobuyers.isReached) {
+  if (!EternityMilestone.keepAutobuyers.isReached && !(Pelle.isDoomed && PelleUpgrade.keepAutobuyers.canBeApplied)) {
     // Fix infinity because it can only break after big crunch autobuyer interval is maxed
     player.break = false;
   }

From eb4b7acca14625800a3b63bffcf609f041a25cd1 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 19 May 2022 18:26:19 +0800
Subject: [PATCH 57/89] Codefactor likes my import statements now

---
 javascripts/core/devtools.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascripts/core/devtools.js b/javascripts/core/devtools.js
index 44b92d59b..3b4e0d497 100644
--- a/javascripts/core/devtools.js
+++ b/javascripts/core/devtools.js
@@ -1,7 +1,7 @@
 import { sha512_256 } from "js-sha512";
-import FullScreenAnimationHandler from "./full-screen-animation-handler";
 
 import { DC } from "./constants";
+import FullScreenAnimationHandler from "./full-screen-animation-handler";
 
 /* eslint-disable no-console */
 // Disabling no-console here seems

From 6f80704e421bc1af9016e9ab250fd5ea100110b7 Mon Sep 17 00:00:00 2001
From: Hirame1 <56225774+Hirame1@users.noreply.github.com>
Date: Sat, 30 Apr 2022 21:20:32 +0700
Subject: [PATCH 58/89] Force re-render alchemy chart on toggle all

---
 src/components/tabs/alchemy/AlchemyTab.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/tabs/alchemy/AlchemyTab.vue b/src/components/tabs/alchemy/AlchemyTab.vue
index 989f7706d..95e63b064 100644
--- a/src/components/tabs/alchemy/AlchemyTab.vue
+++ b/src/components/tabs/alchemy/AlchemyTab.vue
@@ -162,6 +162,7 @@ export default {
           reaction.isActive = false;
         }
       }
+      this.$forceUpdate();
     }
   }
 };

From 50600e7c5edc99b9a4ff3631e7ceb2dde19981ab Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sat, 30 Apr 2022 22:57:28 +0800
Subject: [PATCH 59/89] Remove $forceUpdate, implement better-ish solution

---
 src/components/tabs/alchemy/AlchemyTab.vue | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/components/tabs/alchemy/AlchemyTab.vue b/src/components/tabs/alchemy/AlchemyTab.vue
index 95e63b064..e3b10eddd 100644
--- a/src/components/tabs/alchemy/AlchemyTab.vue
+++ b/src/components/tabs/alchemy/AlchemyTab.vue
@@ -21,6 +21,7 @@ export default {
       alchemyCap: 0,
       capFactor: 0,
       createdRealityGlyph: false,
+      allReactionsDisabled: false
     };
   },
   computed: {
@@ -46,6 +47,12 @@ export default {
         "tutorial--glow": !this.createdRealityGlyph
       };
     },
+    reactions() {
+      return AlchemyReactions.all.compact().filter(r => r._product.isUnlocked);
+    }
+  },
+  created() {
+    this.updateReactionData();
   },
   methods: {
     update() {
@@ -79,6 +86,7 @@ export default {
       }
       if (resource.isBaseResource) return;
       resource.reaction.isActive = !resource.reaction.isActive;
+      this.updateReactionData();
       GameUI.update();
     },
     isUnlocked(reactionArrow) {
@@ -151,18 +159,22 @@ export default {
       Modal.h2p.show();
     },
     toggleAllReactions() {
-      const reactions = AlchemyReactions.all.compact().filter(r => r._product.isUnlocked);
-      const allReactionsDisabled = reactions.every(reaction => !reaction.isActive);
-      if (allReactionsDisabled) {
-        for (const reaction of reactions) {
+      if (this.allReactionsDisabled) {
+        for (const reaction of this.reactions) {
           reaction.isActive = true;
         }
       } else {
-        for (const reaction of reactions) {
+        for (const reaction of this.reactions) {
           reaction.isActive = false;
         }
       }
-      this.$forceUpdate();
+      // This is moreso here to force an update than anything but it also adds some info to the "Toggle all reactions"
+      // button, since its behaviour is unclear to the player- Would it want to disable/enable all if only some were on?
+      // This switches it to outright say disabled/enabled instead of toggle and also updates the reaction path colours
+      this.updateReactionData();
+    },
+    updateReactionData() {
+      this.allReactionsDisabled = this.reactions.every(reaction => !reaction.isActive);
     }
   }
 };
@@ -181,7 +193,7 @@ export default {
         class="o-primary-btn--subtab-option"
         @click="toggleAllReactions"
       >
-        Toggle all reactions
+        {{ allReactionsDisabled ? "Enable" : "Disable" }} all reactions
       </PrimaryButton>
       <PrimaryButton
         v-if="realityCreationVisible"

From 049113c2d97ee3ec0b3c7e8d5da0465bba3d49c4 Mon Sep 17 00:00:00 2001
From: Hirame1 <56225774+Hirame1@users.noreply.github.com>
Date: Tue, 3 May 2022 19:20:53 +0700
Subject: [PATCH 60/89] Address PR feedbacks

---
 src/components/tabs/alchemy/AlchemyTab.vue | 25 +++++-----------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/components/tabs/alchemy/AlchemyTab.vue b/src/components/tabs/alchemy/AlchemyTab.vue
index e3b10eddd..9919ad40e 100644
--- a/src/components/tabs/alchemy/AlchemyTab.vue
+++ b/src/components/tabs/alchemy/AlchemyTab.vue
@@ -48,12 +48,9 @@ export default {
       };
     },
     reactions() {
-      return AlchemyReactions.all.compact().filter(r => r._product.isUnlocked);
+      return AlchemyReactions.all.compact().filter(r => r.product.isUnlocked);
     }
   },
-  created() {
-    this.updateReactionData();
-  },
   methods: {
     update() {
       this.reactionsAvailable = AlchemyResources.all.filter(res => !res.isBaseResource && res.isUnlocked).length !== 0;
@@ -62,6 +59,7 @@ export default {
       this.alchemyCap = Ra.alchemyResourceCap;
       this.capFactor = 1 / GlyphSacrificeHandler.glyphRefinementEfficiency;
       this.createdRealityGlyph = player.reality.glyphs.createdRealityGlyph;
+      this.allReactionsDisabled = this.reactions.every(reaction => !reaction.isActive);
     },
     orbitSize(orbit) {
       const maxRadius = this.layout.orbits.map(o => o.radius).max();
@@ -86,7 +84,6 @@ export default {
       }
       if (resource.isBaseResource) return;
       resource.reaction.isActive = !resource.reaction.isActive;
-      this.updateReactionData();
       GameUI.update();
     },
     isUnlocked(reactionArrow) {
@@ -159,23 +156,11 @@ export default {
       Modal.h2p.show();
     },
     toggleAllReactions() {
-      if (this.allReactionsDisabled) {
-        for (const reaction of this.reactions) {
-          reaction.isActive = true;
-        }
-      } else {
-        for (const reaction of this.reactions) {
-          reaction.isActive = false;
-        }
+      const setIsActive = this.allReactionsDisabled;
+      for (const reaction of this.reactions) {
+        reaction.isActive = setIsActive;
       }
-      // This is moreso here to force an update than anything but it also adds some info to the "Toggle all reactions"
-      // button, since its behaviour is unclear to the player- Would it want to disable/enable all if only some were on?
-      // This switches it to outright say disabled/enabled instead of toggle and also updates the reaction path colours
-      this.updateReactionData();
     },
-    updateReactionData() {
-      this.allReactionsDisabled = this.reactions.every(reaction => !reaction.isActive);
-    }
   }
 };
 </script>

From 94c4014e7a02c876368390575a525e085128f249 Mon Sep 17 00:00:00 2001
From: Hirame1 <56225774+Hirame1@users.noreply.github.com>
Date: Wed, 4 May 2022 23:54:19 +0700
Subject: [PATCH 61/89] Improve design of Reality Glyph creation modal

---
 .../modals/RealityGlyphCreationModal.vue      | 85 +++++++++++--------
 1 file changed, 50 insertions(+), 35 deletions(-)

diff --git a/src/components/modals/RealityGlyphCreationModal.vue b/src/components/modals/RealityGlyphCreationModal.vue
index 76f5a0925..8702bf625 100644
--- a/src/components/modals/RealityGlyphCreationModal.vue
+++ b/src/components/modals/RealityGlyphCreationModal.vue
@@ -51,44 +51,59 @@ export default {
 </script>
 
 <template>
-  <ModalWrapper class="c-reality-glyph-creation">
+  <ModalWrapper>
     <template #header>
       Reality Glyph Creation
     </template>
-    <div>
-      Create a level {{ formatInt(realityGlyphLevel) }} Reality Glyph.
-      Rarity will always be {{ formatPercents(1) }}
-      and level scales on your current reality resource amount (which is all consumed). All other alchemy resources will
-      be unaffected. Reality Glyphs have unique effects, some of which are only available with higher level Glyphs.
-      Reality Glyphs can also be sacrificed to increase the yield from alchemy reactions. Like Effarig Glyphs,
-      you cannot equip more than one at the same time.
+    <div class="c-reality-glyph-creation">
+      <div>
+        Create a level {{ formatInt(realityGlyphLevel) }} Reality Glyph.
+        Rarity will always be {{ formatPercents(1) }} and
+        level scales on your current reality resource amount (which is all consumed). All other alchemy resources will
+        be unaffected. Reality Glyphs have unique effects, some of which are only available with higher level Glyphs.
+        Reality Glyphs can also be sacrificed to increase the yield from alchemy reactions. Like Effarig Glyphs,
+        you cannot equip more than one at the same time.
+      </div>
+      <div class="o-available-effects-margin">
+        <div class="o-available-effects">
+          Available Effects:
+        </div>
+        <div
+          v-for="(effect, index) in possibleEffects"
+          :key="index"
+        >
+          {{ formatGlyphEffect(effect) }}
+        </div>
+      </div>
+      <PrimaryButton
+        v-if="isDoomed"
+        :enabled="false"
+      >
+        You cannot create Reality Glyphs while in Doomed
+      </PrimaryButton>
+      <PrimaryButton
+        v-else-if="realityGlyphLevel !== 0"
+        class="c-modal__confirm-btn"
+        @click="createRealityGlyph"
+      >
+        Create a Reality Glyph!
+      </PrimaryButton>
+      <PrimaryButton
+        v-else
+        :enabled="false"
+      >
+        Reality Glyph level must be higher than {{ formatInt(0) }}
+      </PrimaryButton>
     </div>
-    <div>
-      Available Effects:
-    </div>
-    <div
-      v-for="(effect, index) in possibleEffects"
-      :key="index"
-    >
-      {{ formatGlyphEffect(effect) }}
-    </div><br>
-    <PrimaryButton
-      v-if="isDoomed"
-      :enabled="false"
-    >
-      You cannot create Reality Glyphs while in Doomed
-    </PrimaryButton>
-    <PrimaryButton
-      v-else-if="realityGlyphLevel !== 0"
-      @click="createRealityGlyph"
-    >
-      Create a Reality Glyph!
-    </PrimaryButton>
-    <PrimaryButton
-      v-else
-      :enabled="false"
-    >
-      Reality Glyph level must be higher than {{ formatInt(0) }}
-    </PrimaryButton>
   </ModalWrapper>
 </template>
+
+<style scoped>
+.o-available-effects-margin {
+  margin: 1.5rem 0 2rem;
+}
+
+.o-available-effects {
+  font-weight: bold;
+}
+</style>
\ No newline at end of file

From be1a7de3bf5a5bfd625890609e941db8a7056490 Mon Sep 17 00:00:00 2001
From: Hirame1 <56225774+Hirame1@users.noreply.github.com>
Date: Thu, 5 May 2022 18:59:03 +0700
Subject: [PATCH 62/89] Adjust layout for consistency

---
 public/stylesheets/styles.css                       | 2 --
 src/components/modals/RealityGlyphCreationModal.vue | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index 1eb4d4f27..a56ed48de 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -7768,8 +7768,6 @@ kbd {
   display: flex;
   flex-direction: column;
   width: 60rem;
-  text-align: left;
-  font-size: 1.2rem;
   padding: 0.25rem 1rem;
 }
 
diff --git a/src/components/modals/RealityGlyphCreationModal.vue b/src/components/modals/RealityGlyphCreationModal.vue
index 8702bf625..dbf50de26 100644
--- a/src/components/modals/RealityGlyphCreationModal.vue
+++ b/src/components/modals/RealityGlyphCreationModal.vue
@@ -64,7 +64,7 @@ export default {
         Reality Glyphs can also be sacrificed to increase the yield from alchemy reactions. Like Effarig Glyphs,
         you cannot equip more than one at the same time.
       </div>
-      <div class="o-available-effects-margin">
+      <div class="o-available-effects-container">
         <div class="o-available-effects">
           Available Effects:
         </div>
@@ -83,7 +83,6 @@ export default {
       </PrimaryButton>
       <PrimaryButton
         v-else-if="realityGlyphLevel !== 0"
-        class="c-modal__confirm-btn"
         @click="createRealityGlyph"
       >
         Create a Reality Glyph!
@@ -99,7 +98,7 @@ export default {
 </template>
 
 <style scoped>
-.o-available-effects-margin {
+.o-available-effects-container {
   margin: 1.5rem 0 2rem;
 }
 

From aad85bd7438979705a0fd8dc86956aeb3cd675af Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Mon, 16 May 2022 12:08:02 -0700
Subject: [PATCH 63/89] convert modalConfig to v-bind

---
 src/components/GlyphSetPreview.vue            |  2 -
 .../modals/AutomatorScriptTemplate.vue        | 40 ++++++++++------
 src/components/modals/AwayProgressModal.vue   | 26 +++++-----
 .../modals/DeleteAutomatorScriptModal.vue     |  6 +--
 .../modals/GlyphSetSaveDeleteModal.vue        |  8 ++--
 .../modals/GlyphShowcasePanelModal.vue        | 47 ++++++++++++-------
 src/components/modals/H2PModal.vue            |  8 +---
 src/components/modals/PopupModal.vue          |  2 +
 src/components/modals/ReplaceGlyphModal.vue   | 14 ++++--
 src/components/modals/StudyStringModal.vue    | 10 ++--
 .../glyph-management/DeleteGlyphModal.vue     |  8 ++--
 .../glyph-management/PurgeGlyphModal.vue      |  7 +--
 .../glyph-management/RefineGlyphModal.vue     |  8 ++--
 .../glyph-management/SacrificeGlyphModal.vue  |  8 ++--
 .../modals/prestige/AntimatterGalaxyModal.vue |  5 +-
 .../modals/prestige/DimensionBoostModal.vue   |  5 +-
 .../modals/prestige/EnterCelestialsModal.vue  | 20 ++++----
 src/components/tabs/glyphs/EquippedGlyphs.vue |  3 --
 src/components/tabs/glyphs/GlyphPeek.vue      |  1 -
 19 files changed, 123 insertions(+), 105 deletions(-)

diff --git a/src/components/GlyphSetPreview.vue b/src/components/GlyphSetPreview.vue
index 86b9babd6..1eaa89d9e 100644
--- a/src/components/GlyphSetPreview.vue
+++ b/src/components/GlyphSetPreview.vue
@@ -78,8 +78,6 @@ export default {
         name: this.text,
         glyphSet: this.glyphs,
         closeOn: GAME_EVENT.GLYPH_SET_SAVE_CHANGE,
-        isGlyphSelection: false,
-        showSetName: true,
         displaySacrifice: this.showSacrifice,
       });
     }
diff --git a/src/components/modals/AutomatorScriptTemplate.vue b/src/components/modals/AutomatorScriptTemplate.vue
index 8e957693f..13e5ec211 100644
--- a/src/components/modals/AutomatorScriptTemplate.vue
+++ b/src/components/modals/AutomatorScriptTemplate.vue
@@ -7,9 +7,21 @@ export default {
     ModalWrapper,
   },
   props: {
-    modalConfig: {
-      type: Object,
-      required: true
+    warnings: {
+      type: Function,
+      required: true,
+    },
+    name: {
+      type: String,
+      required: true,
+    },
+    description: {
+      type: String,
+      required: true,
+    },
+    inputs: {
+      type: Array,
+      required: true,
     }
   },
   data() {
@@ -24,14 +36,14 @@ export default {
   computed: {
     presets: () => player.timestudy.presets,
     params: () => GameDatabase.reality.automator.templates.paramTypes,
-    warnings() {
+    validWarnings() {
       return this.invalidInputCount === 0
-        ? this.modalConfig.warnings().concat(this.templateScript?.warnings)
-        : this.modalConfig.warnings();
+        ? this.warnings().concat(this.templateScript?.warnings)
+        : this.warnings();
     },
     templateScript() {
       if (this.invalidInputCount !== 0) return null;
-      return new ScriptTemplate(this.templateProps, this.modalConfig.name);
+      return new ScriptTemplate(this.templateProps, this.name);
     }
   },
   // Many props in this component are generated dynamically from a GameDB entry, but Vue can only give reactive
@@ -39,7 +51,7 @@ export default {
   // specifically $set them here on initialization; additionally we give them a default value so that later function
   // calls don't error out from undefined inputs.
   created() {
-    for (const input of this.modalConfig.inputs) {
+    for (const input of this.inputs) {
       const boolProp = this.paramTypeObject(input.type).boolDisplay;
       if (boolProp) {
         this.$set(this.templateInputs, input.name, false);
@@ -77,7 +89,7 @@ export default {
     updateTemplateProps() {
       this.templateProps = {};
       this.invalidInputCount = 0;
-      for (const input of this.modalConfig.inputs) {
+      for (const input of this.inputs) {
         const typeObj = this.paramTypeObject(input.type);
         const mapFn = x => (typeObj.map ? typeObj.map(x) : x);
         this.templateProps[input.name] = mapFn(this.templateInputs[input.name]);
@@ -108,10 +120,10 @@ export default {
 <template>
   <ModalWrapper class="c-automator-template-container">
     <template #header>
-      {{ modalConfig.name }} Template
+      {{ name }} Template
     </template>
     <div class="c-automator-template-description">
-      {{ modalConfig.description }}
+      {{ description }}
     </div>
     <div class="c-automator-template-inputs">
       <b>Required Information:</b>
@@ -132,7 +144,7 @@ export default {
         <i>Current Tree</i>
       </button>
       <div
-        v-for="input in modalConfig.inputs"
+        v-for="input in inputs"
         :key="input.name"
         class="c-automator-template-entry"
       >
@@ -159,9 +171,9 @@ export default {
     </div>
     <div class="c-automator-template-warnings">
       <b>Possible things to consider:</b>
-      <div v-if="warnings.length !== 0">
+      <div v-if="validWarnings.length !== 0">
         <div
-          v-for="warning in warnings"
+          v-for="warning in validWarnings"
           :key="warning"
           class="c-automator-template-entry"
         >
diff --git a/src/components/modals/AwayProgressModal.vue b/src/components/modals/AwayProgressModal.vue
index 7860f3330..5b38b9e5a 100644
--- a/src/components/modals/AwayProgressModal.vue
+++ b/src/components/modals/AwayProgressModal.vue
@@ -9,10 +9,18 @@ export default {
     ModalWrapper,
   },
   props: {
-    modalConfig: {
+    playerBefore: {
       type: Object,
-      required: true
-    }
+      required: true,
+    },
+    playerAfter: {
+      type: Object,
+      required: true,
+    },
+    seconds: {
+      type: Number,
+      required: true,
+    },
   },
   data() {
     return {
@@ -23,17 +31,11 @@ export default {
     nothingHappened() {
       return Theme.current().name === "S9";
     },
-    before() {
-      return this.modalConfig.playerBefore;
-    },
-    after() {
-      return this.modalConfig.playerAfter;
-    },
     offlineStats() {
       return AwayProgressTypes.appearsInAwayModal;
     },
     headerText() {
-      const timeDisplay = TimeSpan.fromSeconds(this.modalConfig.seconds).toString();
+      const timeDisplay = TimeSpan.fromSeconds(this.seconds).toString();
       if (this.nothingHappened || !this.somethingHappened) {
         return `While you were away for ${timeDisplay}... Nothing happened.`;
       }
@@ -62,8 +64,8 @@ export default {
         v-for="name of offlineStats"
         :key="name"
         :name="name"
-        :player-before="before"
-        :player-after="after"
+        :player-before="playerBefore"
+        :player-after="playerAfter"
         @something-happened="somethingHappened = true"
       />
     </div>
diff --git a/src/components/modals/DeleteAutomatorScriptModal.vue b/src/components/modals/DeleteAutomatorScriptModal.vue
index 9ab37409b..b8ed75570 100644
--- a/src/components/modals/DeleteAutomatorScriptModal.vue
+++ b/src/components/modals/DeleteAutomatorScriptModal.vue
@@ -7,8 +7,8 @@ export default {
     ModalWrapperChoice
   },
   props: {
-    modalConfig: {
-      type: Object,
+    scriptID: {
+      type: [String, Number],
       required: true
     }
   },
@@ -19,7 +19,7 @@ export default {
   },
   methods: {
     handleYesClick() {
-      const script = this.modalConfig.scriptID;
+      const script = this.scriptID;
       const runningScriptID = AutomatorBackend.state.topLevelScript;
 
       AutomatorBackend.deleteScript(script);
diff --git a/src/components/modals/GlyphSetSaveDeleteModal.vue b/src/components/modals/GlyphSetSaveDeleteModal.vue
index 21dad7beb..0b233b283 100644
--- a/src/components/modals/GlyphSetSaveDeleteModal.vue
+++ b/src/components/modals/GlyphSetSaveDeleteModal.vue
@@ -9,8 +9,8 @@ export default {
     GlyphSetPreview
   },
   props: {
-    modalConfig: {
-      type: Object,
+    glyphSetId: {
+      type: Number,
       required: true
     }
   },
@@ -21,10 +21,10 @@ export default {
   },
   methods: {
     update() {
-      this.glyphSet = Glyphs.copyForRecords(player.reality.glyphs.sets[this.modalConfig.glyphSetId].glyphs);
+      this.glyphSet = Glyphs.copyForRecords(player.reality.glyphs.sets[this.glyphSetId].glyphs);
     },
     handleYesClick() {
-      player.reality.glyphs.sets[this.modalConfig.glyphSetId].glyphs = [];
+      player.reality.glyphs.sets[this.glyphSetId].glyphs = [];
       EventHub.dispatch(GAME_EVENT.GLYPH_SET_SAVE_CHANGE);
     },
   },
diff --git a/src/components/modals/GlyphShowcasePanelModal.vue b/src/components/modals/GlyphShowcasePanelModal.vue
index c1f3f845d..17767237a 100644
--- a/src/components/modals/GlyphShowcasePanelModal.vue
+++ b/src/components/modals/GlyphShowcasePanelModal.vue
@@ -11,16 +11,30 @@ export default {
     GlyphShowcasePanelEntry,
   },
   props: {
-    modalConfig: {
-      type: Object,
-      required: true,
-      name: String,
-      glyphSet: Array,
-      closeOn: String,
-      isGlyphSelection: Boolean,
-      showSetName: Boolean,
-      displaySacrifice: Boolean,
-    }
+    name: {
+      type: String,
+      required: true
+    },
+    glyphSet: {
+      type: Array,
+      required: true
+    },
+    closeOn: {
+      type: String,
+      required: true
+    },
+    isGlyphSelection: {
+      type: Boolean,
+      default: false
+    },
+    showSetName: {
+      type: Boolean,
+      default: true
+    },
+    displaySacrifice: {
+      type: Boolean,
+      default: true
+    },
   },
   data() {
     return {
@@ -31,9 +45,6 @@ export default {
     };
   },
   computed: {
-    isGlyphSelection() {
-      return this.modalConfig.isGlyphSelection;
-    },
     maxGlyphEffects() {
       let maxEffects = 1;
       for (const glyph of this.glyphs) {
@@ -43,13 +54,13 @@ export default {
     },
   },
   created() {
-    this.on$(this.modalConfig.closeOn, this.emitClose);
+    this.on$(this.closeOn, this.emitClose);
   },
   methods: {
     update() {
       this.glyphs = this.isGlyphSelection
         ? GlyphSelection.glyphList(GlyphSelection.choiceCount, gainedGlyphLevel(), { isChoosingGlyph: false })
-        : this.modalConfig.glyphSet.filter(x => x);
+        : this.glyphSet.filter(x => x);
       this.gainedLevel = gainedGlyphLevel().actualLevel;
       // There should only be one reality glyph; this picks one pseudo-randomly if multiple are cheated/glitched in
       const realityGlyph = this.glyphs.filter(g => g.type === "reality")[0];
@@ -64,13 +75,13 @@ export default {
 <template>
   <ModalWrapper>
     <template #header>
-      {{ modalConfig.name }}
+      {{ name }}
     </template>
     <div v-if="isGlyphSelection">
       Projected Glyph Level: {{ formatInt(gainedLevel) }}
     </div>
     <GlyphSetName
-      v-if="modalConfig.showSetName"
+      v-if="showSetName"
       :glyph-set="glyphs"
       :force-color="true"
     />
@@ -84,7 +95,7 @@ export default {
         :show-level="!isGlyphSelection"
         :reality-glyph-boost="realityGlyphBoost"
         :max-glyph-effects="maxGlyphEffects"
-        :show-sacrifice="modalConfig.displaySacrifice"
+        :show-sacrifice="displaySacrifice"
       />
     </div>
   </ModalWrapper>
diff --git a/src/components/modals/H2PModal.vue b/src/components/modals/H2PModal.vue
index e44929af8..4a04fe23c 100644
--- a/src/components/modals/H2PModal.vue
+++ b/src/components/modals/H2PModal.vue
@@ -6,12 +6,6 @@ export default {
   components: {
     ModalCloseButton,
   },
-  props: {
-    modalConfig: {
-      required: true,
-      type: Object,
-    }
-  },
   data() {
     return {
       tabId: 0,
@@ -123,4 +117,4 @@ export default {
 .s-base--dark .o-h2p-tab-button--first-irrelevant {
   border-top-color: white;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/modals/PopupModal.vue b/src/components/modals/PopupModal.vue
index c831348cb..17ae175f8 100644
--- a/src/components/modals/PopupModal.vue
+++ b/src/components/modals/PopupModal.vue
@@ -35,6 +35,7 @@ export default {
   <component
     :is="modal.component"
     v-if="modal.isBare && !forceDontShowModal"
+    v-bind="modal.props"
     :modal-config="modal.props"
   />
   <div
@@ -43,6 +44,7 @@ export default {
   >
     <component
       :is="modal.component"
+      v-bind="modal.props"
       :modal-config="modal.props"
       @close="hide"
     />
diff --git a/src/components/modals/ReplaceGlyphModal.vue b/src/components/modals/ReplaceGlyphModal.vue
index 7ab57cedb..49af966dc 100644
--- a/src/components/modals/ReplaceGlyphModal.vue
+++ b/src/components/modals/ReplaceGlyphModal.vue
@@ -7,21 +7,25 @@ export default {
     ModalWrapperChoice
   },
   props: {
-    modalConfig: {
-      type: Object,
+    targetSlot: {
+      type: Number,
+      required: true
+    },
+    inventoryIndex: {
+      type: Number,
       required: true
     }
   },
   data() {
     return {
-      targetSlot: 0,
+      target: 0,
       idx: 0,
     };
   },
   methods: {
     update() {
-      this.targetSlot = this.modalConfig.targetSlot;
-      this.idx = this.modalConfig.inventoryIndex;
+      this.target = this.targetSlot;
+      this.idx = this.inventoryIndex;
       this.glyph = Glyphs.findByInventoryIndex(this.idx);
     },
     handleYesClick() {
diff --git a/src/components/modals/StudyStringModal.vue b/src/components/modals/StudyStringModal.vue
index aee83ad80..072c284a4 100644
--- a/src/components/modals/StudyStringModal.vue
+++ b/src/components/modals/StudyStringModal.vue
@@ -13,8 +13,8 @@ export default {
     PrimaryButton
   },
   props: {
-    modalConfig: {
-      type: Object,
+    id: {
+      type: Number,
       required: true,
     }
   },
@@ -28,7 +28,7 @@ export default {
     // This modal is used by both study importing and preset editing but only has a prop actually passed in when
     // editing (which is the preset index). Needs to be an undefined check because index can be zero
     isImporting() {
-      return this.modalConfig.id === undefined;
+      return this.id === undefined;
     },
     // This represents the state reached from importing into an empty tree
     importedTree() {
@@ -121,7 +121,7 @@ export default {
   },
   // Needs to be assigned in created() or else they will end up being undefined when importing
   created() {
-    const preset = player.timestudy.presets[this.modalConfig.id];
+    const preset = player.timestudy.presets[this.id];
     this.input = preset ? preset.studies : "";
     this.name = preset ? preset.name : "";
   },
@@ -146,7 +146,7 @@ export default {
     },
     savePreset() {
       if (this.inputIsValid) {
-        player.timestudy.presets[this.modalConfig.id].studies = this.input;
+        player.timestudy.presets[this.id].studies = this.input;
         GameUI.notify.eternity(`Study Tree ${this.name} successfully edited.`);
         this.emitClose();
       }
diff --git a/src/components/modals/glyph-management/DeleteGlyphModal.vue b/src/components/modals/glyph-management/DeleteGlyphModal.vue
index ec045a845..baaf8b86b 100644
--- a/src/components/modals/glyph-management/DeleteGlyphModal.vue
+++ b/src/components/modals/glyph-management/DeleteGlyphModal.vue
@@ -7,8 +7,8 @@ export default {
     ModalWrapperChoice
   },
   props: {
-    modalConfig: {
-      type: Object,
+    idx: {
+      type: Number,
       required: true
     }
   },
@@ -19,12 +19,12 @@ export default {
   },
   computed: {
     glyph() {
-      return Glyphs.findByInventoryIndex(this.modalConfig.idx);
+      return Glyphs.findByInventoryIndex(this.idx);
     },
   },
   methods: {
     update() {
-      const newGlyph = Glyphs.findByInventoryIndex(this.modalConfig.idx);
+      const newGlyph = Glyphs.findByInventoryIndex(this.idx);
       if (this.glyph !== newGlyph && this.confirmedDelete) {
 
         // Why is confirmedDelete here: refer to SacrificeGlyphModal.vue
diff --git a/src/components/modals/glyph-management/PurgeGlyphModal.vue b/src/components/modals/glyph-management/PurgeGlyphModal.vue
index a6717d05a..a087018b7 100644
--- a/src/components/modals/glyph-management/PurgeGlyphModal.vue
+++ b/src/components/modals/glyph-management/PurgeGlyphModal.vue
@@ -7,8 +7,8 @@ export default {
     ModalWrapperChoice
   },
   props: {
-    modalConfig: {
-      type: Object,
+    harsh: {
+      type: Boolean,
       required: true
     }
   },
@@ -19,9 +19,6 @@ export default {
     };
   },
   computed: {
-    harsh() {
-      return this.modalConfig.harsh;
-    },
     threshold() {
       return this.harsh ? 1 : 5;
     },
diff --git a/src/components/modals/glyph-management/RefineGlyphModal.vue b/src/components/modals/glyph-management/RefineGlyphModal.vue
index 9feac2c93..cb2a72ebb 100644
--- a/src/components/modals/glyph-management/RefineGlyphModal.vue
+++ b/src/components/modals/glyph-management/RefineGlyphModal.vue
@@ -7,8 +7,8 @@ export default {
     ModalWrapperChoice
   },
   props: {
-    modalConfig: {
-      type: Object,
+    idx: {
+      type: Number,
       required: true
     }
   },
@@ -24,7 +24,7 @@ export default {
   },
   computed: {
     glyph() {
-      return Glyphs.findByInventoryIndex(this.modalConfig.idx);
+      return Glyphs.findByInventoryIndex(this.idx);
     },
     resource() {
       return GlyphSacrificeHandler.glyphAlchemyResource(this.glyph);
@@ -43,7 +43,7 @@ export default {
 
       this.after = this.resourceAmount + this.gain;
 
-      const newGlyph = Glyphs.findByInventoryIndex(this.modalConfig.idx);
+      const newGlyph = Glyphs.findByInventoryIndex(this.idx);
       if (this.glyph !== newGlyph && !this.confirmedRefine) {
 
         // Why is confirmedRefine here: refer to SacrificeGlyphModal.vue
diff --git a/src/components/modals/glyph-management/SacrificeGlyphModal.vue b/src/components/modals/glyph-management/SacrificeGlyphModal.vue
index 20f3a62bd..daecc81d6 100644
--- a/src/components/modals/glyph-management/SacrificeGlyphModal.vue
+++ b/src/components/modals/glyph-management/SacrificeGlyphModal.vue
@@ -7,8 +7,8 @@ export default {
     ModalWrapperChoice
   },
   props: {
-    modalConfig: {
-      type: Object,
+    idx: {
+      type: Number,
       required: true
     }
   },
@@ -21,7 +21,7 @@ export default {
   },
   computed: {
     glyph() {
-      return Glyphs.findByInventoryIndex(this.modalConfig.idx);
+      return Glyphs.findByInventoryIndex(this.idx);
     },
     message() {
       return `Do you really want to sacrifice this Glyph? Your total power of sacrificed ${this.glyph.type}
@@ -34,7 +34,7 @@ export default {
       this.currentGlyphSacrifice = player.reality.glyphs.sac[this.glyph.type];
       this.gain = GlyphSacrificeHandler.glyphSacrificeGain(this.glyph);
 
-      const newGlyph = Glyphs.findByInventoryIndex(this.modalConfig.idx);
+      const newGlyph = Glyphs.findByInventoryIndex(this.idx);
       if (this.glyph !== newGlyph && !this.confirmedSacrifice) {
 
         // ConfirmedSacrifice is here because when you sac a glyph with confirmation it
diff --git a/src/components/modals/prestige/AntimatterGalaxyModal.vue b/src/components/modals/prestige/AntimatterGalaxyModal.vue
index 293a6c805..0bbfe8acd 100644
--- a/src/components/modals/prestige/AntimatterGalaxyModal.vue
+++ b/src/components/modals/prestige/AntimatterGalaxyModal.vue
@@ -7,8 +7,8 @@ export default {
     ModalWrapperChoice
   },
   props: {
-    modalConfig: {
-      type: Object,
+    bulk: {
+      type: Number,
       required: true,
     }
   },
@@ -21,7 +21,6 @@ export default {
     };
   },
   computed: {
-    bulk() { return this.modalConfig.bulk; },
     topLabel() {
       if (this.bulk) return `You are about to purchase ${quantifyInt("Antimatter Galaxy", this.newGalaxies)}`;
       return `You are about to purchase an Antimatter Galaxy`;
diff --git a/src/components/modals/prestige/DimensionBoostModal.vue b/src/components/modals/prestige/DimensionBoostModal.vue
index 22c3157f3..2ffed8ef7 100644
--- a/src/components/modals/prestige/DimensionBoostModal.vue
+++ b/src/components/modals/prestige/DimensionBoostModal.vue
@@ -7,13 +7,12 @@ export default {
     ModalWrapperChoice
   },
   props: {
-    modalConfig: {
-      type: Object,
+    bulk: {
+      type: Number,
       required: true,
     }
   },
   computed: {
-    bulk() { return this.modalConfig.bulk; },
     topLabel() {
       return `You are about to do a Dimension Boost Reset`;
     },
diff --git a/src/components/modals/prestige/EnterCelestialsModal.vue b/src/components/modals/prestige/EnterCelestialsModal.vue
index 1d248f41b..34f921385 100644
--- a/src/components/modals/prestige/EnterCelestialsModal.vue
+++ b/src/components/modals/prestige/EnterCelestialsModal.vue
@@ -9,20 +9,24 @@ export default {
     EnterCelestialsRaPet,
   },
   props: {
-    modalConfig: {
-      type: Object,
+    number: {
+      type: Number,
       required: true,
+    },
+    name: {
+      type: String,
+      required: true
     }
   },
   computed: {
     description() {
-      return GameDatabase.celestials.descriptions[this.modalConfig.number].description().split("\n");
+      return GameDatabase.celestials.descriptions[this.number].description().split("\n");
     },
     topLabel() {
-      return `${this.modalConfig.name} Reality`;
+      return `${this.name} Reality`;
     },
     message() {
-      return `Perform a Reality reset, and enter ${this.modalConfig.name} Reality, in which`;
+      return `Perform a Reality reset, and enter ${this.name} Reality, in which`;
     },
   },
   methods: {
@@ -37,7 +41,7 @@ export default {
       const laitelaFastest = player.celestials.laitela.fastestCompletion;
       const laitalaTime = TimeSpan.fromSeconds(laitelaFastest).toStringShort();
 
-      switch (this.modalConfig.number) {
+      switch (this.number) {
         case 0: return `Your highest Teresa completetion was for ${format(teresaBestAM, 2, 2)}
           antimatter, gaining you a ${formatX(teresaRunMult, 2)} multiplier to Glyph Sacrifice power.`;
         case 1: return `${effarigDone
@@ -64,7 +68,7 @@ export default {
     },
     handleYesClick() {
       beginProcessReality(getRealityProps(true));
-      switch (this.modalConfig.number) {
+      switch (this.number) {
         case 0: return Teresa.initializeRun();
         case 1: return Effarig.initializeRun();
         case 2: return Enslaved.initializeRun();
@@ -95,7 +99,7 @@ export default {
       <div>
         {{ extraLine() }}
       </div>
-      <span v-if="modalConfig.number === 4">
+      <span v-if="number === 4">
         <EnterCelestialsRaPet
           v-for="id in 4"
           :key="id"
diff --git a/src/components/tabs/glyphs/EquippedGlyphs.vue b/src/components/tabs/glyphs/EquippedGlyphs.vue
index 1fa72866d..2d875c914 100644
--- a/src/components/tabs/glyphs/EquippedGlyphs.vue
+++ b/src/components/tabs/glyphs/EquippedGlyphs.vue
@@ -130,9 +130,6 @@ export default {
         name: "Equipped Glyphs",
         glyphSet: this.glyphs,
         closeOn: GAME_EVENT.GLYPHS_EQUIPPED_CHANGED,
-        isGlyphSelection: false,
-        showSetName: true,
-        displaySacrifice: true,
       });
     },
     clickGlyph(glyph, idx) {
diff --git a/src/components/tabs/glyphs/GlyphPeek.vue b/src/components/tabs/glyphs/GlyphPeek.vue
index b6ce74b18..911cf93ac 100644
--- a/src/components/tabs/glyphs/GlyphPeek.vue
+++ b/src/components/tabs/glyphs/GlyphPeek.vue
@@ -57,7 +57,6 @@ export default {
         closeOn: GAME_EVENT.REALITY_RESET_AFTER,
         isGlyphSelection: true,
         showSetName: false,
-        displaySacrifice: true,
       });
     }
   }

From 94ce35f5a10caa8f4e5fe175e2ff7147bad18071 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Mon, 16 May 2022 12:13:17 -0700
Subject: [PATCH 64/89] remove excess $viewModel and convert rest to props

---
 javascripts/core/app/modal.js                     |  3 +--
 .../modals/DeleteAutomatorScriptModal.vue         |  5 -----
 .../challenges/EternityChallengeStartModal.vue    | 13 ++++++++-----
 .../challenges/InfinityChallengeStartModal.vue    | 15 +++++++++------
 .../challenges/NormalChallengeStartModal.vue      | 13 ++++++++-----
 .../DeleteCompanionGlyphModal.vue                 |  3 ---
 .../modals/prestige/EnterDilationModal.vue        |  3 ---
 7 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js
index faaf3ad85..4b881e243 100644
--- a/javascripts/core/app/modal.js
+++ b/javascripts/core/app/modal.js
@@ -132,8 +132,7 @@ export class Modal {
 
 class ChallengeConfirmationModal extends Modal {
   show(id) {
-    this.id = id;
-    super.show();
+    super.show({ id });
   }
 }
 
diff --git a/src/components/modals/DeleteAutomatorScriptModal.vue b/src/components/modals/DeleteAutomatorScriptModal.vue
index b8ed75570..e9e6e4ba1 100644
--- a/src/components/modals/DeleteAutomatorScriptModal.vue
+++ b/src/components/modals/DeleteAutomatorScriptModal.vue
@@ -12,11 +12,6 @@ export default {
       required: true
     }
   },
-  computed: {
-    modal() {
-      return this.$viewModel.modal.current;
-    },
-  },
   methods: {
     handleYesClick() {
       const script = this.scriptID;
diff --git a/src/components/modals/challenges/EternityChallengeStartModal.vue b/src/components/modals/challenges/EternityChallengeStartModal.vue
index 38e108bc3..7ebbd5827 100644
--- a/src/components/modals/challenges/EternityChallengeStartModal.vue
+++ b/src/components/modals/challenges/EternityChallengeStartModal.vue
@@ -6,16 +6,19 @@ export default {
   components: {
     ModalWrapperChoice
   },
+  props: {
+    id: {
+      type: Number,
+      required: true
+    }
+  },
   computed: {
     challenge() {
-      return EternityChallenge(this.modal.id);
+      return EternityChallenge(this.id);
     },
     challengeIsCompleted() {
       return this.challenge.isFullyCompleted;
     },
-    modal() {
-      return this.$viewModel.modal.current;
-    },
     message() {
       return `You will Eternity, if possible, and start a new Eternity within the Challenge, with all the
         Challenge-specific restrictions and modifiers active.
@@ -25,7 +28,7 @@ export default {
         ${formatInt(5)} times, with increasing goals and bonuses.`;
     },
     entranceLabel() {
-      return `You are about to enter Eternity Challenge ${this.modal.id}`;
+      return `You are about to enter Eternity Challenge ${this.id}`;
     },
     reward() {
       let rewardDescription = this.challenge._config.reward.description;
diff --git a/src/components/modals/challenges/InfinityChallengeStartModal.vue b/src/components/modals/challenges/InfinityChallengeStartModal.vue
index 4e725aa3b..12f8b6a38 100644
--- a/src/components/modals/challenges/InfinityChallengeStartModal.vue
+++ b/src/components/modals/challenges/InfinityChallengeStartModal.vue
@@ -6,26 +6,29 @@ export default {
   components: {
     ModalWrapperChoice
   },
+  props: {
+    id: {
+      type: Number,
+      required: true
+    }
+  },
   computed: {
     challenge() {
-      return InfinityChallenge(this.modal.id);
+      return InfinityChallenge(this.id);
     },
     challengeIsCompleted() {
       return this.challenge.isCompleted;
     },
-    modal() {
-      return this.$viewModel.modal.current;
-    },
     message() {
       return `You will Big Crunch, if possible, and start a new Infinity within the Challenge, with all the
         Challenge-specific restrictions and modifiers active.
         To complete the Challenge${this.challengeIsCompleted ? "" : " and gain its reward"},
         you must reach the Challenge goal of
-        ${format(InfinityChallenge(this.modal.id).goal)} Antimatter.
+        ${format(InfinityChallenge(this.id).goal)} Antimatter.
         You do not start with any Dimension Boosts or Galaxies, regardless of upgrades.`;
     },
     entranceLabel() {
-      return `You are about to enter Infinity Challenge ${this.modal.id}`;
+      return `You are about to enter Infinity Challenge ${this.id}`;
     },
     reward() {
       let rewardDescription = this.challenge._config.reward.description;
diff --git a/src/components/modals/challenges/NormalChallengeStartModal.vue b/src/components/modals/challenges/NormalChallengeStartModal.vue
index 3b22d2da6..38f965994 100644
--- a/src/components/modals/challenges/NormalChallengeStartModal.vue
+++ b/src/components/modals/challenges/NormalChallengeStartModal.vue
@@ -6,16 +6,19 @@ export default {
   components: {
     ModalWrapperChoice
   },
+  props: {
+    id: {
+      type: Number,
+      required: true
+    }
+  },
   computed: {
     challenge() {
-      return NormalChallenge(this.modal.id);
+      return NormalChallenge(this.id);
     },
     challengeIsCompleted() {
       return this.challenge.isCompleted;
     },
-    modal() {
-      return this.$viewModel.modal.current;
-    },
     message() {
       return `You will Big Crunch, if possible, and start a new Infinity within the Challenge, with all the
         Challenge-specific restrictions and modifiers active.
@@ -24,7 +27,7 @@ export default {
         You do not start with any Dimension Boosts or Galaxies, regardless of upgrades.`;
     },
     entranceLabel() {
-      return `You are about to enter Challenge ${this.modal.id}`;
+      return `You are about to enter Challenge ${this.id}`;
     },
     reward() {
       return `The reward for completing this challenge is: ${this.challenge._config.reward}`;
diff --git a/src/components/modals/glyph-management/DeleteCompanionGlyphModal.vue b/src/components/modals/glyph-management/DeleteCompanionGlyphModal.vue
index f406af7f3..eb3828711 100644
--- a/src/components/modals/glyph-management/DeleteCompanionGlyphModal.vue
+++ b/src/components/modals/glyph-management/DeleteCompanionGlyphModal.vue
@@ -12,9 +12,6 @@ export default {
     };
   },
   computed: {
-    modal() {
-      return this.$viewModel.modal.current;
-    },
     message() {
       switch (this.messageIndex) {
         case 0: return "Are you sure you want to get rid of your Companion Glyph?";
diff --git a/src/components/modals/prestige/EnterDilationModal.vue b/src/components/modals/prestige/EnterDilationModal.vue
index daf1cac5c..ef5375d74 100644
--- a/src/components/modals/prestige/EnterDilationModal.vue
+++ b/src/components/modals/prestige/EnterDilationModal.vue
@@ -7,9 +7,6 @@ export default {
     ModalWrapperChoice
   },
   computed: {
-    modal() {
-      return this.$viewModel.modal.current;
-    },
     message() {
       return `Dilating time will start a new Eternity, and all Dimension multiplier's exponents and
         tickspeed multiplier's exponent will be reduced to ${formatPow(0.75, 2, 2)}. If you can Eternity while Dilated,

From c0877fb30807f0ae4298b5ac2943fb8fbb4ba8d0 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 19 May 2022 22:18:37 +0800
Subject: [PATCH 65/89] Add info to tell users what "collapse shorthands" does,
 subject to change by future tweaks to its functionality

---
 src/components/modals/StudyStringModal.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/modals/StudyStringModal.vue b/src/components/modals/StudyStringModal.vue
index aee83ad80..dcf4b0a9c 100644
--- a/src/components/modals/StudyStringModal.vue
+++ b/src/components/modals/StudyStringModal.vue
@@ -223,8 +223,13 @@ export default {
     </div>
     <div v-if="!isImporting && inputIsValidTree">
       <br>
-      <PrimaryButton @click="convertInputShorthands">
-        Collapse Study ID list Shorthands
+      <PrimaryButton
+        ach-tooltip="This will change the study text formatting from 'a,b,c|d' to 'a, b, c | d' and shorten
+        combinations of studies into their shorthands without regarding ordering. '71, 41, 81, 91, 101'
+        would be converted into 'antimatter, 41'."
+        @click="convertInputShorthands"
+      >
+        Format String and Collapse Shorthands
       </PrimaryButton>
     </div>
     <template #confirm-text>

From 26c03dc84c61567261b4f677b82b5fd0e1d74796 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 19 May 2022 22:37:25 +0800
Subject: [PATCH 66/89] Remove .setPriority, move to param in constructor

---
 javascripts/core/app/modal.js | 50 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js
index fbc7798e5..4fe14a9b2 100644
--- a/javascripts/core/app/modal.js
+++ b/javascripts/core/app/modal.js
@@ -62,11 +62,11 @@ import PelleEffectsModal from "@/components/modals/PelleEffectsModal";
 
 
 export class Modal {
-  constructor(component, bare = false) {
+  constructor(component, priority = 0, bare = false) {
     this._component = component;
     this._bare = bare;
     this._modalConfig = {};
-    this._priority = 0;
+    this._priority = priority;
   }
 
   show(modalConfig) {
@@ -149,20 +149,20 @@ Modal.startEternityChallenge = new ChallengeConfirmationModal(EternityChallengeS
 Modal.startInfinityChallenge = new ChallengeConfirmationModal(InfinityChallengeStartModal);
 Modal.startNormalChallenge = new ChallengeConfirmationModal(NormalChallengeStartModal);
 
-Modal.dimensionBoost = new Modal(DimensionBoostModal).setPriority(1);
-Modal.antimatterGalaxy = new Modal(AntimatterGalaxyModal).setPriority(1);
-Modal.bigCrunch = new Modal(BigCrunchModal).setPriority(1);
-Modal.replicantiGalaxy = new Modal(ReplicantiGalaxyModal).setPriority(1);
-Modal.eternity = new Modal(EternityModal).setPriority(1);
-Modal.enterDilation = new Modal(EnterDilationModal).setPriority(1);
-Modal.reality = new Modal(RealityModal).setPriority(1);
-Modal.resetReality = new Modal(ResetRealityModal).setPriority(1);
-Modal.exitCelestialReality = new Modal(ExitCelestialModal).setPriority(1);
-Modal.celestials = new Modal(EnterCelestialsModal).setPriority(1);
-Modal.hardReset = new Modal(HardResetModal).setPriority(1);
+Modal.dimensionBoost = new Modal(DimensionBoostModal, 1);
+Modal.antimatterGalaxy = new Modal(AntimatterGalaxyModal, 1);
+Modal.bigCrunch = new Modal(BigCrunchModal, 1);
+Modal.replicantiGalaxy = new Modal(ReplicantiGalaxyModal, 1);
+Modal.eternity = new Modal(EternityModal, 1);
+Modal.enterDilation = new Modal(EnterDilationModal, 1);
+Modal.reality = new Modal(RealityModal, 1);
+Modal.resetReality = new Modal(ResetRealityModal, 1);
+Modal.exitCelestialReality = new Modal(ExitCelestialModal, 1);
+Modal.celestials = new Modal(EnterCelestialsModal, 1);
+Modal.hardReset = new Modal(HardResetModal, 1);
 Modal.enterSpeedrun = new Modal(SpeedrunModeModal);
 Modal.changeName = new Modal(ChangeNameModal);
-Modal.armageddon = new Modal(ArmageddonModal).setPriority(1);
+Modal.armageddon = new Modal(ArmageddonModal, 1);
 
 Modal.confirmationOptions = new Modal(ConfirmationOptionsModal);
 Modal.infoDisplayOptions = new Modal(InfoDisplayOptionsModal);
@@ -173,16 +173,16 @@ Modal.animationOptions = new Modal(AnimationOptionsModal);
 Modal.hiddenTabs = new Modal(HiddenTabsModal);
 Modal.preferredTree = new Modal(PreferredTreeModal);
 
-Modal.deleteCompanion = new Modal(DeleteCompanionGlyphModal).setPriority(1);
-Modal.glyphDelete = new Modal(DeleteGlyphModal).setPriority(1);
-Modal.glyphPurge = new Modal(PurgeGlyphModal).setPriority(1);
-Modal.glyphSacrifice = new Modal(SacrificeGlyphModal).setPriority(1);
-Modal.glyphRefine = new Modal(RefineGlyphModal).setPriority(1);
-Modal.deleteAllUnprotectedGlyphs = new Modal(PurgeAllUnprotectedGlyphsModal).setPriority(1);
-Modal.deleteAllRejectedGlyphs = new Modal(PurgeAllRejectedGlyphsModal).setPriority(1);
+Modal.deleteCompanion = new Modal(DeleteCompanionGlyphModal, 1);
+Modal.glyphDelete = new Modal(DeleteGlyphModal, 1);
+Modal.glyphPurge = new Modal(PurgeGlyphModal, 1);
+Modal.glyphSacrifice = new Modal(SacrificeGlyphModal, 1);
+Modal.glyphRefine = new Modal(RefineGlyphModal, 1);
+Modal.deleteAllUnprotectedGlyphs = new Modal(PurgeAllUnprotectedGlyphsModal, 1);
+Modal.deleteAllRejectedGlyphs = new Modal(PurgeAllRejectedGlyphsModal, 1);
 
 Modal.glyphShowcasePanel = new Modal(GlyphShowcasePanelModal);
-Modal.glyphUndo = new Modal(UndoGlyphModal).setPriority(1);
+Modal.glyphUndo = new Modal(UndoGlyphModal, 1);
 Modal.glyphReplace = new Modal(ReplaceGlyphModal);
 Modal.enslavedHints = new Modal(EnslavedHintsModal);
 Modal.realityGlyph = new Modal(RealityGlyphCreationModal);
@@ -200,7 +200,7 @@ Modal.shop = new Modal(StdStoreModal);
 Modal.studyString = new Modal(StudyStringModal);
 Modal.singularityMilestones = new Modal(SingularityMilestonesModal);
 Modal.pelleEffects = new Modal(PelleEffectsModal);
-Modal.sacrifice = new Modal(SacrificeModal).setPriority(1);
+Modal.sacrifice = new Modal(SacrificeModal, 1);
 Modal.breakInfinity = new Modal(BreakInfinityModal);
 Modal.celestialQuote = new class extends Modal {
   show(celestial, lines) {
@@ -250,7 +250,7 @@ Modal.celestialQuote = new class extends Modal {
     }
     return x;
   }
-}(CelestialQuoteModal, true).setPriority(2);
+}(CelestialQuoteModal, 2, true);
 
 Modal.cloudSaveConflict = new Modal(CloudSaveConflictModal);
 Modal.cloudLoadConflict = new Modal(CloudLoadConflictModal);
@@ -324,4 +324,4 @@ Modal.message = new class extends Modal {
       this.closeButton = this.queue[0].closeButton;
     }
   }
-}(MessageModal).setPriority(2);
+}(MessageModal, 2);

From b1f895b30399718bc1e39710a9dbd6f4f94a4e7a Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 19 May 2022 22:43:48 +0800
Subject: [PATCH 67/89] Remove the auto conversion of shorthands

---
 javascripts/core/time-studies/time-study-tree.js | 14 +-------------
 src/components/modals/StudyStringModal.vue       |  6 ++----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/javascripts/core/time-studies/time-study-tree.js b/javascripts/core/time-studies/time-study-tree.js
index b994426c0..6e2323e5e 100644
--- a/javascripts/core/time-studies/time-study-tree.js
+++ b/javascripts/core/time-studies/time-study-tree.js
@@ -109,19 +109,7 @@ export class TimeStudyTree {
   }
 
   static formatStudyList(input) {
-    let internal = input.toLowerCase().replaceAll(" ", "");
-    // \\b means 0-width word boundry, meaning "target = 11" doesnt match 111
-    const testRegex = target => new RegExp(`\\b${target}\\b,?`, "gu");
-    // If the studylist has all IDs, replace the first instance with the shorthand, then remove the rest
-    this.sets.forEach((ids, name) => {
-      const hasAllIds = ids.every(x => testRegex(x).test(internal));
-      if (hasAllIds) {
-        internal = internal.replace(testRegex(ids[0]), `${name},`);
-        for (const i of ids) {
-          internal = internal.replace(testRegex(i), "");
-        }
-      }
-    });
+    const internal = input.toLowerCase().replaceAll(" ", "");
     return internal.replaceAll(",", ", ").replace("|", " | ");
   }
 
diff --git a/src/components/modals/StudyStringModal.vue b/src/components/modals/StudyStringModal.vue
index dcf4b0a9c..a2ed8e469 100644
--- a/src/components/modals/StudyStringModal.vue
+++ b/src/components/modals/StudyStringModal.vue
@@ -224,12 +224,10 @@ export default {
     <div v-if="!isImporting && inputIsValidTree">
       <br>
       <PrimaryButton
-        ach-tooltip="This will change the study text formatting from 'a,b,c|d' to 'a, b, c | d' and shorten
-        combinations of studies into their shorthands without regarding ordering. '71, 41, 81, 91, 101'
-        would be converted into 'antimatter, 41'."
+        ach-tooltip="This will format the study preset text, for example, changing 'a,b,c|d' to 'a, b, c | d'."
         @click="convertInputShorthands"
       >
-        Format String and Collapse Shorthands
+        Format Preset Text
       </PrimaryButton>
     </div>
     <template #confirm-text>

From 9279ec0aa368b4a22df435c00452f7ba08317d12 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 19 May 2022 23:07:25 +0800
Subject: [PATCH 68/89] Add triad studies to TST.sets

---
 javascripts/core/time-studies/time-study-tree.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/javascripts/core/time-studies/time-study-tree.js b/javascripts/core/time-studies/time-study-tree.js
index 6e2323e5e..eac12ff21 100644
--- a/javascripts/core/time-studies/time-study-tree.js
+++ b/javascripts/core/time-studies/time-study-tree.js
@@ -93,6 +93,9 @@ export class TimeStudyTree {
       ["idle", [123, 133, 143]],
       ["light", [221, 223, 225, 227, 231, 233]],
       ["dark", [222, 224, 226, 228, 232, 234]],
+      ...(Ra.unlocks.unlockHardV.canBeApplied
+        ? [["triad", [301, 302, 303, 304].slice(0, Ra.unlocks.unlockHardV.effectOrDefault(0))]]
+        : [])
     ]);
   }
 

From 63df293dbeccc29ff42c4116aee898b90565b5fd Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 19 May 2022 23:30:27 +0800
Subject: [PATCH 69/89] Fix the white bottom corner on scrollbars

Resolve #2613
---
 public/stylesheets/styles.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index fb7c637c6..e31db007e 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -17,6 +17,11 @@ html {
   border-radius: 0.5rem;
 }
 
+::-webkit-scrollbar-corner {
+  -webkit-appearance: none;
+  appearance: none;
+}
+
 .s-base--metro::-webkit-scrollbar-thumb {
   border-radius: 0;
 }

From 2fa6bd9c13f08541ba77d848dc1577d1e3ba9758 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sat, 21 May 2022 23:01:46 +0800
Subject: [PATCH 70/89] Address PR feedback

Confirmation Modals now show on top of other confirmation modals with same priority
---
 javascripts/core/app/modal.js | 87 ++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 42 deletions(-)

diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js
index 4fe14a9b2..64c13f20a 100644
--- a/javascripts/core/app/modal.js
+++ b/javascripts/core/app/modal.js
@@ -62,36 +62,36 @@ import PelleEffectsModal from "@/components/modals/PelleEffectsModal";
 
 
 export class Modal {
-  constructor(component, priority = 0, bare = false) {
+  constructor(component, priorityStatement = {}, bare = false) {
     this._component = component;
     this._bare = bare;
     this._modalConfig = {};
-    this._priority = priority;
+    this._priority = priorityStatement.priority ?? 0;
+    this._showFirst = priorityStatement.showFirst ?? false;
   }
 
   show(modalConfig) {
     if (!GameUI.initialized) return;
     this._props = Object.assign({}, modalConfig || {});
     const modalQueue = ui.view.modal.queue;
-    // New modals go to the back of the queue (shown last).
-    if (!modalQueue.includes(this)) {
-      if (!modalQueue.length || this._priority <= modalQueue.last()._priority) {
-        modalQueue.push(this);
-      } else {
-        for (let i = 0; i < modalQueue.length; i++) {
-          if (modalQueue[i]._priority < this._priority) {
-            modalQueue.splice(i, 0, this);
-            break;
-          }
+    if (modalQueue.includes(this)) return;
+
+    // Modals are first inserted into the front of the queue, then make their way back
+    // until they see the next Modal in the queue has a lower priority
+    // If the modal is shown first then it makes its way back it will insert itself if the next Modal
+    // has the same priority too
+    if (!modalQueue.length || (this._priority <= modalQueue.last()._priority && !this._showFirst)) {
+      modalQueue.push(this);
+    } else {
+      for (let i = 0; i < modalQueue.length; i++) {
+        if ((this._showFirst && (modalQueue[i]._priority <= this._priority)) ||
+          modalQueue[i]._priority < this._priority) {
+          modalQueue.splice(i, 0, this);
+          break;
         }
       }
-      ui.view.modal.current = modalQueue[0];
     }
-  }
-
-  setPriority(x) {
-    this._priority = x;
-    return this;
+    ui.view.modal.current = modalQueue[0];
   }
 
   get isOpen() {
@@ -142,6 +142,9 @@ class ChallengeConfirmationModal extends Modal {
   }
 }
 
+const PriorityPresets = {
+  confirm(priority) { return { priority, showFirst: true }; }
+};
 // If a new modal which can be shown in the same queue multiple times needs to be added
 // Additional code needs to be written to account for that
 
@@ -149,20 +152,20 @@ Modal.startEternityChallenge = new ChallengeConfirmationModal(EternityChallengeS
 Modal.startInfinityChallenge = new ChallengeConfirmationModal(InfinityChallengeStartModal);
 Modal.startNormalChallenge = new ChallengeConfirmationModal(NormalChallengeStartModal);
 
-Modal.dimensionBoost = new Modal(DimensionBoostModal, 1);
-Modal.antimatterGalaxy = new Modal(AntimatterGalaxyModal, 1);
-Modal.bigCrunch = new Modal(BigCrunchModal, 1);
-Modal.replicantiGalaxy = new Modal(ReplicantiGalaxyModal, 1);
-Modal.eternity = new Modal(EternityModal, 1);
-Modal.enterDilation = new Modal(EnterDilationModal, 1);
-Modal.reality = new Modal(RealityModal, 1);
-Modal.resetReality = new Modal(ResetRealityModal, 1);
-Modal.exitCelestialReality = new Modal(ExitCelestialModal, 1);
-Modal.celestials = new Modal(EnterCelestialsModal, 1);
-Modal.hardReset = new Modal(HardResetModal, 1);
+Modal.dimensionBoost = new Modal(DimensionBoostModal, PriorityPresets.confirm(1));
+Modal.antimatterGalaxy = new Modal(AntimatterGalaxyModal, PriorityPresets.confirm(1));
+Modal.bigCrunch = new Modal(BigCrunchModal, PriorityPresets.confirm(1));
+Modal.replicantiGalaxy = new Modal(ReplicantiGalaxyModal, PriorityPresets.confirm(1));
+Modal.eternity = new Modal(EternityModal, PriorityPresets.confirm(1));
+Modal.enterDilation = new Modal(EnterDilationModal, PriorityPresets.confirm(1));
+Modal.reality = new Modal(RealityModal, PriorityPresets.confirm(1));
+Modal.resetReality = new Modal(ResetRealityModal, PriorityPresets.confirm(1));
+Modal.exitCelestialReality = new Modal(ExitCelestialModal, PriorityPresets.confirm(1));
+Modal.celestials = new Modal(EnterCelestialsModal, PriorityPresets.confirm(1));
+Modal.hardReset = new Modal(HardResetModal, PriorityPresets.confirm(1));
 Modal.enterSpeedrun = new Modal(SpeedrunModeModal);
 Modal.changeName = new Modal(ChangeNameModal);
-Modal.armageddon = new Modal(ArmageddonModal, 1);
+Modal.armageddon = new Modal(ArmageddonModal, PriorityPresets.confirm(1));
 
 Modal.confirmationOptions = new Modal(ConfirmationOptionsModal);
 Modal.infoDisplayOptions = new Modal(InfoDisplayOptionsModal);
@@ -173,16 +176,16 @@ Modal.animationOptions = new Modal(AnimationOptionsModal);
 Modal.hiddenTabs = new Modal(HiddenTabsModal);
 Modal.preferredTree = new Modal(PreferredTreeModal);
 
-Modal.deleteCompanion = new Modal(DeleteCompanionGlyphModal, 1);
-Modal.glyphDelete = new Modal(DeleteGlyphModal, 1);
-Modal.glyphPurge = new Modal(PurgeGlyphModal, 1);
-Modal.glyphSacrifice = new Modal(SacrificeGlyphModal, 1);
-Modal.glyphRefine = new Modal(RefineGlyphModal, 1);
-Modal.deleteAllUnprotectedGlyphs = new Modal(PurgeAllUnprotectedGlyphsModal, 1);
-Modal.deleteAllRejectedGlyphs = new Modal(PurgeAllRejectedGlyphsModal, 1);
+Modal.deleteCompanion = new Modal(DeleteCompanionGlyphModal, PriorityPresets.confirm(1));
+Modal.glyphDelete = new Modal(DeleteGlyphModal, PriorityPresets.confirm(1));
+Modal.glyphPurge = new Modal(PurgeGlyphModal, PriorityPresets.confirm(1));
+Modal.glyphSacrifice = new Modal(SacrificeGlyphModal, PriorityPresets.confirm(1));
+Modal.glyphRefine = new Modal(RefineGlyphModal, PriorityPresets.confirm(1));
+Modal.deleteAllUnprotectedGlyphs = new Modal(PurgeAllUnprotectedGlyphsModal, PriorityPresets.confirm(1));
+Modal.deleteAllRejectedGlyphs = new Modal(PurgeAllRejectedGlyphsModal, PriorityPresets.confirm(1));
 
 Modal.glyphShowcasePanel = new Modal(GlyphShowcasePanelModal);
-Modal.glyphUndo = new Modal(UndoGlyphModal, 1);
+Modal.glyphUndo = new Modal(UndoGlyphModal, PriorityPresets.confirm(1));
 Modal.glyphReplace = new Modal(ReplaceGlyphModal);
 Modal.enslavedHints = new Modal(EnslavedHintsModal);
 Modal.realityGlyph = new Modal(RealityGlyphCreationModal);
@@ -200,8 +203,8 @@ Modal.shop = new Modal(StdStoreModal);
 Modal.studyString = new Modal(StudyStringModal);
 Modal.singularityMilestones = new Modal(SingularityMilestonesModal);
 Modal.pelleEffects = new Modal(PelleEffectsModal);
-Modal.sacrifice = new Modal(SacrificeModal, 1);
-Modal.breakInfinity = new Modal(BreakInfinityModal);
+Modal.sacrifice = new Modal(SacrificeModal, PriorityPresets.confirm(1));
+Modal.breakInfinity = new Modal(BreakInfinityModal, PriorityPresets.confirm(1));
 Modal.celestialQuote = new class extends Modal {
   show(celestial, lines) {
     if (!GameUI.initialized || player.speedrun.isActive) return;
@@ -250,7 +253,7 @@ Modal.celestialQuote = new class extends Modal {
     }
     return x;
   }
-}(CelestialQuoteModal, 2, true);
+}(CelestialQuoteModal, { priority: 2 }, true);
 
 Modal.cloudSaveConflict = new Modal(CloudSaveConflictModal);
 Modal.cloudLoadConflict = new Modal(CloudLoadConflictModal);
@@ -324,4 +327,4 @@ Modal.message = new class extends Modal {
       this.closeButton = this.queue[0].closeButton;
     }
   }
-}(MessageModal, 2);
+}(MessageModal, { priority: 2 });

From 088c41eb59f31d8f44cf926fb1c06ecda99465dc Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sat, 21 May 2022 23:05:03 +0800
Subject: [PATCH 71/89] Fix modal bug with showing first property

Let two Modals a and b with same priority and both showing first
Trigger a -> Trigger b -> Trigger a
Shows up as Modal a -> Modal b -> Modal b
---
 javascripts/core/app/modal.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js
index 64c13f20a..f222f26e8 100644
--- a/javascripts/core/app/modal.js
+++ b/javascripts/core/app/modal.js
@@ -74,7 +74,11 @@ export class Modal {
     if (!GameUI.initialized) return;
     this._props = Object.assign({}, modalConfig || {});
     const modalQueue = ui.view.modal.queue;
-    if (modalQueue.includes(this)) return;
+    if (modalQueue.includes(this)) {
+      if (!this._showFirst) return;
+
+      modalQueue.splice(modalQueue.indexOf(this), 1);
+    }
 
     // Modals are first inserted into the front of the queue, then make their way back
     // until they see the next Modal in the queue has a lower priority

From 42a2144f905df60672a036203f4b207ba79861c3 Mon Sep 17 00:00:00 2001
From: WaitingIdly <25394029+WaitingIdly@users.noreply.github.com>
Date: Sat, 21 May 2022 09:42:43 -0700
Subject: [PATCH 72/89] simplify code

---
 javascripts/core/app/modal.js | 91 +++++++++++++++--------------------
 1 file changed, 39 insertions(+), 52 deletions(-)

diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js
index f222f26e8..6c27cc4fe 100644
--- a/javascripts/core/app/modal.js
+++ b/javascripts/core/app/modal.js
@@ -62,40 +62,26 @@ import PelleEffectsModal from "@/components/modals/PelleEffectsModal";
 
 
 export class Modal {
-  constructor(component, priorityStatement = {}, bare = false) {
+  constructor(component, priority = 0, bare = false) {
     this._component = component;
     this._bare = bare;
     this._modalConfig = {};
-    this._priority = priorityStatement.priority ?? 0;
-    this._showFirst = priorityStatement.showFirst ?? false;
+    this._priority = priority;
   }
 
   show(modalConfig) {
     if (!GameUI.initialized) return;
     this._props = Object.assign({}, modalConfig || {});
+
     const modalQueue = ui.view.modal.queue;
-    if (modalQueue.includes(this)) {
-      if (!this._showFirst) return;
-
-      modalQueue.splice(modalQueue.indexOf(this), 1);
-    }
-
-    // Modals are first inserted into the front of the queue, then make their way back
-    // until they see the next Modal in the queue has a lower priority
-    // If the modal is shown first then it makes its way back it will insert itself if the next Modal
-    // has the same priority too
-    if (!modalQueue.length || (this._priority <= modalQueue.last()._priority && !this._showFirst)) {
-      modalQueue.push(this);
-    } else {
-      for (let i = 0; i < modalQueue.length; i++) {
-        if ((this._showFirst && (modalQueue[i]._priority <= this._priority)) ||
-          modalQueue[i]._priority < this._priority) {
-          modalQueue.splice(i, 0, this);
-          break;
-        }
-      }
-    }
-    ui.view.modal.current = modalQueue[0];
+    // Add this modal to the front of the queue and sort based on priority to ensure priority is maintained.
+    modalQueue.unshift(this);
+    modalQueue.sort((x, y) => x.priority < y.priority);
+    // Filter out multiple instances of the same modal.
+    const singleQueue = [...new Set(modalQueue)];
+    ui.view.modal.queue = singleQueue;
+    // If the front of the queue is what is currently presented, we dont need to do anything.
+    if (!singleQueue[0].isOpen) ui.view.modal.current = singleQueue[0];
   }
 
   get isOpen() {
@@ -114,6 +100,10 @@ export class Modal {
     return this._props;
   }
 
+  get priority() {
+    return this._priority;
+  }
+
   static hide() {
     if (!GameUI.initialized) return;
     ui.view.modal.queue.shift();
@@ -146,9 +136,6 @@ class ChallengeConfirmationModal extends Modal {
   }
 }
 
-const PriorityPresets = {
-  confirm(priority) { return { priority, showFirst: true }; }
-};
 // If a new modal which can be shown in the same queue multiple times needs to be added
 // Additional code needs to be written to account for that
 
@@ -156,20 +143,20 @@ Modal.startEternityChallenge = new ChallengeConfirmationModal(EternityChallengeS
 Modal.startInfinityChallenge = new ChallengeConfirmationModal(InfinityChallengeStartModal);
 Modal.startNormalChallenge = new ChallengeConfirmationModal(NormalChallengeStartModal);
 
-Modal.dimensionBoost = new Modal(DimensionBoostModal, PriorityPresets.confirm(1));
-Modal.antimatterGalaxy = new Modal(AntimatterGalaxyModal, PriorityPresets.confirm(1));
-Modal.bigCrunch = new Modal(BigCrunchModal, PriorityPresets.confirm(1));
-Modal.replicantiGalaxy = new Modal(ReplicantiGalaxyModal, PriorityPresets.confirm(1));
-Modal.eternity = new Modal(EternityModal, PriorityPresets.confirm(1));
-Modal.enterDilation = new Modal(EnterDilationModal, PriorityPresets.confirm(1));
-Modal.reality = new Modal(RealityModal, PriorityPresets.confirm(1));
-Modal.resetReality = new Modal(ResetRealityModal, PriorityPresets.confirm(1));
-Modal.exitCelestialReality = new Modal(ExitCelestialModal, PriorityPresets.confirm(1));
-Modal.celestials = new Modal(EnterCelestialsModal, PriorityPresets.confirm(1));
-Modal.hardReset = new Modal(HardResetModal, PriorityPresets.confirm(1));
+Modal.dimensionBoost = new Modal(DimensionBoostModal, 1);
+Modal.antimatterGalaxy = new Modal(AntimatterGalaxyModal, 1);
+Modal.bigCrunch = new Modal(BigCrunchModal, 1);
+Modal.replicantiGalaxy = new Modal(ReplicantiGalaxyModal, 1);
+Modal.eternity = new Modal(EternityModal, 1);
+Modal.enterDilation = new Modal(EnterDilationModal, 1);
+Modal.reality = new Modal(RealityModal, 1);
+Modal.resetReality = new Modal(ResetRealityModal, 1);
+Modal.exitCelestialReality = new Modal(ExitCelestialModal, 1);
+Modal.celestials = new Modal(EnterCelestialsModal, 1);
+Modal.hardReset = new Modal(HardResetModal, 1);
 Modal.enterSpeedrun = new Modal(SpeedrunModeModal);
 Modal.changeName = new Modal(ChangeNameModal);
-Modal.armageddon = new Modal(ArmageddonModal, PriorityPresets.confirm(1));
+Modal.armageddon = new Modal(ArmageddonModal, 1);
 
 Modal.confirmationOptions = new Modal(ConfirmationOptionsModal);
 Modal.infoDisplayOptions = new Modal(InfoDisplayOptionsModal);
@@ -180,16 +167,16 @@ Modal.animationOptions = new Modal(AnimationOptionsModal);
 Modal.hiddenTabs = new Modal(HiddenTabsModal);
 Modal.preferredTree = new Modal(PreferredTreeModal);
 
-Modal.deleteCompanion = new Modal(DeleteCompanionGlyphModal, PriorityPresets.confirm(1));
-Modal.glyphDelete = new Modal(DeleteGlyphModal, PriorityPresets.confirm(1));
-Modal.glyphPurge = new Modal(PurgeGlyphModal, PriorityPresets.confirm(1));
-Modal.glyphSacrifice = new Modal(SacrificeGlyphModal, PriorityPresets.confirm(1));
-Modal.glyphRefine = new Modal(RefineGlyphModal, PriorityPresets.confirm(1));
-Modal.deleteAllUnprotectedGlyphs = new Modal(PurgeAllUnprotectedGlyphsModal, PriorityPresets.confirm(1));
-Modal.deleteAllRejectedGlyphs = new Modal(PurgeAllRejectedGlyphsModal, PriorityPresets.confirm(1));
+Modal.deleteCompanion = new Modal(DeleteCompanionGlyphModal, 1);
+Modal.glyphDelete = new Modal(DeleteGlyphModal, 1);
+Modal.glyphPurge = new Modal(PurgeGlyphModal, 1);
+Modal.glyphSacrifice = new Modal(SacrificeGlyphModal, 1);
+Modal.glyphRefine = new Modal(RefineGlyphModal, 1);
+Modal.deleteAllUnprotectedGlyphs = new Modal(PurgeAllUnprotectedGlyphsModal, 1);
+Modal.deleteAllRejectedGlyphs = new Modal(PurgeAllRejectedGlyphsModal, 1);
 
 Modal.glyphShowcasePanel = new Modal(GlyphShowcasePanelModal);
-Modal.glyphUndo = new Modal(UndoGlyphModal, PriorityPresets.confirm(1));
+Modal.glyphUndo = new Modal(UndoGlyphModal, 1);
 Modal.glyphReplace = new Modal(ReplaceGlyphModal);
 Modal.enslavedHints = new Modal(EnslavedHintsModal);
 Modal.realityGlyph = new Modal(RealityGlyphCreationModal);
@@ -207,8 +194,8 @@ Modal.shop = new Modal(StdStoreModal);
 Modal.studyString = new Modal(StudyStringModal);
 Modal.singularityMilestones = new Modal(SingularityMilestonesModal);
 Modal.pelleEffects = new Modal(PelleEffectsModal);
-Modal.sacrifice = new Modal(SacrificeModal, PriorityPresets.confirm(1));
-Modal.breakInfinity = new Modal(BreakInfinityModal, PriorityPresets.confirm(1));
+Modal.sacrifice = new Modal(SacrificeModal, 1);
+Modal.breakInfinity = new Modal(BreakInfinityModal, 1);
 Modal.celestialQuote = new class extends Modal {
   show(celestial, lines) {
     if (!GameUI.initialized || player.speedrun.isActive) return;
@@ -257,7 +244,7 @@ Modal.celestialQuote = new class extends Modal {
     }
     return x;
   }
-}(CelestialQuoteModal, { priority: 2 }, true);
+}(CelestialQuoteModal, 2, true);
 
 Modal.cloudSaveConflict = new Modal(CloudSaveConflictModal);
 Modal.cloudLoadConflict = new Modal(CloudLoadConflictModal);
@@ -331,4 +318,4 @@ Modal.message = new class extends Modal {
       this.closeButton = this.queue[0].closeButton;
     }
   }
-}(MessageModal, { priority: 2 });
+}(MessageModal, 2);

From 3a751a12abd3b2445566956f33623a65dae93dd6 Mon Sep 17 00:00:00 2001
From: Phoenix51505 <88960080+Phoenix51505@users.noreply.github.com>
Date: Sat, 21 May 2022 19:36:02 -0400
Subject: [PATCH 73/89] [Cel 7] Properly Show Disabled Achievements As Disabled
 (#2595)

* [Cel 7] Show R87 As Disabled When It Should Be

Doomed disables all forms of Infinity/Eternity gain multipliers, yet Ach r87 is improperly shown as active within Doomed. Now it Properly shows as disabled and nonfunctioning within Doomed.

* Now-Reverse-Numerical

* Found-Another-One

* Even-More

* Apply-Lars-Suggestions

Error be gone

Co-authored-by: L4R5W <66326188+L4R5W@users.noreply.github.com>

* No More Multipliers

* Begone Codefactor

Co-authored-by: L4R5W <66326188+L4R5W@users.noreply.github.com>
---
 javascripts/core/celestials/pelle/pelle.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/javascripts/core/celestials/pelle/pelle.js b/javascripts/core/celestials/pelle/pelle.js
index 9761b24c0..d3b1d05a3 100644
--- a/javascripts/core/celestials/pelle/pelle.js
+++ b/javascripts/core/celestials/pelle/pelle.js
@@ -118,7 +118,8 @@ export const Pelle = {
   },
 
   get disabledAchievements() {
-    return [143, 142, 141, 133, 125, 118, 117, 111, 104, 103, 92, 91, 78, 76, 74, 65, 55, 54, 37];
+    return [164, 143, 142, 141, 137, 134, 133, 132, 125, 118, 117, 113, 111, 104, 103, 93, 92, 91, 87, 85, 78, 76,
+      74, 65, 55, 54, 37];
   },
 
   get uselessInfinityUpgrades() {

From 139d6668365f6f91dcaef0be4404bdee1ce352b5 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 22 May 2022 10:36:19 +0800
Subject: [PATCH 74/89] Fix faulty sort statement leading to not sorting by
 Modal priority

---
 javascripts/core/app/modal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js
index 6c27cc4fe..2a1fee5cc 100644
--- a/javascripts/core/app/modal.js
+++ b/javascripts/core/app/modal.js
@@ -76,7 +76,7 @@ export class Modal {
     const modalQueue = ui.view.modal.queue;
     // Add this modal to the front of the queue and sort based on priority to ensure priority is maintained.
     modalQueue.unshift(this);
-    modalQueue.sort((x, y) => x.priority < y.priority);
+    modalQueue.sort((x, y) => y.priority - x.priority);
     // Filter out multiple instances of the same modal.
     const singleQueue = [...new Set(modalQueue)];
     ui.view.modal.queue = singleQueue;

From a7e1bf3a9e7cb8d3a813a2a0721b9298f400c465 Mon Sep 17 00:00:00 2001
From: SpectralFlame <4493131+cyip92@users.noreply.github.com>
Date: Tue, 17 May 2022 20:14:42 -0500
Subject: [PATCH 75/89] Adjust automator layout to accomodate debug and info
 text, fixes #2206

---
 .../core/automator/automator-backend.js       |   4 +
 public/stylesheets/automator.css              |  32 +--
 .../tabs/automator/AutomatorControls.vue      | 111 ++++++----
 .../tabs/automator/AutomatorDocs.vue          | 192 ++++++++++--------
 .../tabs/automator/AutomatorEditor.vue        |  89 +-------
 .../tabs/automator/AutomatorModeSwitch.vue    | 166 +++++++++++++++
 6 files changed, 358 insertions(+), 236 deletions(-)
 create mode 100644 src/components/tabs/automator/AutomatorModeSwitch.vue

diff --git a/javascripts/core/automator/automator-backend.js b/javascripts/core/automator/automator-backend.js
index 36f217764..ae26e1092 100644
--- a/javascripts/core/automator/automator-backend.js
+++ b/javascripts/core/automator/automator-backend.js
@@ -257,6 +257,10 @@ export const AutomatorBackend = {
     return Math.clampMin(Math.pow(0.994, Currency.realities.value) * 500, 1);
   },
 
+  get currentScriptLength() {
+    return player.reality.automator.scripts[this.state.topLevelScript].content.split("\n").length;
+  },
+
   update(diff) {
     if (!this.isOn) return;
     let stack;
diff --git a/public/stylesheets/automator.css b/public/stylesheets/automator.css
index 7ff2f2e0e..4d5941b90 100644
--- a/public/stylesheets/automator.css
+++ b/public/stylesheets/automator.css
@@ -132,21 +132,20 @@
   border-radius: 0;
 }
 
-.l-automator-pane__controls {
-  flex: 0 0 auto;
-}
-
 .c-automator__controls {
   background-color: #262626;
 }
 
 .l-automator__controls {
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
+  flex: none;
+}
 
-  /* for corner buttons */
-  position: relative;
-  justify-content: flex-start;
+.l-automator-button-row {
+  display: flex;
+  flex-direction: row;
+  height: 3rem;
   align-items: center;
 }
 
@@ -163,23 +162,6 @@
   right: 0;
 }
 
-.l-automator__script-names {
-  display: flex;
-  flex-grow: 1;
-  flex-direction: row;
-  justify-content: space-evenly;
-  align-items: center;
-}
-
-.l-automator__scripts-dropdown {
-  width: 90%;
-  height: 90%;
-  border-width: 0.1rem;
-  border-radius: 0;
-  margin: 0.4rem;
-  padding: 0.2rem 0 0.3rem;
-}
-
 .l-automator__rename-input {
   width: 90%;
   height: 90%;
diff --git a/src/components/tabs/automator/AutomatorControls.vue b/src/components/tabs/automator/AutomatorControls.vue
index 7e4f07567..2c4eda230 100644
--- a/src/components/tabs/automator/AutomatorControls.vue
+++ b/src/components/tabs/automator/AutomatorControls.vue
@@ -13,6 +13,7 @@ export default {
       repeatOn: false,
       forceRestartOn: false,
       followExecution: false,
+      currentLine: 0,
     };
   },
   computed: {
@@ -32,6 +33,19 @@ export default {
         "fa-eject": this.isPaused
       };
     },
+    statusText() {
+      // TODO Check for correct script, add script name to running
+      const prefix = "Status: ";
+      // Pad with leading zeroes based on script length to prevent text jitter on fast scripts. This technically fails
+      // for scripts with more than 99999 lines, but scripts that long will be prevented elsewhere
+      const digits = Math.ceil(Math.log10(AutomatorBackend.currentScriptLength));
+      let lineNum = `0000${this.currentLine}`;
+      lineNum = lineNum.slice(lineNum.length - digits);
+
+      if (this.isPaused) return `${prefix}Paused (Will run line ${lineNum} when resumed)`;
+      if (!this.isRunning) return `${prefix}Not running (Will start at beginning)`;
+      return `${prefix}Running (Last executed line ${lineNum})`;
+    },
   },
   methods: {
     update() {
@@ -40,6 +54,7 @@ export default {
       this.repeatOn = AutomatorBackend.state.repeat;
       this.forceRestartOn = AutomatorBackend.state.forceRestart;
       this.followExecution = AutomatorBackend.state.followExecution;
+      if (this.isRunning) this.currentLine = AutomatorBackend.currentLineNumber;
     },
     rewind: () => AutomatorBackend.restart(),
     play() {
@@ -64,52 +79,64 @@ export default {
 </script>
 
 <template>
-  <div class="c-automator__controls l-automator__controls l-automator-pane__controls">
-    <AutomatorButton
-      v-tooltip="'Rewind Automator to the first command'"
-      class="fa-fast-backward"
-      @click="rewind"
-    />
-    <AutomatorButton
-      v-tooltip="{
-        content: playTooltip,
-        hideOnTargetClick: false
-      }"
-      :class="playButtonClass"
-      @click="play"
-    />
-    <AutomatorButton
-      v-tooltip="'Stop Automator and reset position'"
-      class="fa-stop"
-      @click="stop"
-    />
-    <AutomatorButton
-      v-tooltip="'Step forward one line'"
-      class="fa-step-forward"
-      @click="step"
-    />
-    <AutomatorButton
-      v-tooltip="'Restart script automatically when it completes'"
-      class="fa-sync-alt"
-      :class="{ 'c-automator__button--active' : repeatOn }"
-      @click="repeat"
-    />
-    <AutomatorButton
-      v-tooltip="'Restart script when finishing or restarting a Reality'"
-      class="fa-reply"
-      :class="{ 'c-automator__button--active' : forceRestartOn }"
-      @click="restart"
-    />
-    <AutomatorButton
-      v-tooltip="'Scroll Automator to follow current line'"
-      class="fa-indent"
-      :class="{ 'c-automator__button--active' : followExecution }"
-      @click="follow"
-    />
+  <div class="c-automator__controls l-automator__controls">
+    <div class="l-automator-button-row">
+      <AutomatorButton
+        v-tooltip="'Rewind Automator to the first command'"
+        class="fa-fast-backward"
+        @click="rewind"
+      />
+      <AutomatorButton
+        v-tooltip="{
+          content: playTooltip,
+          hideOnTargetClick: false
+        }"
+        :class="playButtonClass"
+        @click="play"
+      />
+      <AutomatorButton
+        v-tooltip="'Stop Automator and reset position'"
+        class="fa-stop"
+        @click="stop"
+      />
+      <AutomatorButton
+        v-tooltip="'Step forward one line'"
+        class="fa-step-forward"
+        @click="step"
+      />
+      <AutomatorButton
+        v-tooltip="'Restart script automatically when it completes'"
+        class="fa-sync-alt"
+        :class="{ 'c-automator__button--active' : repeatOn }"
+        @click="repeat"
+      />
+      <AutomatorButton
+        v-tooltip="'Restart script when finishing or restarting a Reality'"
+        class="fa-reply"
+        :class="{ 'c-automator__button--active' : forceRestartOn }"
+        @click="restart"
+      />
+      <AutomatorButton
+        v-tooltip="'Scroll Automator to follow current line'"
+        class="fa-indent"
+        :class="{ 'c-automator__button--active' : followExecution }"
+        @click="follow"
+      />
+    </div>
+    <div class="l-automator-button-row c-automator__status-text">
+      {{ statusText }}
+    </div>
   </div>
 </template>
 
 <style scoped>
+.c-automator__status-text {
+  color: var(--color-reality);
+  font-size: 1.5rem;
+  font-weight: bold;
+  padding: 0 0.5rem;
+}
+
 .c-automator__button--active {
   background-color: var(--color-reality);
   border-color: var(--color-reality-light);
diff --git a/src/components/tabs/automator/AutomatorDocs.vue b/src/components/tabs/automator/AutomatorDocs.vue
index 449d78fb3..b919ef941 100644
--- a/src/components/tabs/automator/AutomatorDocs.vue
+++ b/src/components/tabs/automator/AutomatorDocs.vue
@@ -5,6 +5,7 @@ import AutomatorDocsCommandList from "./AutomatorDocsCommandList";
 import AutomatorDocsTemplateList from "./AutomatorDocsTemplateList";
 import AutomatorErrorPage from "./AutomatorErrorPage";
 import AutomatorEventLog from "./AutomatorEventLog";
+import AutomatorModeSwitch from "./AutomatorModeSwitch";
 
 export default {
   name: "AutomatorDocs",
@@ -14,7 +15,8 @@ export default {
     AutomatorErrorPage,
     AutomatorEventLog,
     AutomatorBlocks,
-    AutomatorDocsTemplateList
+    AutomatorDocsTemplateList,
+    AutomatorModeSwitch,
   },
   data() {
     return {
@@ -178,87 +180,93 @@ export default {
 
 <template>
   <div class="l-automator-pane">
-    <div class="c-automator__controls l-automator__controls l-automator-pane__controls">
-      <AutomatorButton
-        v-tooltip="'Scripting Information'"
-        class="fa-list"
-        :class="{ 'c-automator__button--active': infoPaneID === 1 }"
-        @click="infoPaneID = 1"
-      />
-      <AutomatorButton
-        v-tooltip="blockTooltip"
-        :class="{
-          'fa-cubes': isBlock,
-          'fa-file-code': !isBlock,
-          'c-automator__button--active': infoPaneID === 2
-        }"
-        @click="infoPaneID = 2"
-      />
-      <AutomatorButton
-        v-tooltip="errorTooltip"
-        :style="errorStyle"
-        class="fa-exclamation-triangle"
-        :class="{ 'c-automator__button--active': infoPaneID === 3 }"
-        @click="infoPaneID = 3"
-      />
-      <AutomatorButton
-        v-tooltip="'View recently executed commands'"
-        class="fa-eye"
-        :class="{ 'c-automator__button--active': infoPaneID === 4 }"
-        @click="infoPaneID = 4"
-      />
-      <AutomatorButton
-        v-tooltip="'Export automator script'"
-        class="fa-file-export"
-        @click="exportScript"
-      />
-      <AutomatorButton
-        v-tooltip="'Import automator script'"
-        class="fa-file-import"
-        @click="importScript"
-      />
-      <div class="l-automator__script-names">
-        <template v-if="!editingName">
-          <select
-            class="l-automator__scripts-dropdown"
-            @input="onScriptDropdown"
-          >
-            <option
-              v-for="script in scripts"
-              :key="script.id"
-              v-bind="selectedScriptAttribute(script.id)"
-              :value="script.id"
-            >
-              {{ dropdownLabel(script) }}
-            </option>
-            <option value="createNewScript">
-              Create new...
-            </option>
-          </select>
-          <AutomatorButton
-            v-tooltip="'Rename script'"
-            class="far fa-edit"
-            @click="rename"
-          />
-        </template>
-        <input
-          v-else
-          ref="renameInput"
-          class="l-automator__rename-input"
-          @blur="nameEdited"
-          @keyup.enter="$refs.renameInput.blur()"
-        >
+    <div class="c-automator__controls l-automator__controls">
+      <div class="l-automator-button-row">
+        <AutomatorButton
+          v-tooltip="'Scripting Information'"
+          class="fa-list"
+          :class="{ 'c-automator__button--active': infoPaneID === 1 }"
+          @click="infoPaneID = 1"
+        />
+        <AutomatorButton
+          v-tooltip="blockTooltip"
+          :class="{
+            'fa-cubes': isBlock,
+            'fa-file-code': !isBlock,
+            'c-automator__button--active': infoPaneID === 2
+          }"
+          @click="infoPaneID = 2"
+        />
+        <AutomatorButton
+          v-tooltip="errorTooltip"
+          :style="errorStyle"
+          class="fa-exclamation-triangle"
+          :class="{ 'c-automator__button--active': infoPaneID === 3 }"
+          @click="infoPaneID = 3"
+        />
+        <AutomatorButton
+          v-tooltip="'View recently executed commands'"
+          class="fa-eye"
+          :class="{ 'c-automator__button--active': infoPaneID === 4 }"
+          @click="infoPaneID = 4"
+        />
+        <AutomatorModeSwitch />
+        <AutomatorButton
+          v-tooltip="fullScreenTooltip"
+          class="l-automator__maximize-button"
+          :class="fullScreenIconClass"
+          @click="fullScreen = !fullScreen"
+        />
+      </div>
+      <div class="l-automator-button-row">
+        <AutomatorButton
+          v-tooltip="'Export automator script'"
+          class="fa-file-export"
+          @click="exportScript"
+        />
+        <AutomatorButton
+          v-tooltip="'Import automator script'"
+          class="fa-file-import"
+          @click="importScript"
+        />
+        <div class="l-automator__script-names">
+          <template v-if="!editingName">
+            <select
+              class="l-automator__scripts-dropdown"
+              @input="onScriptDropdown"
+            >
+              <option
+                v-for="script in scripts"
+                :key="script.id"
+                v-bind="selectedScriptAttribute(script.id)"
+                :value="script.id"
+              >
+                {{ dropdownLabel(script) }}
+              </option>
+              <option value="createNewScript">
+                Create new...
+              </option>
+            </select>
+            <AutomatorButton
+              v-tooltip="'Rename script'"
+              class="far fa-edit"
+              @click="rename"
+            />
+          </template>
+          <input
+            v-else
+            ref="renameInput"
+            class="l-automator__rename-input"
+            @blur="nameEdited"
+            @keyup.enter="$refs.renameInput.blur()"
+          >
+        </div>
+        <AutomatorButton
+          v-tooltip="'Delete this script'"
+          class="fas fa-trash"
+          @click="deleteScript"
+        />
       </div>
-      <AutomatorButton
-        v-tooltip="'Delete this script'"
-        class="fas fa-trash"
-        @click="deleteScript"
-      />
-      <AutomatorButton
-        v-tooltip="fullScreenTooltip"
-        :class="fullScreenIconClass"
-        @click="fullScreen = !fullScreen"
-      />
     </div>
     <div class="c-automator-docs l-automator-pane__content">
       <AutomatorDocsCommandList v-if="infoPaneID === 1" />
@@ -273,6 +281,28 @@ export default {
 </template>
 
 <style scoped>
+.l-automator__maximize-button {
+  position: absolute;
+  right: 0;
+}
+
+.l-automator__script-names {
+  display: flex;
+  flex-direction: row;
+  width: 50%;
+  justify-content: space-evenly;
+  align-items: center;
+}
+
+.l-automator__scripts-dropdown {
+  width: 90%;
+  height: 90%;
+  border-width: 0.1rem;
+  border-radius: 0;
+  margin: 0.4rem;
+  padding: 0.2rem 0 0.3rem;
+}
+
 .c-automator__button--active {
   background-color: var(--color-reality);
   border-color: var(--color-reality-light);
diff --git a/src/components/tabs/automator/AutomatorEditor.vue b/src/components/tabs/automator/AutomatorEditor.vue
index d3925767b..31e711fda 100644
--- a/src/components/tabs/automator/AutomatorEditor.vue
+++ b/src/components/tabs/automator/AutomatorEditor.vue
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-      activeLineRaw: 0,
       automatorType: 0,
       runningScriptID: 0,
       activeLineInfo: {
@@ -42,18 +41,6 @@ export default {
     isTextAutomator() {
       return this.automatorType === AUTOMATOR_TYPE.TEXT;
     },
-    activeLine() {
-      return AutomatorBackend.state.topLevelScript === this.currentScriptID ? this.activeLineRaw : 0;
-    },
-    automatorModeTooltip() {
-      if (this.automatorType === AUTOMATOR_TYPE.BLOCK) return "Switch to the text editor";
-      return "Switch to the block editor";
-    },
-    tutorialClass() {
-      return {
-        "tutorial--glow": ui.view.tutorialState === TUTORIAL_STATE.AUTOMATOR && ui.view.tutorialActive
-      };
-    }
   },
   created() {
     this.on$(GAME_EVENT.GAME_LOAD, () => this.onGameLoad());
@@ -95,44 +82,14 @@ export default {
       }
       this.$nextTick(() => BlockAutomator.fromText(this.currentScript));
     },
-    toggleAutomatorMode() {
-      const scriptID = ui.view.tabs.reality.automator.editorScriptID;
-      Tutorial.moveOn(TUTORIAL_STATE.AUTOMATOR);
-      if (this.automatorType === AUTOMATOR_TYPE.BLOCK) {
-        // This saves the script after converting it.
-        BlockAutomator.parseTextFromBlocks();
-        player.reality.automator.type = AUTOMATOR_TYPE.TEXT;
-      } else if (BlockAutomator.fromText(this.currentScriptContent)) {
-        AutomatorBackend.saveScript(scriptID, AutomatorTextUI.editor.getDoc().getValue());
-        player.reality.automator.type = AUTOMATOR_TYPE.BLOCK;
-      } else {
-        Modal.message.show("Automator script has errors, cannot convert to blocks.");
-      }
-      this.$recompute("currentScriptContent");
-    }
   }
 };
 </script>
 
 <template>
   <div class="l-automator-pane">
-    <div class="c-automator__controls l-automator__controls l-automator-pane__controls">
+    <div class="c-automator__controls l-automator__controls">
       <AutomatorControls />
-      <button
-        v-tooltip="{
-          content: automatorModeTooltip,
-          hideOnTargetClick: false
-        }"
-        :class="{
-          'c-slider-toggle-button': true,
-          'c-slider-toggle-button--right': isTextAutomator,
-          ...tutorialClass
-        }"
-        @click="toggleAutomatorMode"
-      >
-        <i class="fas fa-cubes" />
-        <i class="fas fa-code" />
-      </button>
     </div>
     <AutomatorTextEditor
       v-if="isTextAutomator"
@@ -141,47 +98,3 @@ export default {
     <AutomatorBlockEditor v-if="!isTextAutomator" />
   </div>
 </template>
-
-<style scoped>
-.c-slider-toggle-button {
-  display: flex;
-  overflow: hidden;
-  position: relative;
-  align-items: center;
-  color: black;
-  background-color: #626262;
-  border: 0.2rem solid #767676;
-  border-radius: 0.2rem;
-  margin: 0.4rem;
-  padding: 0.3rem 0;
-  cursor: pointer;
-}
-
-.c-slider-toggle-button .fas {
-  width: 3rem;
-  position: relative;
-  z-index: 1;
-}
-
-.c-slider-toggle-button::before {
-  content: "";
-  width: 3rem;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 0;
-  background-color: white;
-  border-radius: 0.2rem;
-  transition: 0.3s ease all;
-}
-
-.c-slider-toggle-button--right::before {
-  left: 3rem;
-  background-color: white;
-}
-
-.tutorial--glow::after {
-  z-index: 2;
-}
-</style>
diff --git a/src/components/tabs/automator/AutomatorModeSwitch.vue b/src/components/tabs/automator/AutomatorModeSwitch.vue
new file mode 100644
index 000000000..0e5e7b4a6
--- /dev/null
+++ b/src/components/tabs/automator/AutomatorModeSwitch.vue
@@ -0,0 +1,166 @@
+<script>
+export default {
+  name: "AutomatorModeSwitch",
+  data() {
+    return {
+      automatorType: 0,
+      runningScriptID: 0,
+      activeLineInfo: {
+        lineNumber: 0,
+        scriptID: 0,
+      }
+    };
+  },
+  computed: {
+    fullScreen() {
+      return this.$viewModel.tabs.reality.automator.fullScreen;
+    },
+    currentScriptID: {
+      get() {
+        return this.$viewModel.tabs.reality.automator.editorScriptID;
+      },
+      set(value) {
+        this.$viewModel.tabs.reality.automator.editorScriptID = value;
+      }
+    },
+    currentScriptContent() {
+      return player.reality.automator.scripts[this.currentScriptID].content;
+    },
+    currentScript() {
+      return CodeMirror.Doc(this.currentScriptContent, "automato").getValue();
+    },
+    isTextAutomator() {
+      return this.automatorType === AUTOMATOR_TYPE.TEXT;
+    },
+    automatorModeTooltip() {
+      if (this.automatorType === AUTOMATOR_TYPE.BLOCK) return "Switch to the text editor";
+      return "Switch to the block editor";
+    },
+    tutorialClass() {
+      return {
+        "tutorial--glow": ui.view.tutorialState === TUTORIAL_STATE.AUTOMATOR && ui.view.tutorialActive
+      };
+    }
+  },
+  created() {
+    this.on$(GAME_EVENT.GAME_LOAD, () => this.onGameLoad());
+    this.on$(GAME_EVENT.AUTOMATOR_SAVE_CHANGED, () => this.onGameLoad());
+    this.updateCurrentScriptID();
+  },
+  methods: {
+    update() {
+      this.runningScriptID = AutomatorBackend.state.topLevelScript;
+      this.automatorType = player.reality.automator.type;
+      if (AutomatorBackend.isOn) {
+        this.activeLineInfo = {
+          lineNumber: AutomatorBackend.stack.top.lineNumber,
+          scriptID: AutomatorBackend.state.topLevelScript,
+        };
+      } else {
+        this.activeLineInfo = {
+          lineNumber: 0,
+          scriptID: "0",
+        };
+        if (AutomatorTextUI.editor) AutomatorTextUI.editor.performLint();
+      }
+    },
+    onGameLoad() {
+      this.updateCurrentScriptID();
+    },
+    updateCurrentScriptID() {
+      const storedScripts = player.reality.automator.scripts;
+      this.currentScriptID = player.reality.automator.state.editorScript;
+      // This shouldn't happen if things are loaded in the right order, but might as well be sure.
+      if (storedScripts[this.currentScriptID] === undefined) {
+        this.currentScriptID = Object.keys(storedScripts)[0];
+        player.reality.automator.state.editorScript = this.currentScriptID;
+      }
+      if (AutomatorData.currentErrors().length !== 0 && player.reality.automator.type === AUTOMATOR_TYPE.BLOCK) {
+        Modal.message.show(`Switched to text editor mode; this script has errors
+          which cannot be converted to block mode.`);
+        player.reality.automator.type = AUTOMATOR_TYPE.TEXT;
+      }
+      this.$nextTick(() => BlockAutomator.fromText(this.currentScript));
+    },
+    toggleAutomatorMode() {
+      const scriptID = ui.view.tabs.reality.automator.editorScriptID;
+      Tutorial.moveOn(TUTORIAL_STATE.AUTOMATOR);
+      if (this.automatorType === AUTOMATOR_TYPE.BLOCK) {
+        // This saves the script after converting it.
+        BlockAutomator.parseTextFromBlocks();
+        player.reality.automator.type = AUTOMATOR_TYPE.TEXT;
+      } else if (BlockAutomator.fromText(this.currentScriptContent)) {
+        AutomatorBackend.saveScript(scriptID, AutomatorTextUI.editor.getDoc().getValue());
+        player.reality.automator.type = AUTOMATOR_TYPE.BLOCK;
+      } else {
+        Modal.message.show("Automator script has errors, cannot convert to blocks.");
+      }
+      this.$recompute("currentScriptContent");
+    }
+  }
+};
+</script>
+
+<template>
+  <div class="c-automator__controls l-automator__controls">
+    <button
+      v-tooltip="{
+        content: automatorModeTooltip,
+        hideOnTargetClick: false
+      }"
+      :class="{
+        'c-slider-toggle-button': true,
+        'c-slider-toggle-button--right': isTextAutomator,
+        ...tutorialClass
+      }"
+      @click="toggleAutomatorMode"
+    >
+      <i class="fas fa-cubes" />
+      <i class="fas fa-code" />
+    </button>
+  </div>
+</template>
+
+<style scoped>
+.c-slider-toggle-button {
+  display: flex;
+  overflow: hidden;
+  position: relative;
+  align-items: center;
+  color: black;
+  background-color: #626262;
+  border: 0.2rem solid #767676;
+  border-radius: 0.2rem;
+  margin: 0.4rem;
+  padding: 0.3rem 0;
+  cursor: pointer;
+}
+
+.c-slider-toggle-button .fas {
+  width: 3rem;
+  position: relative;
+  z-index: 1;
+}
+
+.c-slider-toggle-button::before {
+  content: "";
+  width: 3rem;
+  height: 100%;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 0;
+  background-color: white;
+  border-radius: 0.2rem;
+  transition: 0.3s ease all;
+}
+
+.c-slider-toggle-button--right::before {
+  left: 3rem;
+  background-color: white;
+}
+
+.tutorial--glow::after {
+  z-index: 2;
+}
+</style>

From b8b4a762b3ad88988d7165081126c28322295d98 Mon Sep 17 00:00:00 2001
From: SpectralFlame <4493131+cyip92@users.noreply.github.com>
Date: Tue, 17 May 2022 23:14:16 -0500
Subject: [PATCH 76/89] Cleanup automator backend and fix crash when deleting
 scripts while automator is running

---
 .../core/automator/automator-backend.js       | 36 +++++++++++++------
 .../modals/DeleteAutomatorScriptModal.vue     | 11 ------
 .../tabs/automator/AutomatorControls.vue      | 36 ++++++++++++++-----
 .../tabs/automator/AutomatorEditor.vue        | 18 ----------
 .../tabs/automator/AutomatorModeSwitch.vue    | 21 -----------
 5 files changed, 53 insertions(+), 69 deletions(-)

diff --git a/javascripts/core/automator/automator-backend.js b/javascripts/core/automator/automator-backend.js
index ae26e1092..28d260f28 100644
--- a/javascripts/core/automator/automator-backend.js
+++ b/javascripts/core/automator/automator-backend.js
@@ -111,7 +111,6 @@ class AutomatorStackEntry {
 
 export class AutomatorScript {
   constructor(id) {
-    if (!id) throw new Error("Invalid Automator script ID");
     this._id = id;
     this.compile();
   }
@@ -183,7 +182,7 @@ export const AutomatorData = {
   createNewScript(newScript, name) {
     const newScriptID = Object.values(player.reality.automator.scripts).length + 1;
     player.reality.automator.scripts[newScriptID] = {
-      id: `${newScriptID}`,
+      id: newScriptID,
       name,
       content: newScript
     };
@@ -243,12 +242,22 @@ export const AutomatorBackend = {
     return this.isOn && this.mode === AUTOMATOR_MODE.RUN;
   },
 
+  get currentRunningScript() {
+    return player.reality.automator.scripts[this.state.topLevelScript];
+  },
+
+  get currentEditingScript() {
+    const saveIndex = Object.values(player.reality.automator.scripts)
+      .findIndex(s => s.id === player.reality.automator.state.editorScript);
+    return player.reality.automator.scripts[saveIndex];
+  },
+
   get scriptName() {
-    return this.findScript(this.state.topLevelScript).name;
+    return this.currentRunningScript?.name ?? "";
   },
 
   get currentLineNumber() {
-    if (this.stack.top === null)
+    if (!this.stack.top)
       return -1;
     return this.stack.top.lineNumber;
   },
@@ -257,8 +266,12 @@ export const AutomatorBackend = {
     return Math.clampMin(Math.pow(0.994, Currency.realities.value) * 500, 1);
   },
 
+  get currentRawText() {
+    return this.currentRunningScript?.content ?? "";
+  },
+
   get currentScriptLength() {
-    return player.reality.automator.scripts[this.state.topLevelScript].content.split("\n").length;
+    return this.currentRawText.split("\n").length;
   },
 
   update(diff) {
@@ -355,10 +368,7 @@ export const AutomatorBackend = {
   },
 
   findScript(id) {
-    // I tried really hard to convert IDs from strings into numbers for some cleanup but I just kept getting constant
-    // errors everywhere. It needs to be a number so that importing works properly without ID assignment being a mess,
-    // but apparently some deeper things seem to break in a way I can't easily fix.
-    return this._scripts.find(e => `${e.id}` === `${id}`);
+    return this._scripts.find(e => e.id === id);
   },
 
   _createDefaultScript() {
@@ -369,7 +379,7 @@ export const AutomatorBackend = {
   },
 
   initializeFromSave() {
-    const scriptIds = Object.keys(player.reality.automator.scripts);
+    const scriptIds = Object.keys(player.reality.automator.scripts).map(id => parseInt(id, 10));
     if (scriptIds.length === 0) {
       scriptIds.push(this._createDefaultScript());
     } else {
@@ -396,10 +406,14 @@ export const AutomatorBackend = {
     return newScript;
   },
 
+  // Note that deleting scripts leaves gaps in the automator script indexing since automator scripts can't be
+  // dynamically re-indexed while the automator is running without causing a stutter from recompiling scripts.
   deleteScript(id) {
+    // We need to delete scripts from two places - in the savefile and compiled AutomatorScript Objects
+    const saveId = Object.values(player.reality.automator.scripts).findIndex(s => s.id === id);
+    delete player.reality.automator.scripts[saveId];
     const idx = this._scripts.findIndex(e => e.id === id);
     this._scripts.splice(idx, 1);
-    delete player.reality.automator.scripts[id];
     if (this._scripts.length === 0) {
       this._createDefaultScript();
     }
diff --git a/src/components/modals/DeleteAutomatorScriptModal.vue b/src/components/modals/DeleteAutomatorScriptModal.vue
index e9e6e4ba1..df661b992 100644
--- a/src/components/modals/DeleteAutomatorScriptModal.vue
+++ b/src/components/modals/DeleteAutomatorScriptModal.vue
@@ -29,17 +29,6 @@ export default {
         // AutomatorBackend.deleteScript will create an empty script if necessary
         player.reality.automator.state.editorScript = scriptList[0].id;
       }
-
-      // Deleting a script leaves a gap in ids, shift all of them down to fill it
-      let newID = 0;
-      const shiftedScripts = {};
-      for (const id of Object.keys(player.reality.automator.scripts)) {
-        shiftedScripts[newID] = player.reality.automator.scripts[id];
-        shiftedScripts[newID].id = newID;
-        newID++;
-      }
-      player.reality.automator.scripts = shiftedScripts;
-
       EventHub.dispatch(GAME_EVENT.AUTOMATOR_SAVE_CHANGED);
     },
   },
diff --git a/src/components/tabs/automator/AutomatorControls.vue b/src/components/tabs/automator/AutomatorControls.vue
index 2c4eda230..fc3a47355 100644
--- a/src/components/tabs/automator/AutomatorControls.vue
+++ b/src/components/tabs/automator/AutomatorControls.vue
@@ -13,7 +13,10 @@ export default {
       repeatOn: false,
       forceRestartOn: false,
       followExecution: false,
+      hasErrors: false,
       currentLine: 0,
+      runningName: "",
+      editingName: "",
     };
   },
   computed: {
@@ -34,17 +37,16 @@ export default {
       };
     },
     statusText() {
-      // TODO Check for correct script, add script name to running
-      const prefix = "Status: ";
       // Pad with leading zeroes based on script length to prevent text jitter on fast scripts. This technically fails
       // for scripts with more than 99999 lines, but scripts that long will be prevented elsewhere
-      const digits = Math.ceil(Math.log10(AutomatorBackend.currentScriptLength));
+      const digits = Math.clampMin(Math.ceil(Math.log10(AutomatorBackend.currentScriptLength)), 1);
       let lineNum = `0000${this.currentLine}`;
       lineNum = lineNum.slice(lineNum.length - digits);
 
-      if (this.isPaused) return `${prefix}Paused (Will run line ${lineNum} when resumed)`;
-      if (!this.isRunning) return `${prefix}Not running (Will start at beginning)`;
-      return `${prefix}Running (Last executed line ${lineNum})`;
+      if (this.isPaused) return `Paused: "${this.runningName}" (Resumes on Line ${lineNum})`;
+      if (this.isRunning) return `Running: "${this.runningName}" (Line ${lineNum})`;
+      if (this.hasErrors) return `Stopped: "${this.editingName}" has errors (Cannot run)`;
+      return `Stopped: Will start running "${this.editingName}"`;
     },
   },
   methods: {
@@ -54,10 +56,14 @@ export default {
       this.repeatOn = AutomatorBackend.state.repeat;
       this.forceRestartOn = AutomatorBackend.state.forceRestart;
       this.followExecution = AutomatorBackend.state.followExecution;
-      if (this.isRunning) this.currentLine = AutomatorBackend.currentLineNumber;
+      this.hasErrors = AutomatorData.currentErrors().length !== 0;
+      this.currentLine = AutomatorBackend.currentLineNumber;
+      this.runningName = AutomatorBackend.scriptName;
+      this.editingName = AutomatorBackend.currentEditingScript.name;
     },
     rewind: () => AutomatorBackend.restart(),
     play() {
+      if (this.hasErrors) return;
       if (this.isRunning) {
         AutomatorBackend.pause();
         return;
@@ -122,8 +128,14 @@ export default {
         :class="{ 'c-automator__button--active' : followExecution }"
         @click="follow"
       />
+      <div class="c-automator__status-text c-automator__status-text--edit">
+        {{ editingName }}
+      </div>
     </div>
-    <div class="l-automator-button-row c-automator__status-text">
+    <div
+      class="l-automator-button-row c-automator__status-text"
+      :class="{ 'c-automator__status-text--error' : hasErrors && !isRunning }"
+    >
       {{ statusText }}
     </div>
   </div>
@@ -137,6 +149,14 @@ export default {
   padding: 0 0.5rem;
 }
 
+.c-automator__status-text--edit {
+  color: var(--color-accent);
+}
+
+.c-automator__status-text--error {
+  color: var(--color-bad);
+}
+
 .c-automator__button--active {
   background-color: var(--color-reality);
   border-color: var(--color-reality-light);
diff --git a/src/components/tabs/automator/AutomatorEditor.vue b/src/components/tabs/automator/AutomatorEditor.vue
index 31e711fda..0370118c3 100644
--- a/src/components/tabs/automator/AutomatorEditor.vue
+++ b/src/components/tabs/automator/AutomatorEditor.vue
@@ -13,11 +13,6 @@ export default {
   data() {
     return {
       automatorType: 0,
-      runningScriptID: 0,
-      activeLineInfo: {
-        lineNumber: 0,
-        scriptID: 0,
-      }
     };
   },
   computed: {
@@ -49,20 +44,7 @@ export default {
   },
   methods: {
     update() {
-      this.runningScriptID = AutomatorBackend.state.topLevelScript;
       this.automatorType = player.reality.automator.type;
-      if (AutomatorBackend.isOn) {
-        this.activeLineInfo = {
-          lineNumber: AutomatorBackend.stack.top.lineNumber,
-          scriptID: AutomatorBackend.state.topLevelScript,
-        };
-      } else {
-        this.activeLineInfo = {
-          lineNumber: 0,
-          scriptID: "0",
-        };
-        if (AutomatorTextUI.editor) AutomatorTextUI.editor.performLint();
-      }
     },
     onGameLoad() {
       this.updateCurrentScriptID();
diff --git a/src/components/tabs/automator/AutomatorModeSwitch.vue b/src/components/tabs/automator/AutomatorModeSwitch.vue
index 0e5e7b4a6..8dbd512a1 100644
--- a/src/components/tabs/automator/AutomatorModeSwitch.vue
+++ b/src/components/tabs/automator/AutomatorModeSwitch.vue
@@ -4,17 +4,9 @@ export default {
   data() {
     return {
       automatorType: 0,
-      runningScriptID: 0,
-      activeLineInfo: {
-        lineNumber: 0,
-        scriptID: 0,
-      }
     };
   },
   computed: {
-    fullScreen() {
-      return this.$viewModel.tabs.reality.automator.fullScreen;
-    },
     currentScriptID: {
       get() {
         return this.$viewModel.tabs.reality.automator.editorScriptID;
@@ -49,20 +41,7 @@ export default {
   },
   methods: {
     update() {
-      this.runningScriptID = AutomatorBackend.state.topLevelScript;
       this.automatorType = player.reality.automator.type;
-      if (AutomatorBackend.isOn) {
-        this.activeLineInfo = {
-          lineNumber: AutomatorBackend.stack.top.lineNumber,
-          scriptID: AutomatorBackend.state.topLevelScript,
-        };
-      } else {
-        this.activeLineInfo = {
-          lineNumber: 0,
-          scriptID: "0",
-        };
-        if (AutomatorTextUI.editor) AutomatorTextUI.editor.performLint();
-      }
     },
     onGameLoad() {
       this.updateCurrentScriptID();

From ed9b9955732d61d8f1189c668b480ff21d902345 Mon Sep 17 00:00:00 2001
From: SpectralFlame <4493131+cyip92@users.noreply.github.com>
Date: Wed, 18 May 2022 05:30:58 -0500
Subject: [PATCH 77/89] Fix automator bugs related to script indexing, add more
 debug text for player

---
 .../core/automator/automator-backend.js       | 21 +++++---
 javascripts/core/storage/dev-migrations.js    |  5 ++
 .../tabs/automator/AutomatorControls.vue      | 52 +++++++++++++++----
 .../tabs/automator/AutomatorDocs.vue          |  1 +
 .../tabs/automator/AutomatorEditor.vue        |  1 +
 .../tabs/automator/AutomatorTextEditor.vue    |  4 --
 6 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/javascripts/core/automator/automator-backend.js b/javascripts/core/automator/automator-backend.js
index 28d260f28..a83d409a4 100644
--- a/javascripts/core/automator/automator-backend.js
+++ b/javascripts/core/automator/automator-backend.js
@@ -242,20 +242,29 @@ export const AutomatorBackend = {
     return this.isOn && this.mode === AUTOMATOR_MODE.RUN;
   },
 
+  findRawScriptObject(id) {
+    const auto = player.reality.automator;
+    const index = Object.values(auto.scripts).findIndex(s => s.id === id);
+    return auto.scripts[parseInt(Object.keys(auto.scripts)[index], 10)];
+  },
+
   get currentRunningScript() {
-    return player.reality.automator.scripts[this.state.topLevelScript];
+    return this.findRawScriptObject(this.state.topLevelScript);
   },
 
   get currentEditingScript() {
-    const saveIndex = Object.values(player.reality.automator.scripts)
-      .findIndex(s => s.id === player.reality.automator.state.editorScript);
-    return player.reality.automator.scripts[saveIndex];
+    return this.findRawScriptObject(player.reality.automator.state.editorScript);
   },
 
   get scriptName() {
     return this.currentRunningScript?.name ?? "";
   },
 
+  hasDuplicateName(name) {
+    const nameArray = Object.values(player.reality.automator.scripts).map(s => s.name);
+    return nameArray.filter(n => n === name).length > 1;
+  },
+
   get currentLineNumber() {
     if (!this.stack.top)
       return -1;
@@ -385,7 +394,7 @@ export const AutomatorBackend = {
     } else {
       this._scripts = scriptIds.map(s => new AutomatorScript(s));
     }
-    if (!scriptIds.includes(`${this.state.topLevelScript}`)) this.state.topLevelScript = scriptIds[0];
+    if (!scriptIds.includes(this.state.topLevelScript)) this.state.topLevelScript = scriptIds[0];
     const currentScript = this.findScript(this.state.topLevelScript);
     if (currentScript.commands) {
       const commands = currentScript.commands;
@@ -411,7 +420,7 @@ export const AutomatorBackend = {
   deleteScript(id) {
     // We need to delete scripts from two places - in the savefile and compiled AutomatorScript Objects
     const saveId = Object.values(player.reality.automator.scripts).findIndex(s => s.id === id);
-    delete player.reality.automator.scripts[saveId];
+    delete player.reality.automator.scripts[parseInt(Object.keys(player.reality.automator.scripts)[saveId], 10)];
     const idx = this._scripts.findIndex(e => e.id === id);
     this._scripts.splice(idx, 1);
     if (this._scripts.length === 0) {
diff --git a/javascripts/core/storage/dev-migrations.js b/javascripts/core/storage/dev-migrations.js
index 58789eab6..4e6d25eaa 100644
--- a/javascripts/core/storage/dev-migrations.js
+++ b/javascripts/core/storage/dev-migrations.js
@@ -1318,6 +1318,11 @@ GameStorage.devMigrations = {
       delete player.celestials.effarig.unlocksBits;
       delete player.celestials.ra.unlocksBits;
     },
+    player => {
+      for (const script of Object.values(player.reality.automator.scripts)) {
+        script.id = parseInt(script.id, 10);
+      }
+    },
   ],
 
   patch(player) {
diff --git a/src/components/tabs/automator/AutomatorControls.vue b/src/components/tabs/automator/AutomatorControls.vue
index fc3a47355..3b8c006a0 100644
--- a/src/components/tabs/automator/AutomatorControls.vue
+++ b/src/components/tabs/automator/AutomatorControls.vue
@@ -15,8 +15,10 @@ export default {
       followExecution: false,
       hasErrors: false,
       currentLine: 0,
-      runningName: "",
+      statusName: "",
       editingName: "",
+      duplicateStatus: false,
+      duplicateEditing: false,
     };
   },
   computed: {
@@ -43,10 +45,10 @@ export default {
       let lineNum = `0000${this.currentLine}`;
       lineNum = lineNum.slice(lineNum.length - digits);
 
-      if (this.isPaused) return `Paused: "${this.runningName}" (Resumes on Line ${lineNum})`;
-      if (this.isRunning) return `Running: "${this.runningName}" (Line ${lineNum})`;
-      if (this.hasErrors) return `Stopped: "${this.editingName}" has errors (Cannot run)`;
-      return `Stopped: Will start running "${this.editingName}"`;
+      if (this.isPaused) return `Paused: "${this.statusName}" (Resumes on Line ${lineNum})`;
+      if (this.isRunning) return `Running: "${this.statusName}" (Line ${lineNum})`;
+      if (this.hasErrors) return `Stopped: "${this.statusName}" has errors (Cannot run)`;
+      return `Stopped: Will start running "${this.statusName}"`;
     },
   },
   methods: {
@@ -58,8 +60,15 @@ export default {
       this.followExecution = AutomatorBackend.state.followExecution;
       this.hasErrors = AutomatorData.currentErrors().length !== 0;
       this.currentLine = AutomatorBackend.currentLineNumber;
-      this.runningName = AutomatorBackend.scriptName;
+
+      // When the automator isn't running, the script name contains the last run script instead of the
+      // to-be-run script, which is the currently displayed one in the editor
+      this.statusName = (this.isPaused || this.isRunning)
+        ? AutomatorBackend.scriptName
+        : AutomatorBackend.currentEditingScript.name;
       this.editingName = AutomatorBackend.currentEditingScript.name;
+      this.duplicateStatus = AutomatorBackend.hasDuplicateName(this.statusName);
+      this.duplicateEditing = AutomatorBackend.hasDuplicateName(this.editingName);
     },
     rewind: () => AutomatorBackend.restart(),
     play() {
@@ -129,14 +138,31 @@ export default {
         @click="follow"
       />
       <div class="c-automator__status-text c-automator__status-text--edit">
+        <span
+          v-if="duplicateEditing"
+          v-tooltip="'More than one script has this name!'"
+          class="fas fa-exclamation-triangle c-automator__status-text--error"
+        />
         {{ editingName }}
       </div>
     </div>
-    <div
-      class="l-automator-button-row c-automator__status-text"
-      :class="{ 'c-automator__status-text--error' : hasErrors && !isRunning }"
-    >
-      {{ statusText }}
+    <div class="l-automator-button-row">
+      <span
+        v-if="duplicateStatus"
+        v-tooltip="'More than one script has this name!'"
+        class="fas fa-exclamation-triangle c-automator__status-text c-automator__status-text--error"
+      />
+      <span
+        v-if="statusName !== editingName"
+        v-tooltip="'The automator is running a different script than the editor is showing'"
+        class="fas fa-circle-exclamation c-automator__status-text c-automator__status-text--warning"
+      />
+      <span
+        class="c-automator__status-text"
+        :class="{ 'c-automator__status-text--error' : hasErrors && !isRunning }"
+      >
+        {{ statusText }}
+      </span>
     </div>
   </div>
 </template>
@@ -153,6 +179,10 @@ export default {
   color: var(--color-accent);
 }
 
+.c-automator__status-text--warning {
+  color: var(--color-good-paused);
+}
+
 .c-automator__status-text--error {
   color: var(--color-bad);
 }
diff --git a/src/components/tabs/automator/AutomatorDocs.vue b/src/components/tabs/automator/AutomatorDocs.vue
index b919ef941..c987762e9 100644
--- a/src/components/tabs/automator/AutomatorDocs.vue
+++ b/src/components/tabs/automator/AutomatorDocs.vue
@@ -211,6 +211,7 @@ export default {
           @click="infoPaneID = 4"
         />
         <AutomatorModeSwitch />
+        Switching will stop scripts
         <AutomatorButton
           v-tooltip="fullScreenTooltip"
           class="l-automator__maximize-button"
diff --git a/src/components/tabs/automator/AutomatorEditor.vue b/src/components/tabs/automator/AutomatorEditor.vue
index 0370118c3..5a2810afb 100644
--- a/src/components/tabs/automator/AutomatorEditor.vue
+++ b/src/components/tabs/automator/AutomatorEditor.vue
@@ -45,6 +45,7 @@ export default {
   methods: {
     update() {
       this.automatorType = player.reality.automator.type;
+      if (!AutomatorBackend.isOn && AutomatorTextUI.editor) AutomatorTextUI.editor.performLint();
     },
     onGameLoad() {
       this.updateCurrentScriptID();
diff --git a/src/components/tabs/automator/AutomatorTextEditor.vue b/src/components/tabs/automator/AutomatorTextEditor.vue
index ab381c5c4..e2c76bd80 100644
--- a/src/components/tabs/automator/AutomatorTextEditor.vue
+++ b/src/components/tabs/automator/AutomatorTextEditor.vue
@@ -179,7 +179,3 @@ export const AutomatorTextUI = {
     class="c-automator-editor l-automator-editor l-automator-pane__content"
   />
 </template>
-
-<style scoped>
-
-</style>

From ada8dc36bfff29da6d4f8bd71f283b6f81dde406 Mon Sep 17 00:00:00 2001
From: Hirame1 <56225774+Hirame1@users.noreply.github.com>
Date: Wed, 18 May 2022 23:15:16 +0700
Subject: [PATCH 78/89] Fix disclaimer text overflaw

---
 src/components/tabs/automator/AutomatorDocs.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/tabs/automator/AutomatorDocs.vue b/src/components/tabs/automator/AutomatorDocs.vue
index c987762e9..50f9839a4 100644
--- a/src/components/tabs/automator/AutomatorDocs.vue
+++ b/src/components/tabs/automator/AutomatorDocs.vue
@@ -211,10 +211,11 @@ export default {
           @click="infoPaneID = 4"
         />
         <AutomatorModeSwitch />
-        Switching will stop scripts
+        <div class="l-automator__disclaimer-text">
+          Switching will stop scripts
+        </div>
         <AutomatorButton
           v-tooltip="fullScreenTooltip"
-          class="l-automator__maximize-button"
           :class="fullScreenIconClass"
           @click="fullScreen = !fullScreen"
         />
@@ -282,9 +283,9 @@ export default {
 </template>
 
 <style scoped>
-.l-automator__maximize-button {
-  position: absolute;
-  right: 0;
+.l-automator__disclaimer-text {
+  text-align: left;
+  flex: 1;
 }
 
 .l-automator__script-names {

From a11419a7c6689bdc1bc11675bd27e2652bfd7880 Mon Sep 17 00:00:00 2001
From: Hirame1 <56225774+Hirame1@users.noreply.github.com>
Date: Wed, 18 May 2022 23:19:40 +0700
Subject: [PATCH 79/89] Fix margin of tomato mode switch

---
 src/components/tabs/automator/AutomatorModeSwitch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/tabs/automator/AutomatorModeSwitch.vue b/src/components/tabs/automator/AutomatorModeSwitch.vue
index 8dbd512a1..e40154a3d 100644
--- a/src/components/tabs/automator/AutomatorModeSwitch.vue
+++ b/src/components/tabs/automator/AutomatorModeSwitch.vue
@@ -110,7 +110,7 @@ export default {
   background-color: #626262;
   border: 0.2rem solid #767676;
   border-radius: 0.2rem;
-  margin: 0.4rem;
+  margin: 0.2rem 0.4rem;
   padding: 0.3rem 0;
   cursor: pointer;
 }

From 286204fcdf4ba4b03fe19cf9de4efa98cfd887d7 Mon Sep 17 00:00:00 2001
From: Hirame1 <56225774+Hirame1@users.noreply.github.com>
Date: Thu, 19 May 2022 00:02:12 +0700
Subject: [PATCH 80/89] Fix `Resumes on Line 0`

It happens when the script has exactly 10^n lines (n = 1, 2, 3...)
---
 src/components/tabs/automator/AutomatorControls.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/tabs/automator/AutomatorControls.vue b/src/components/tabs/automator/AutomatorControls.vue
index 3b8c006a0..8551a4362 100644
--- a/src/components/tabs/automator/AutomatorControls.vue
+++ b/src/components/tabs/automator/AutomatorControls.vue
@@ -41,7 +41,7 @@ export default {
     statusText() {
       // Pad with leading zeroes based on script length to prevent text jitter on fast scripts. This technically fails
       // for scripts with more than 99999 lines, but scripts that long will be prevented elsewhere
-      const digits = Math.clampMin(Math.ceil(Math.log10(AutomatorBackend.currentScriptLength)), 1);
+      const digits = Math.clampMin(Math.ceil(Math.log10(AutomatorBackend.currentScriptLength + 1)), 1);
       let lineNum = `0000${this.currentLine}`;
       lineNum = lineNum.slice(lineNum.length - digits);
 

From 6de2fb580c2eab117ba3d60f8fe904f0738af1ba Mon Sep 17 00:00:00 2001
From: SpectralFlame <4493131+cyip92@users.noreply.github.com>
Date: Wed, 18 May 2022 12:16:55 -0500
Subject: [PATCH 81/89] Fix css linting

---
 public/stylesheets/automator.css                    | 2 +-
 src/components/tabs/automator/AutomatorControls.vue | 2 +-
 src/components/tabs/automator/AutomatorDocs.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/stylesheets/automator.css b/public/stylesheets/automator.css
index 4d5941b90..d4211668f 100644
--- a/public/stylesheets/automator.css
+++ b/public/stylesheets/automator.css
@@ -138,8 +138,8 @@
 
 .l-automator__controls {
   display: flex;
-  flex-direction: column;
   flex: none;
+  flex-direction: column;
 }
 
 .l-automator-button-row {
diff --git a/src/components/tabs/automator/AutomatorControls.vue b/src/components/tabs/automator/AutomatorControls.vue
index 8551a4362..02390553c 100644
--- a/src/components/tabs/automator/AutomatorControls.vue
+++ b/src/components/tabs/automator/AutomatorControls.vue
@@ -169,8 +169,8 @@ export default {
 
 <style scoped>
 .c-automator__status-text {
-  color: var(--color-reality);
   font-size: 1.5rem;
+  color: var(--color-reality);
   font-weight: bold;
   padding: 0 0.5rem;
 }
diff --git a/src/components/tabs/automator/AutomatorDocs.vue b/src/components/tabs/automator/AutomatorDocs.vue
index 50f9839a4..f12efb98a 100644
--- a/src/components/tabs/automator/AutomatorDocs.vue
+++ b/src/components/tabs/automator/AutomatorDocs.vue
@@ -284,8 +284,8 @@ export default {
 
 <style scoped>
 .l-automator__disclaimer-text {
-  text-align: left;
   flex: 1;
+  text-align: left;
 }
 
 .l-automator__script-names {

From 6b792b018b1f0580c03a76780a1db26740329fa2 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 19 May 2022 16:02:05 +0800
Subject: [PATCH 82/89] Add a switch automator editor mode confirm modal

Confirmation notifies user that their running script will stop
---
 javascripts/core/app/modal.js                 |  2 +
 javascripts/core/player.js                    |  3 +-
 .../core/secret-formula/confirmation-types.js |  4 +
 .../modals/SwitchAutomatorEditorModal.vue     | 73 +++++++++++++++++++
 .../tabs/automator/AutomatorDocs.vue          |  8 --
 .../tabs/automator/AutomatorModeSwitch.vue    | 28 ++++---
 6 files changed, 98 insertions(+), 20 deletions(-)
 create mode 100644 src/components/modals/SwitchAutomatorEditorModal.vue

diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js
index 1ed604ab5..d56d2c10d 100644
--- a/javascripts/core/app/modal.js
+++ b/javascripts/core/app/modal.js
@@ -41,6 +41,7 @@ import SacrificeGlyphModal from "@/components/modals/glyph-management/SacrificeG
 import AutomatorScriptTemplate from "@/components/modals/AutomatorScriptTemplate";
 import AwayProgressModal from "@/components/modals/AwayProgressModal";
 import BreakInfinityModal from "@/components/modals/BreakInfinityModal";
+import SwitchAutomatorEditorModal from "@/components/modals/SwitchAutomatorEditorModal";
 import DeleteAutomatorScriptModal from "@/components/modals/DeleteAutomatorScriptModal";
 import EnslavedHintsModal from "@/components/modals/EnslavedHintsModal";
 import GlyphSetSaveDeleteModal from "@/components/modals/GlyphSetSaveDeleteModal";
@@ -189,6 +190,7 @@ Modal.import = new Modal(ImportSaveModal);
 Modal.importScript = new Modal(ImportAutomatorScriptModal);
 Modal.automatorScriptDelete = new Modal(DeleteAutomatorScriptModal);
 Modal.automatorScriptTemplate = new Modal(AutomatorScriptTemplate);
+Modal.switchAutomatorEditorMode = new Modal(SwitchAutomatorEditorModal);
 Modal.shop = new Modal(StdStoreModal);
 Modal.studyString = new Modal(StudyStringModal);
 Modal.singularityMilestones = new Modal(SingularityMilestonesModal);
diff --git a/javascripts/core/player.js b/javascripts/core/player.js
index 7a6fbdfa0..81aef4a84 100644
--- a/javascripts/core/player.js
+++ b/javascripts/core/player.js
@@ -811,7 +811,8 @@ window.player = {
       bigCrunch: true,
       replicantiGalaxy: true,
       antimatterGalaxy: true,
-      dimensionBoost: true
+      dimensionBoost: true,
+      switchAutomatorMode: true
     },
     awayProgress: {
       antimatter: true,
diff --git a/javascripts/core/secret-formula/confirmation-types.js b/javascripts/core/secret-formula/confirmation-types.js
index fee535d74..48c93f9df 100644
--- a/javascripts/core/secret-formula/confirmation-types.js
+++ b/javascripts/core/secret-formula/confirmation-types.js
@@ -57,6 +57,10 @@ GameDatabase.confirmationTypes = [
     name: "Glyph Undo",
     option: "glyphUndo",
     isUnlocked: () => TeresaUnlocks.undo.canBeApplied,
+  }, {
+    name: "Switch Automator Editor",
+    option: "switchAutomatorMode",
+    isUnlocked: () => Player.automatorUnlocked,
   }, {
     name: "Reset Celestial",
     option: "resetCelestial",
diff --git a/src/components/modals/SwitchAutomatorEditorModal.vue b/src/components/modals/SwitchAutomatorEditorModal.vue
new file mode 100644
index 000000000..ec70a6ba5
--- /dev/null
+++ b/src/components/modals/SwitchAutomatorEditorModal.vue
@@ -0,0 +1,73 @@
+<script>
+import ModalWrapperChoice from "@/components/modals/ModalWrapperChoice";
+
+export default {
+  name: "SwitchAutomatorEditorModal",
+  components: {
+    ModalWrapperChoice
+  },
+  props: {
+    modalConfig: {
+      type: Object,
+      required: false,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      isCurrentlyBlocks: false
+    }
+  },
+  computed: {
+    currentScriptID: {
+      get() {
+        return this.$viewModel.tabs.reality.automator.editorScriptID;
+      },
+      set(value) {
+        this.$viewModel.tabs.reality.automator.editorScriptID = value;
+      }
+    },
+    currentScriptContent() {
+      return player.reality.automator.scripts[this.currentScriptID].content;
+    },
+  },
+  methods: {
+    update() {
+      this.isCurrentlyBlocks = player.reality.automator.type === AUTOMATOR_TYPE.BLOCK;
+    },
+    toggleAutomatorMode() {
+      const scriptID = this.currentScriptID;
+      Tutorial.moveOn(TUTORIAL_STATE.AUTOMATOR);
+      if (this.isCurrentlyBlocks) {
+        // This saves the script after converting it.
+        BlockAutomator.parseTextFromBlocks();
+        player.reality.automator.type = AUTOMATOR_TYPE.TEXT;
+      } else if (BlockAutomator.fromText(this.currentScriptContent)) {
+        AutomatorBackend.saveScript(scriptID, AutomatorTextUI.editor.getDoc().getValue());
+        player.reality.automator.type = AUTOMATOR_TYPE.BLOCK;
+      } else {
+        Modal.message.show("Automator script has errors, cannot convert to blocks.");
+      }
+      this.modalConfig.callback?.();
+    }
+  }
+};
+</script>
+
+<template>
+  <ModalWrapperChoice
+    @confirm="toggleAutomatorMode"
+    option="switchAutomatorMode"
+  >
+    <template #header>
+      Change Automator to {{ isCurrentlyBlocks ? "text" : "block" }} editor
+    </template>
+    <div class="c-modal-message__text">
+      Are you sure you want to change to the {{ isCurrentlyBlocks ? "text" : "block" }} editor?
+      This will stop your current script!
+    </div>
+    <template #confirm-text>
+      Change Modes
+    </template>
+  </ModalWrapperChoice>
+</template>
\ No newline at end of file
diff --git a/src/components/tabs/automator/AutomatorDocs.vue b/src/components/tabs/automator/AutomatorDocs.vue
index f12efb98a..90d5ff770 100644
--- a/src/components/tabs/automator/AutomatorDocs.vue
+++ b/src/components/tabs/automator/AutomatorDocs.vue
@@ -211,9 +211,6 @@ export default {
           @click="infoPaneID = 4"
         />
         <AutomatorModeSwitch />
-        <div class="l-automator__disclaimer-text">
-          Switching will stop scripts
-        </div>
         <AutomatorButton
           v-tooltip="fullScreenTooltip"
           :class="fullScreenIconClass"
@@ -283,11 +280,6 @@ export default {
 </template>
 
 <style scoped>
-.l-automator__disclaimer-text {
-  flex: 1;
-  text-align: left;
-}
-
 .l-automator__script-names {
   display: flex;
   flex-direction: row;
diff --git a/src/components/tabs/automator/AutomatorModeSwitch.vue b/src/components/tabs/automator/AutomatorModeSwitch.vue
index e40154a3d..996c38659 100644
--- a/src/components/tabs/automator/AutomatorModeSwitch.vue
+++ b/src/components/tabs/automator/AutomatorModeSwitch.vue
@@ -62,19 +62,25 @@ export default {
       this.$nextTick(() => BlockAutomator.fromText(this.currentScript));
     },
     toggleAutomatorMode() {
-      const scriptID = ui.view.tabs.reality.automator.editorScriptID;
-      Tutorial.moveOn(TUTORIAL_STATE.AUTOMATOR);
-      if (this.automatorType === AUTOMATOR_TYPE.BLOCK) {
-        // This saves the script after converting it.
-        BlockAutomator.parseTextFromBlocks();
-        player.reality.automator.type = AUTOMATOR_TYPE.TEXT;
-      } else if (BlockAutomator.fromText(this.currentScriptContent)) {
-        AutomatorBackend.saveScript(scriptID, AutomatorTextUI.editor.getDoc().getValue());
-        player.reality.automator.type = AUTOMATOR_TYPE.BLOCK;
+      if (AutomatorBackend.state.mode === AUTOMATOR_MODE.PAUSE || !player.options.confirmations.switchAutomatorMode) {
+        const scriptID = this.currentScriptID;
+        Tutorial.moveOn(TUTORIAL_STATE.AUTOMATOR);
+        if (this.automatorType === AUTOMATOR_TYPE.BLOCK) {
+          // This saves the script after converting it.
+          BlockAutomator.parseTextFromBlocks();
+          player.reality.automator.type = AUTOMATOR_TYPE.TEXT;
+        } else if (BlockAutomator.fromText(this.currentScriptContent)) {
+          AutomatorBackend.saveScript(scriptID, AutomatorTextUI.editor.getDoc().getValue());
+          player.reality.automator.type = AUTOMATOR_TYPE.BLOCK;
+        } else {
+          Modal.message.show("Automator script has errors, cannot convert to blocks.");
+        }
+        this.$recompute("currentScriptContent");
       } else {
-        Modal.message.show("Automator script has errors, cannot convert to blocks.");
+        Modal.switchAutomatorEditorMode.show({
+          callBack: () => this.$recompute("currentScriptContent")
+        });
       }
-      this.$recompute("currentScriptContent");
     }
   }
 };

From 0915e31d9dbe61eeb9137591a134dfae86cb4412 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Thu, 19 May 2022 16:04:25 +0800
Subject: [PATCH 83/89] Fix ESLint errors

SwitchAutomatorEditorModal.vue: Missing semicolon in data: () {}, order of vue props
modals.js: Fix import order after renaming
---
 javascripts/core/app/modal.js                        | 2 +-
 src/components/modals/SwitchAutomatorEditorModal.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/javascripts/core/app/modal.js b/javascripts/core/app/modal.js
index d56d2c10d..84350998f 100644
--- a/javascripts/core/app/modal.js
+++ b/javascripts/core/app/modal.js
@@ -41,7 +41,6 @@ import SacrificeGlyphModal from "@/components/modals/glyph-management/SacrificeG
 import AutomatorScriptTemplate from "@/components/modals/AutomatorScriptTemplate";
 import AwayProgressModal from "@/components/modals/AwayProgressModal";
 import BreakInfinityModal from "@/components/modals/BreakInfinityModal";
-import SwitchAutomatorEditorModal from "@/components/modals/SwitchAutomatorEditorModal";
 import DeleteAutomatorScriptModal from "@/components/modals/DeleteAutomatorScriptModal";
 import EnslavedHintsModal from "@/components/modals/EnslavedHintsModal";
 import GlyphSetSaveDeleteModal from "@/components/modals/GlyphSetSaveDeleteModal";
@@ -58,6 +57,7 @@ import SacrificeModal from "@/components/modals/SacrificeModal";
 import SingularityMilestonesModal from "@/components/modals/SingularityMilestonesModal";
 import StdStoreModal from "@/components/modals/StdStoreModal";
 import StudyStringModal from "@/components/modals/StudyStringModal";
+import SwitchAutomatorEditorModal from "@/components/modals/SwitchAutomatorEditorModal";
 import UiChoiceModal from "@/components/modals/UiChoiceModal";
 import UndoGlyphModal from "@/components/modals/UndoGlyphModal";
 
diff --git a/src/components/modals/SwitchAutomatorEditorModal.vue b/src/components/modals/SwitchAutomatorEditorModal.vue
index ec70a6ba5..3b1876cd8 100644
--- a/src/components/modals/SwitchAutomatorEditorModal.vue
+++ b/src/components/modals/SwitchAutomatorEditorModal.vue
@@ -16,7 +16,7 @@ export default {
   data() {
     return {
       isCurrentlyBlocks: false
-    }
+    };
   },
   computed: {
     currentScriptID: {
@@ -56,8 +56,8 @@ export default {
 
 <template>
   <ModalWrapperChoice
-    @confirm="toggleAutomatorMode"
     option="switchAutomatorMode"
+    @confirm="toggleAutomatorMode"
   >
     <template #header>
       Change Automator to {{ isCurrentlyBlocks ? "text" : "block" }} editor

From 8aebc536609b0086615b4296a10e037a68cf31e9 Mon Sep 17 00:00:00 2001
From: SpectralFlame <4493131+cyip92@users.noreply.github.com>
Date: Thu, 19 May 2022 08:09:23 -0500
Subject: [PATCH 84/89] Move full-screen automator button to corner

---
 src/components/tabs/automator/AutomatorDocs.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/tabs/automator/AutomatorDocs.vue b/src/components/tabs/automator/AutomatorDocs.vue
index 90d5ff770..00d4407a0 100644
--- a/src/components/tabs/automator/AutomatorDocs.vue
+++ b/src/components/tabs/automator/AutomatorDocs.vue
@@ -214,6 +214,7 @@ export default {
         <AutomatorButton
           v-tooltip="fullScreenTooltip"
           :class="fullScreenIconClass"
+          class="l-automator__expand-corner"
           @click="fullScreen = !fullScreen"
         />
       </div>
@@ -280,6 +281,11 @@ export default {
 </template>
 
 <style scoped>
+.l-automator__expand-corner {
+  position: absolute;
+  right: 0;
+}
+
 .l-automator__script-names {
   display: flex;
   flex-direction: row;

From ac813a2fe9696bb7b95f97a3cf4c2222f7de1a52 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Sun, 22 May 2022 21:14:12 +0800
Subject: [PATCH 85/89] Prevent switching to script with errors while in block
 mode

---
 src/components/tabs/automator/AutomatorDocs.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/tabs/automator/AutomatorDocs.vue b/src/components/tabs/automator/AutomatorDocs.vue
index 00d4407a0..13975c809 100644
--- a/src/components/tabs/automator/AutomatorDocs.vue
+++ b/src/components/tabs/automator/AutomatorDocs.vue
@@ -130,6 +130,10 @@ export default {
         this.currentScriptID = Object.keys(storedScripts)[0];
         player.reality.automator.state.editorScript = this.currentScriptID;
       }
+      if (!AutomatorGrammar.blockifyTextAutomator(this.currentScript)) {
+        player.reality.automator.type = AUTOMATOR_TYPE.TEXT;
+        Modal.message.show("Automator script has errors, cannot view in blocks.");
+      }
       this.$nextTick(() => BlockAutomator.fromText(this.currentScript));
     },
     rename() {

From b897d2184e03fe722a58487fd4b11158f5411116 Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Mon, 23 May 2022 20:07:33 +0800
Subject: [PATCH 86/89] Use x formatting above 100% for charged passive RM upg

---
 javascripts/core/secret-formula/infinity/infinity-upgrades.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/javascripts/core/secret-formula/infinity/infinity-upgrades.js b/javascripts/core/secret-formula/infinity/infinity-upgrades.js
index bc0b9e33f..9d31d6d89 100644
--- a/javascripts/core/secret-formula/infinity/infinity-upgrades.js
+++ b/javascripts/core/secret-formula/infinity/infinity-upgrades.js
@@ -177,9 +177,9 @@ GameDatabase.infinity.upgrades = {
       description: () =>
         `Gain a percentage of your Reality Machines gained on Reality each real-time second,
         percent increases with Teresa level`,
-      effect: () => Math.sqrt(Ra.pets.teresa.level) / 1000 *
+      effect: () => Math.sqrt(Ra.pets.teresa.level) *
         Ra.unlocks.continuousTTBoost.effects.autoPrestige.effectOrDefault(1),
-      formatEffect: value => `${formatPercents(value, 2)}`
+      formatEffect: value => (value > 1 ? formatX(value, 2) : formatPercents(value, 2))
     }
   },
   skipReset1: {

From eba608fe83008a92415642ba3774de36a292cd5b Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Mon, 23 May 2022 20:47:49 +0800
Subject: [PATCH 87/89] Remove unneeded ternary

---
 javascripts/core/secret-formula/infinity/infinity-upgrades.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javascripts/core/secret-formula/infinity/infinity-upgrades.js b/javascripts/core/secret-formula/infinity/infinity-upgrades.js
index 9d31d6d89..6a5f486cd 100644
--- a/javascripts/core/secret-formula/infinity/infinity-upgrades.js
+++ b/javascripts/core/secret-formula/infinity/infinity-upgrades.js
@@ -179,7 +179,7 @@ GameDatabase.infinity.upgrades = {
         percent increases with Teresa level`,
       effect: () => Math.sqrt(Ra.pets.teresa.level) *
         Ra.unlocks.continuousTTBoost.effects.autoPrestige.effectOrDefault(1),
-      formatEffect: value => (value > 1 ? formatX(value, 2) : formatPercents(value, 2))
+      formatEffect: value => formatX(value, 2)
     }
   },
   skipReset1: {

From e04feda3e95032b9ead580d58c6c3ba0d6c4547d Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Mon, 23 May 2022 20:55:25 +0800
Subject: [PATCH 88/89] Fix mato always showing "Has errors can't view in
 blocks" despite in text mode

---
 src/components/tabs/automator/AutomatorDocs.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/tabs/automator/AutomatorDocs.vue b/src/components/tabs/automator/AutomatorDocs.vue
index 13975c809..d284ae9b0 100644
--- a/src/components/tabs/automator/AutomatorDocs.vue
+++ b/src/components/tabs/automator/AutomatorDocs.vue
@@ -130,7 +130,7 @@ export default {
         this.currentScriptID = Object.keys(storedScripts)[0];
         player.reality.automator.state.editorScript = this.currentScriptID;
       }
-      if (!AutomatorGrammar.blockifyTextAutomator(this.currentScript)) {
+      if (this.isBlock && !AutomatorGrammar.blockifyTextAutomator(this.currentScript)) {
         player.reality.automator.type = AUTOMATOR_TYPE.TEXT;
         Modal.message.show("Automator script has errors, cannot view in blocks.");
       }

From 4ad3d2591c2555c3b4f52bfba5e6c972a638e4ae Mon Sep 17 00:00:00 2001
From: Dys <50160441+Dystopia-user181@users.noreply.github.com>
Date: Mon, 23 May 2022 22:02:51 +0800
Subject: [PATCH 89/89] Fix ra pet container being weird

---
 public/stylesheets/styles.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/stylesheets/styles.css b/public/stylesheets/styles.css
index 3d81e1dde..2cbc5158f 100644
--- a/public/stylesheets/styles.css
+++ b/public/stylesheets/styles.css
@@ -7275,7 +7275,6 @@ kbd {
 .l-ra-pet-container {
   float: left;
   width: 50%;
-  height: 50%;
 }
 
 .c-ra-memory-header {