diff --git a/pages/download.html b/pages/download.html
index d2cec08..d2ea1cc 100644
--- a/pages/download.html
+++ b/pages/download.html
@@ -35,7 +35,7 @@
             <h1>
                 $FileName
             </h1>
-            <p style="color:#999999">
+            <p style="color:var(--subtext)">
                 <span class="number">$FileSize</span>&nbsp;&nbsp;—&nbsp;&nbsp;uploaded by <span class="number">$Uploader</span>
             </p>
 
diff --git a/src/style/app/pulldown/accounts.scss b/src/style/app/pulldown/accounts.scss
index fb39653..01c9dd9 100644
--- a/src/style/app/pulldown/accounts.scss
+++ b/src/style/app/pulldown/accounts.scss
@@ -163,7 +163,7 @@
         h1 {
             font-weight:600;
             font-size:20px;
-            color: #AAAAAA;
+            color: var(--subtext);
 
             @media screen and (max-width:500px) {
                 font-size:24px;
diff --git a/src/style/app/topbar.scss b/src/style/app/topbar.scss
index a57d704..28ce551 100644
--- a/src/style/app/topbar.scss
+++ b/src/style/app/topbar.scss
@@ -9,7 +9,7 @@
     height:40px;
 
     /* hsl(210,9.1,12.9) */
-    background-color: rgb(30, 33, 36);
+    background-color: var(--crust);
 
     display:flex;
     flex-direction: row;
diff --git a/src/style/app/uploads.scss b/src/style/app/uploads.scss
index 15f49e9..1d4ac2a 100644
--- a/src/style/app/uploads.scss
+++ b/src/style/app/uploads.scss
@@ -16,7 +16,7 @@
     }
 
     background:var(--panel);
-    color:#ddd;
+    color:var(--text);
 
     h1, p, a {
         margin: 0px;
@@ -28,12 +28,12 @@
         padding: 0;
         margin-top: 5px;
 
-        img {
+        svg {
             color: var(--subtext);
         }
 
         &:hover {
-            img { color: var(--text); }
+            svg { color: var(--text); }
         }
     }
 
diff --git a/src/svelte/elem/UploadWindow.svelte b/src/svelte/elem/UploadWindow.svelte
index 2378dce..afe7e8a 100644
--- a/src/svelte/elem/UploadWindow.svelte
+++ b/src/svelte/elem/UploadWindow.svelte
@@ -193,7 +193,7 @@
             </button>
         {/if}
     </h1>
-    <p style:color="#999999">
+    <p style:color="var(--subtext)">
         <span class="number"
             >{$serverStats.version ? `v${$serverStats.version}` : "•••"}</span
         >&nbsp;&nbsp;—&nbsp;&nbsp;Discord based file sharing
@@ -216,7 +216,7 @@
                 >
                     <h2>
                         {upload[1].name}
-                        <span style:color="#999999" style:font-weight="400"
+                        <span style:color="var(--subtext)" style:font-weight="400"
                             >{upload[1].type}{@html upload[1].type == "upload"
                                 ? `&nbsp;(${Math.round(
                                       upload[1].file.size / 1048576
@@ -362,7 +362,7 @@
                 />
             {/if}
         {:else}
-            <p transition:_void style:color="#999999" style:text-align="center">
+            <p transition:_void style:color="var(--subtext)" style:text-align="center">
                 Please log in to upload files.
             </p>
             <div
@@ -372,7 +372,7 @@
         {/if}
     {/if}
 
-    <p style:color="#999999" style:text-align="center">
+    <p style:color="var(--subtext)" style:text-align="center">
         Hosting <span class="number" style:font-weight="600"
             >{$serverStats.files || "•••"}</span
         >
@@ -384,7 +384,7 @@
         >
         <br />
     </p>
-    <p style:color="#999999" style:text-align="center" style:font-size="12px">
+    <p style:color="var(--subtext)" style:text-align="center" style:font-size="12px">
         Made with {Math.floor(Math.random() * 10) == 0 ? "🐟" : "❤"} by
         <a href="https://cetera.uk" style:font-size="12px"
             ><svg