diff --git a/src/content/finding.ts b/src/content/finding.ts
index 78b64017..810a9ce0 100644
--- a/src/content/finding.ts
+++ b/src/content/finding.ts
@@ -1,4 +1,5 @@
 import * as config from "@src/lib/config"
+import { updateBrowserTheme } from "@src/content/styling"
 import * as DOM from "@src/lib/dom"
 import { browserBg, activeTabId } from "@src/lib/webext"
 import state from "@src/state"
@@ -76,6 +77,7 @@ class FindHighlight extends HTMLSpanElement {
             highlight.style.height = `${rect.bottom - rect.top}px`
             highlight.style.zIndex = "2147483645"
             highlight.style.pointerEvents = "none"
+            highlight.style.opacity = "0.5"
         }
     }
 
@@ -87,7 +89,8 @@ class FindHighlight extends HTMLSpanElement {
     }
     unfocus() {
         for (const node of this.children) {
-            ;(node as HTMLElement).style.background = `rgba(127,255,255,0.5)`
+            ;(node as HTMLElement).style.backgroundColor =
+                "var(--tridactyl-search-highlight-color)"
         }
     }
     scrollIntoView(...options) {
@@ -124,7 +127,7 @@ class FindHighlight extends HTMLSpanElement {
 
         for (const node of this.children) {
             const element = node as HTMLElement
-            element.style.background = `rgba(255,127,255,0.5)`
+            element.style.backgroundColor = "var(--tridactyl-of-bg)"
         }
     }
     queryInRange(selector: string): HTMLElement | null {
@@ -175,6 +178,7 @@ let selected = 0
 let HIGHLIGHT_TIMER
 
 export async function jumpToMatch(searchQuery, option) {
+    await updateBrowserTheme()
     const timeout = config.get("findhighlighttimeout")
     if (timeout > 0) {
         clearTimeout(HIGHLIGHT_TIMER)
diff --git a/src/content/styling.ts b/src/content/styling.ts
index e72a1f4b..c0b11895 100644
--- a/src/content/styling.ts
+++ b/src/content/styling.ts
@@ -1,7 +1,7 @@
 import { staticThemes } from "@src/.metadata.generated"
 import * as config from "@src/lib/config"
 import * as Logging from "@src/lib/logging"
-import { browserBg, ownTabId } from "@src/lib/webext"
+import { browserBg, ownTab, ownTabId } from "@src/lib/webext"
 
 const logger = new Logging.Logger("styling")
 
@@ -35,7 +35,43 @@ const customCss = {
     code: "",
 }
 
+type ThemeColors = NonNullable<browser._manifest.ThemeType["colors"]>
+function applyBrowserTheme(element, c: ThemeColors = {}) {
+    const background =
+        c.toolbar_field_focus || c.toolbar_field || c.toolbar || c.frame
+    const foreground =
+        c.toolbar_field_text_focus ||
+        c.toolbar_field_text ||
+        c.toolbar_text ||
+        c.bookmark_text ||
+        c.tab_background_text
+    const selected = c.popup_highlight || c.tab_line
+    const set = (property, color) => {
+        const value = Array.isArray(color)
+            ? `${color.length === 4 ? "rgba" : "rgb"}(${color})`
+            : color
+        if (value && CSS.supports("color", value))
+            element.style.setProperty(`--tridactyl-${property}`, value)
+        else element.style.removeProperty(`--tridactyl-${property}`)
+    }
+    set("cmdl-bg", background)
+    set("cmdl-fg", foreground)
+    set("cmplt-bg", c.popup || background)
+    set("cmplt-fg", c.popup_text || foreground)
+    set("of-bg", selected)
+    set("of-fg", c.popup_highlight_text || foreground)
+    set("search-highlight-color", c.toolbar_field_highlight || selected)
+}
+
+async function syncBrowserTheme(element) {
+    const colors = ["default", "auto"].includes(await config.getAsync("theme"))
+        ? (await browserBg.theme.getCurrent((await ownTab()).windowId)).colors
+        : undefined
+    applyBrowserTheme(element, colors || {})
+}
+
 export async function theme(element) {
+    if (!THEMED_ELEMENTS.includes(element)) THEMED_ELEMENTS.push(element)
     // Remove any old theme
 
     /**
@@ -171,18 +207,14 @@ export async function theme(element) {
         }
     }
 
-    // Record for re-theming
-    // considering only elements :root (page and cmdline_iframe)
-    // TODO:
-    //     - Find ways to check if element is already pushed
-    if (
-        THEMED_ELEMENTS.length < 2 &&
-        element.tagName.toUpperCase() === "HTML"
-    ) {
-        THEMED_ELEMENTS.push(element)
-    }
+    await syncBrowserTheme(element)
 }
 
+export const updateBrowserTheme = () =>
+    Promise.all(THEMED_ELEMENTS.map(syncBrowserTheme))
+
+if (isMozExtension) browser.theme.onUpdated.addListener(updateBrowserTheme)
+
 function retheme() {
     THEMED_ELEMENTS.forEach(element => {
         theme(element).catch(e => {