diff --git a/assets/css/themes/base/dark.css b/assets/css/themes/base/dark.css
index d1bba897..3168b776 100644
--- a/assets/css/themes/base/dark.css
+++ b/assets/css/themes/base/dark.css
@@ -166,13 +166,13 @@
     --poll-form-label-background: hsl(from $border-color h s calc(l + 8));
     --tag-dropdown-hover-background: hsl(from $meta-color h s calc(l - 4));
 
-    --autocomplete-history-color: $block-header-link-text-color
-    --autocomplete-history-match-color: hsl(from $block-header-link-text-color h s calc(l + 20));
+    --autocomplete-history-color: hsl(from var(--block-header-link-text-color) h s calc(l));
+    --autocomplete-history-match-color: hsl(from var(--block-header-link-text-color) h s calc(l + 20));
 
-    --autocomplete-tag-color: $foreground-color;
-    --autocomplete-tag-match-color: hsl(from $foreground-color h s calc(l + 20));
-    --autocomplete-tag-count-color: $foreground-half-color
+    --autocomplete-tag-color: hsl(from var(--foreground-color) h s calc(l - 5));
+    --autocomplete-tag-match-color: hsl(from var(--foreground-color) h s calc(l + 20));
+    --autocomplete-tag-count-color: var(--foreground-half-color);
 
-    --autocomplete-match-selected-color: hsl(from $background-color h s calc(l + 10));
+    --autocomplete-match-selected-color: hsl(from var(--background-color) h s calc(l + 10));
   }
 }
diff --git a/assets/css/themes/base/light.css b/assets/css/themes/base/light.css
index b62dcb05..76c2351b 100644
--- a/assets/css/themes/base/light.css
+++ b/assets/css/themes/base/light.css
@@ -163,13 +163,13 @@
     --poll-form-label-background: hsl(from $base-color h calc(s - 16) calc(l + 36));
     --tag-dropdown-hover-background: hsl(from $foreground-color h s calc(l - 10));
 
-    --autocomplete-history-color: $block-header-link-text-color
-    --autocomplete-history-match-color: hsl(from $block-header-link-text-color h s calc(l + 20));
+    --autocomplete-history-color: var(--block-header-link-text-color);
+    --autocomplete-history-match-color: hsl(from var(--block-header-link-text-color) h calc(s + 40) calc(l - 15));
 
-    --autocomplete-tag-color: $foreground-color;
-    --autocomplete-tag-match-color: hsl(from $foreground-color h s calc(l + 20));
-    --autocomplete-tag-count-color: $foreground-half-color
+    --autocomplete-tag-color: hsl(from var(--foreground-color) h s calc(l + 20));
+    --autocomplete-tag-match-color: hsl(from var(--foreground-color) h s calc(l - 20));
+    --autocomplete-tag-count-color: var(--foreground-half-color);
 
-    --autocomplete-match-selected-color: hsl(from $background-color h s calc(l + 10));
+    --autocomplete-match-selected-color: hsl(from var(--background-color) h s calc(l + 10));
   }
 }
diff --git a/assets/css/views/tags.css b/assets/css/views/tags.css
index bc3ba2fc..d4d577bd 100644
--- a/assets/css/views/tags.css
+++ b/assets/css/views/tags.css
@@ -61,7 +61,7 @@
 }
 
 .autocomplete__item__tag {
-  color: var(--foreground-color);
+  color: var(--autocomplete-tag-color);
   display: flex;
   justify-content: space-between;
   white-space: pre;