diff --git a/web/static/css/stylesheet.css b/web/static/css/stylesheet.css
index 158360f..ac53e64 100755
--- a/web/static/css/stylesheet.css
+++ b/web/static/css/stylesheet.css
@@ -245,7 +245,7 @@ html.dark {
         background-color: #351b1b;
     }
 
-    input, textarea, select, .input-group-addon, .panel, select, th {
+    input, textarea, select, .input-group-addon, select {
         background-color: #282828;
         border-color: #282828;
         color: #EEEEEE;
@@ -267,15 +267,17 @@ html.dark {
       }
 
     tr:nth-child(odd) {
-        background-color: #151515;
+        background-color: #282828;
+        color: #EEEEEE;
     }
 
-    tr:nth-child(even) {
-        background-color: #282828;
+    tr:nth-child(even), th {
+        background-color: #151515;
+        color: #EEEEEE;
     }
 
-    .list-group-item {
-        background-color: #282828;
+    .list-group-item, .panel {
+        background-color: #151515;
         border-color: #4d4d4d;
     }
 
diff --git a/web/static/js/darkModeState.js b/web/static/js/darkModeState.js
index 5226c6e..8b6b4c2 100644
--- a/web/static/js/darkModeState.js
+++ b/web/static/js/darkModeState.js
@@ -98,9 +98,11 @@ function setThemeToggle() {
         for (let i = 0; i < panels.length; i++) {
             panels[i].classList = "panel panel-primary";
         }
-        const success = document.getElementsByClassName("success");
-        for (let i = 0; i < success.length; i++) {
-            success[i].classList = "success-dark";
+        for (let n = 0; n < 5; n++) {
+            const success = document.getElementsByClassName("success");
+            for (let i = 0; i < success.length; i++) {
+                success[i].classList = "success-dark";
+            }
         }
         for (let n = 0; n < 5; n++) {
             const danger = document.getElementsByClassName("danger");