diff --git a/src/components/Contact.astro b/src/components/Contact.astro
index 4763f66..0dad47e 100644
--- a/src/components/Contact.astro
+++ b/src/components/Contact.astro
@@ -52,7 +52,7 @@ import {SecretEmail} from '@scripts/SecretEmail';
   }
 
   .Contact {
-    z-index: var(--index-surface);
+    z-index: var(--index-thermosphere);
     position: absolute;
     bottom: var(--space-tight);
     left: var(--space-tight);
diff --git a/src/components/Hamburger.astro b/src/components/Hamburger.astro
index 8887fab..372237c 100644
--- a/src/components/Hamburger.astro
+++ b/src/components/Hamburger.astro
@@ -156,7 +156,7 @@ const {id, controlsId} = Astro.props;
   /* --- Component --- */
 
   .Hamburger {
-    z-index: var(--index-troposphere);
+    z-index: var(--index-thermosphere);
     position: fixed;
     bottom: var(--space-tight);
     right: var(--space-tight);
diff --git a/src/components/Navigation.astro b/src/components/Navigation.astro
index 7f96da7..b9a6def 100644
--- a/src/components/Navigation.astro
+++ b/src/components/Navigation.astro
@@ -88,7 +88,7 @@ const {id, items = []} = Astro.props;
 
   .List {
     position: fixed;
-    z-index: var(--index-stratosphere);
+    z-index: var(--index-thermosphere);
     bottom: var(--nav-list-bottom);
     right: 0;
 
diff --git a/src/components/Toast.astro b/src/components/Toast.astro
index a4e1f33..1037242 100644
--- a/src/components/Toast.astro
+++ b/src/components/Toast.astro
@@ -72,7 +72,7 @@ const {
 
   .Toast {
     position: fixed;
-    z-index: var(--index-thermosphere);
+    z-index: var(--index-outerspace);
     bottom: var(--space-tighter);
     left: auto;
     right: auto;
diff --git a/src/mock/ToastTest.astro b/src/mock/ToastTest.astro
index fe303e3..a701048 100644
--- a/src/mock/ToastTest.astro
+++ b/src/mock/ToastTest.astro
@@ -14,7 +14,7 @@
 
 <style>
   .ToastTest {
-    z-index: var(--index-troposphere);
+    z-index: var(--index-thermosphere);
     position: absolute;
     top: var(--space);
     left: var(--space);
@@ -169,7 +169,7 @@
       (event) => {
         console.log('This Toast has just been removed!', newId, event);
         removeItem(newIndex);
-      },
+      }
     );
 
     console.log('A new Toast has just been created!', newId);
diff --git a/src/sections/ProjectOverlay.astro b/src/sections/ProjectOverlay.astro
index 198e596..d18713c 100644
--- a/src/sections/ProjectOverlay.astro
+++ b/src/sections/ProjectOverlay.astro
@@ -18,7 +18,7 @@ const {id} = Astro.props;
 
   .ProjectOverlay {
     display: none;
-    z-index: var(--index-mesosphere);
+    z-index: var(--index-exosphere);
     position: fixed;
     inset: 0;
     background-color: rgb(0, 0, 0, 0.6);
diff --git a/src/styles/global.css b/src/styles/global.css
index 795d10e..ab07d65 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -145,7 +145,7 @@ body {
 
   &::after {
     content: '';
-    z-index: var(--index-outerspace);
+    z-index: var(--index-mesosphere);
     position: fixed;
     inset: 0;
     pointer-events: none;