diff --git a/app/static/css/dark-theme.css b/app/static/css/dark-theme.css
index 97a819f..3579752 100644
--- a/app/static/css/dark-theme.css
+++ b/app/static/css/dark-theme.css
@@ -15,7 +15,7 @@ label {
 }
 
 li a {
-    color: #4b8eaa !important;
+    color: var(--whoogle-dark-result-url) !important;
 }
 
 li {
@@ -116,17 +116,18 @@ select {
 }
 
 .autocomplete-items {
-    border: 1px solid #685e79;
+    border: 1px solid var(--whoogle-dark-element-bg);
 }
 
 .autocomplete-items div {
-    color: #fff;
-    background-color: #222;
-    border-bottom: 1px solid #242424;
+    color: var(--whoogle-dark-text);
+    background-color: var(--whoogle-dark-page-bg);
+    border-bottom: 1px solid var(--whoogle-dark-element-bg);
 }
 
 .autocomplete-items div:hover {
-    background-color: #404040;
+    background-color: var(--whoogle-dark-element-bg);
+    color: var(--whoogle-dark-contrast-text) !important;
 }
 
 .autocomplete-active {
diff --git a/app/static/css/light-theme.css b/app/static/css/light-theme.css
index 2548400..de76eb6 100644
--- a/app/static/css/light-theme.css
+++ b/app/static/css/light-theme.css
@@ -15,7 +15,7 @@ label {
 }
 
 li a {
-    color: #4b8eaa !important;
+    color: var(--whoogle-result-url) !important;
 }
 
 li {
@@ -112,16 +112,16 @@ input {
 }
 
 .autocomplete-items {
-    border: 1px solid #d4d4d4;
+    border: 1px solid var(--whoogle-element-bg);
 }
 
 .autocomplete-items div {
-    background-color: #fff;
-    border-bottom: 1px solid #d4d4d4;
+    background-color: var(--whoogle-page-bg);
+    border-bottom: 1px solid var(--whoogle-element-bg);
 }
 
 .autocomplete-items div:hover {
-    background-color: #e9e9e9;
+    background-color: var(--whoogle-element-bg);
 }
 
 .autocomplete-active {