diff --git a/app/static/css/themes/nord-dark.css b/app/static/css/themes/nord-dark.css
deleted file mode 100644
index 9b91ebb..0000000
--- a/app/static/css/themes/nord-dark.css
+++ /dev/null
@@ -1,52 +0,0 @@
-html {
-    background-color: #292E39 !important;
-}
-
-body {
-    background-color: #292E39 !important;
-}
-
-div {
-    /*background-color: #111 !important;*/
-    color: #ECEFF4 !important;
-}
-
-a:visited h3 div {
-    color: #ECEFF4 !important;
-}
-
-a:link h3 div {
-    color: #88C0D0 !important;
-}
-
-a:link div {
-    color: #8FBCBB !important;
-}
-
-div span {
-    color: #81A1C1 !important;
-}
-
-input {
-    background-color: #292E39 !important;
-    color: #ECEFF4 !important;
-}
-
-#search-bar {
-    color: #ECEFF4 !important;
-    background-color: #292E39 !important;
-}
-
-.search-container {
-    background-color: #292E39 !important;
-}
-
-footer {
-    background-color: #292E39 !important;
-    color: #ECEFF4;
-}
-
-.reskin {
-    background-color: #2E3440;
-    color: #ECEFF4;
-}
\ No newline at end of file
diff --git a/app/static/css/themes/nord-search-dark.css b/app/static/css/themes/nord-search-dark.css
deleted file mode 100644
index feec947..0000000
--- a/app/static/css/themes/nord-search-dark.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.autocomplete {
-    position: relative;
-    display: inline-block;
-    width: 100%;
-}
-
-.autocomplete-items {
-    position: absolute;
-    border: 1px solid #685e79;
-    border-bottom: none;
-    border-top: none;
-    z-index: 99;
-
-    /*position the autocomplete items to be the same width as the container:*/
-    top: 100%;
-    left: 0;
-    right: 0;
-}
-
-.autocomplete-items div {
-    padding: 10px;
-    cursor: pointer;
-    color: #fff;
-    background-color: #292E39;
-    border-bottom: 1px solid #242424;
-}
-
-.autocomplete-items div:hover {
-    background-color: #404040;
-}
-
-.autocomplete-active {
-    background-color: #685e79 !important;
-    color: #ffffff;
-}
\ No newline at end of file
diff --git a/app/static/css/themes/nord-search-light.css b/app/static/css/themes/nord-search-light.css
deleted file mode 100644
index 08917fa..0000000
--- a/app/static/css/themes/nord-search-light.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.autocomplete {
-    position: relative;
-    display: inline-block;
-    width: 100%;
-}
-
-.autocomplete-items {
-    position: absolute;
-    border: 1px solid #685e79;
-    border-bottom: none;
-    border-top: none;
-    z-index: 99;
-
-    /*position the autocomplete items to be the same width as the container:*/
-    top: 100%;
-    left: 0;
-    right: 0;
-}
-
-.autocomplete-items div {
-    padding: 10px;
-    cursor: pointer;
-    color: #3B4252;
-    background-color: #D8DEE9b3;
-    border-bottom: 1px solid #242424;
-}
-
-.autocomplete-items div:hover {
-    background-color: #404040;
-}
-
-.autocomplete-active {
-    background-color: #685e79 !important;
-    color: #f9fafb;
-}
\ No newline at end of file
diff --git a/app/static/css/themes/whoogle-search-dark.css b/app/static/css/themes/nord-search.css
similarity index 75%
rename from app/static/css/themes/whoogle-search-dark.css
rename to app/static/css/themes/nord-search.css
index 2ac5b47..78a1b3c 100644
--- a/app/static/css/themes/whoogle-search-dark.css
+++ b/app/static/css/themes/nord-search.css
@@ -20,16 +20,17 @@
 .autocomplete-items div {
     padding: 10px;
     cursor: pointer;
-    color: #fff;
-    background-color: #000;
+    color: #3B4252 !important;
+    background-color: #ECEFF4 !important;
     border-bottom: 1px solid #242424;
 }
 
 .autocomplete-items div:hover {
-    background-color: #404040;
+    background-color: #4C566A !important;
+    color: #ECEFF4 !important;
 }
 
 .autocomplete-active {
     background-color: #685e79 !important;
-    color: #ffffff;
+    color: #f9fafb !important;
 }
\ No newline at end of file
diff --git a/app/static/css/themes/nord-light.css b/app/static/css/themes/nord.css
similarity index 73%
rename from app/static/css/themes/nord-light.css
rename to app/static/css/themes/nord.css
index 573699d..29df885 100644
--- a/app/static/css/themes/nord-light.css
+++ b/app/static/css/themes/nord.css
@@ -2,12 +2,8 @@ html {
     background-color: #D8DEE9b3 !important;
 }
 
-body {
-    background-color: #f9fafb !important;
-}
-
 div {
-    /*background-color: #111 !important;*/
+    /*background-color: #D8DEE9b3 !important;*/
     color: #3B4252 !important;
 }
 
@@ -37,12 +33,8 @@ input {
     background-color: #ffffff !important;
 }
 
-.search-container {
-    background-color: #f9fafb !important;
-}
-
 footer {
-    background-color: #f9fafb !important;
+    background-color: #ECEFF4 !important;
     color: #3B4252;
 }
 
diff --git a/app/static/css/themes/whoogle-dark.css b/app/static/css/themes/whoogle-dark.css
deleted file mode 100644
index 0ffc496..0000000
--- a/app/static/css/themes/whoogle-dark.css
+++ /dev/null
@@ -1,47 +0,0 @@
-html {
-    background-color: #000 !important;
-}
-
-body {
-    background-color: #222 !important;
-}
-
-div {
-    /*background-color: #111 !important;*/
-    color: #fff !important;
-}
-
-a:visited h3 div {
-    color: #bbbbff !important;
-}
-
-a:link h3 div {
-    color: #4b8eea !important;
-}
-
-a:link div {
-    color: #aaffaa !important;
-}
-
-div span {
-    color: #bbb !important;
-}
-
-input {
-    background-color: #111 !important;
-    color: #fff !important;
-}
-
-#search-bar {
-    color: #fff !important;
-    background-color: #000 !important;
-}
-
-.search-container {
-    background-color: #000 !important;
-}
-
-.reskin {
-    background-color: #000;
-    color: #fff;
-}
\ No newline at end of file
diff --git a/app/static/css/search.css b/app/static/css/themes/whoogle-search.css
similarity index 100%
rename from app/static/css/search.css
rename to app/static/css/themes/whoogle-search.css
diff --git a/app/static/css/themes/whoogle.css b/app/static/css/themes/whoogle.css
new file mode 100644
index 0000000..e69de29
diff --git a/app/templates/display.html b/app/templates/display.html
index c6f66bb..0cd127a 100644
--- a/app/templates/display.html
+++ b/app/templates/display.html
@@ -7,17 +7,13 @@
         <meta name="referrer" content="no-referrer">
         <script type="text/javascript" src="/static/js/autocomplete.js"></script>
         {% if theme %}
-            <link rel="stylesheet" href="/static/css/{{'theme/' if theme else ''}}{{ 'search-dark' if dark_mode else 'search-light' }}.css" />
+            <link rel="stylesheet" href="/static/css/themes{{ theme }}.css" />
+            <link rel="stylesheet" href="/static/css/themes{{ theme }}-search.css" />
         {% else %}
             <link rel="stylesheet" href="/static/css/{{ 'dark-' if dark_mode else '' }}theme.css" />
             <link rel="stylesheet" href="/static/css/{{ 'search-dark' if dark_mode else 'search-light' }}.css">
         {% endif %}
         <link rel="stylesheet" href="/static/css/header.css">
-        {% if theme %}
-            <link rel="stylesheet" href="/static/css/themes/{{theme}}{{ '-dark' if dark_mode else '-light' }}.css" />
-        {% else %}
-            <link rel="stylesheet" href="/static/css/{{ 'dark-' if dark_mode else '' }}theme.css" />
-        {% endif %}
         <title>{{ query }} - Whoogle Search</title>
     </head>
     <body>
@@ -26,7 +22,7 @@
     </body>
     <footer>
         <p>
-            Whoogle Search v{{ version_number }} ||
+            Whoogle Search v{{ dark_mode }} ||
             <a style="color: #685e79" href="https://github.com/benbusby/whoogle-search">View on GitHub</a>
         </p>
     </footer>
diff --git a/app/templates/index.html b/app/templates/index.html
index 068b5dd..fd45d96 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -23,20 +23,19 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link rel="stylesheet" href="/static/css/main.css">
         {% if config['theme'] %}
-        <link rel="stylesheet"
-            href="/static/css/themes/{{config['theme']}}{{ '-search-dark' if config['dark'] else '-search-light' }}.css" />
+            <link rel="stylesheet" href="/static/css/themes/{{config['theme']}}-search.css" />
         {% else %}
-        <link rel="stylesheet" href="/static/css/{{ 'dark-' if config['dark'] else '' }}theme.css" />
+            <link rel="stylesheet" href="/static/css/{{ 'dark-' if config['dark'] else '' }}theme.css" />
         {% endif %}
         {% if config['theme'] %}
-        <link rel="stylesheet" href="/static/css/themes/{{config['theme']}}{{ '-dark' if config['dark'] else '-light' }}.css" />
+            <link rel="stylesheet" href="/static/css/themes/{{config['theme']}}.css" />
         {% else %}
-        <link rel="stylesheet" href="/static/css/{{ 'dark-' if config['dark'] else '' }}theme.css" />
+            <link rel="stylesheet" href="/static/css/{{ 'dark-' if config['dark'] else '' }}theme.css" />
         {% endif %}
         <title>Whoogle Search</title>
     </head>
 
-    <body id="main" style="display: none; background-color: {{ '#ECEFF4' if config.dark else '#fff' }}">
+    <body id="main" style="display: none;">
         <div class="search-container">
             <img class="logo" src="/static/img/logo.png">
             <form id="search-form" action="/search" method="{{ 'get' if config.get_only else 'post' }}">