diff --git a/src/components/Progress.css b/src/components/Progress.css
index a0116519..eb7e9d73 100644
--- a/src/components/Progress.css
+++ b/src/components/Progress.css
@@ -24,7 +24,7 @@
 .progress .bar {
     width: 13rem;
     max-width: 100%;
-    background-color: #35363D;
+    background-color: var(--content);
     border-radius: 10px;
     height: 7px;
     display: inline-block;
diff --git a/src/components/Title.css b/src/components/Title.css
index c5691634..5e749821 100644
--- a/src/components/Title.css
+++ b/src/components/Title.css
@@ -12,7 +12,7 @@
 }
 .title-size-small {
     font-size: 1.1rem;
-    color: #afb1b8;
+    color: var(--text-secondary);
 }
 
 .title-accent {
diff --git a/src/components/TypeSelector.css b/src/components/TypeSelector.css
index 39273f17..80902e74 100644
--- a/src/components/TypeSelector.css
+++ b/src/components/TypeSelector.css
@@ -13,7 +13,7 @@
     position: absolute;
     width: 100%;
     bottom: 0;
-    background-color: #3a3c46;
+    background-color: var(--content);
     height: 4px;
     border-radius: 2px;
 }
@@ -27,14 +27,14 @@
     align-items: center;
     text-align: center;
     box-sizing: border-box;
-    color: #585A67;
+    color: var(--text-tertiary);
     font-weight: bold;
     cursor: pointer;
     user-select: none;
 }
 
 .typeSelector .choice:hover { 
-    color: #afb1b8;
+    color: var(--text-secondary);
 }
 
 .typeSelector .choice.selected {
diff --git a/src/components/VideoElement.css b/src/components/VideoElement.css
index bb829039..cff2fd1d 100644
--- a/src/components/VideoElement.css
+++ b/src/components/VideoElement.css
@@ -1,6 +1,6 @@
 .videoElement {
     width: 100%;
-    background-color: #111117;
+    background-color: var(--content);
     border-radius: 5px;
 }
 
diff --git a/src/components/VideoElement.js b/src/components/VideoElement.js
index a1cce9b6..f1aa506a 100644
--- a/src/components/VideoElement.js
+++ b/src/components/VideoElement.js
@@ -34,7 +34,7 @@ export function VideoElement({ streamUrl, loading }) {
         return <VideoPlaceholder>Loading episode...</VideoPlaceholder>
     
     if (!streamUrl || streamUrl.length === 0)
-        return <videoPlaceholder>No video selected</videoPlaceholder>
+        return <VideoPlaceholder>No video selected</VideoPlaceholder>
 
     return (
         <video className="videoElement" ref={videoRef} controls autoPlay />
diff --git a/src/index.css b/src/index.css
index 59379657..4b74e5d0 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,6 +1,4 @@
 :root {
-
-  /* TODO finish theming for entire css */
   --theme-color: #E880C5;
   --theme-color-text: var(--theme-color);
   
@@ -11,6 +9,7 @@
 
   --text: white;
   --text-secondary: #BCBECB;
+  --text-tertiary: #585A67;
 
   --content: #36363e;
   --content-hover: #3C3D44;
@@ -22,7 +21,6 @@
   --choice: #2E2F37;
   --choice-hover: #45464D;
   --choice-active: #45464D;
-
 }
 
 body, html {
diff --git a/src/views/Search.css b/src/views/Search.css
index 983bd086..0e0a9932 100644
--- a/src/views/Search.css
+++ b/src/views/Search.css
@@ -29,7 +29,7 @@
     margin: 0;
 }
 .topRightCredits a:hover, .topRightCredits a:active {
-    color: #f19fd6;
+    color: var(--theme-color);
     text-decoration: none;
 }