diff --git a/pinecone.config.js b/pinecone.config.js
index d934abc..892cba3 100644
--- a/pinecone.config.js
+++ b/pinecone.config.js
@@ -23,6 +23,11 @@ Object.keys(roles).map((role) => {
 		moon: colorish(currentRole.moon.hex, 0.3),
 		dawn: colorish(currentRole.dawn.hex, 0.3),
 	}
+	palette[`${role}/20`] = {
+		main: colorish(currentRole.main.hex, 0.2),
+		moon: colorish(currentRole.moon.hex, 0.2),
+		dawn: colorish(currentRole.dawn.hex, 0.2),
+	}
 	palette[`${role}/15`] = {
 		main: colorish(currentRole.main.hex, 0.15),
 		moon: colorish(currentRole.moon.hex, 0.15),
diff --git a/themes/_pinecone-color-theme.json b/themes/_pinecone-color-theme.json
index 6989671..3dd3f00 100644
--- a/themes/_pinecone-color-theme.json
+++ b/themes/_pinecone-color-theme.json
@@ -91,11 +91,11 @@
 		"dropdown.foreground": "$text",
 		"dropdown.listBackground": "$surface",
 		"editor.background": "$base",
-		"editor.findMatchBackground": "$gold",
-		"editor.findMatchBorder": "",
+		"editor.findMatchBackground": "$gold/20",
+		"editor.findMatchBorder": "$gold/50",
 		"editor.findMatchForeground": "$text",
-		"editor.findMatchHighlightBackground": "$gold/30",
-		"editor.findMatchHighlightForeground": "$base",
+		"editor.findMatchHighlightBackground": "$highlightHigh",
+		"editor.findMatchHighlightForeground": "$text",
 		"editor.findMatchHighlightBorder": "",
 		"editor.findRangeHighlightBackground": "$highlightHigh",
 		"editor.findRangeHighlightBorder": "$transparent",
diff --git a/themes/rose-pine-color-theme.json b/themes/rose-pine-color-theme.json
index 39126ba..9aac76f 100644
--- a/themes/rose-pine-color-theme.json
+++ b/themes/rose-pine-color-theme.json
@@ -69,10 +69,11 @@
 		"dropdown.foreground": "#e0def4",
 		"dropdown.listBackground": "#1f1d2e",
 		"editor.background": "#191724",
-		"editor.findMatchBackground": "#f6c177",
+		"editor.findMatchBackground": "#f6c17733",
+		"editor.findMatchBorder": "#f6c17780",
 		"editor.findMatchForeground": "#e0def4",
-		"editor.findMatchHighlightBackground": "#f6c1774d",
-		"editor.findMatchHighlightForeground": "#191724",
+		"editor.findMatchHighlightBackground": "#6e6a8666",
+		"editor.findMatchHighlightForeground": "#e0def4",
 		"editor.findRangeHighlightBackground": "#6e6a8666",
 		"editor.findRangeHighlightBorder": "#0000",
 		"editor.focusedStackFrameHighlightBackground": "#6e6a8633",
diff --git a/themes/rose-pine-dawn-color-theme.json b/themes/rose-pine-dawn-color-theme.json
index 350418a..7bd0c74 100644
--- a/themes/rose-pine-dawn-color-theme.json
+++ b/themes/rose-pine-dawn-color-theme.json
@@ -69,10 +69,11 @@
 		"dropdown.foreground": "#575279",
 		"dropdown.listBackground": "#fffaf3",
 		"editor.background": "#faf4ed",
-		"editor.findMatchBackground": "#ea9d34",
+		"editor.findMatchBackground": "#ea9d3433",
+		"editor.findMatchBorder": "#ea9d3480",
 		"editor.findMatchForeground": "#575279",
-		"editor.findMatchHighlightBackground": "#ea9d344d",
-		"editor.findMatchHighlightForeground": "#faf4ed",
+		"editor.findMatchHighlightBackground": "#6e6a8626",
+		"editor.findMatchHighlightForeground": "#575279",
 		"editor.findRangeHighlightBackground": "#6e6a8626",
 		"editor.findRangeHighlightBorder": "#0000",
 		"editor.focusedStackFrameHighlightBackground": "#6e6a8614",
diff --git a/themes/rose-pine-dawn-no-italics-color-theme.json b/themes/rose-pine-dawn-no-italics-color-theme.json
index 6dc6d01..1189033 100644
--- a/themes/rose-pine-dawn-no-italics-color-theme.json
+++ b/themes/rose-pine-dawn-no-italics-color-theme.json
@@ -69,10 +69,11 @@
 		"dropdown.foreground": "#575279",
 		"dropdown.listBackground": "#fffaf3",
 		"editor.background": "#faf4ed",
-		"editor.findMatchBackground": "#ea9d34",
+		"editor.findMatchBackground": "#ea9d3433",
+		"editor.findMatchBorder": "#ea9d3480",
 		"editor.findMatchForeground": "#575279",
-		"editor.findMatchHighlightBackground": "#ea9d344d",
-		"editor.findMatchHighlightForeground": "#faf4ed",
+		"editor.findMatchHighlightBackground": "#6e6a8626",
+		"editor.findMatchHighlightForeground": "#575279",
 		"editor.findRangeHighlightBackground": "#6e6a8626",
 		"editor.findRangeHighlightBorder": "#0000",
 		"editor.focusedStackFrameHighlightBackground": "#6e6a8614",
diff --git a/themes/rose-pine-moon-color-theme.json b/themes/rose-pine-moon-color-theme.json
index 3f0f575..d495cad 100644
--- a/themes/rose-pine-moon-color-theme.json
+++ b/themes/rose-pine-moon-color-theme.json
@@ -69,10 +69,11 @@
 		"dropdown.foreground": "#e0def4",
 		"dropdown.listBackground": "#2a273f",
 		"editor.background": "#232136",
-		"editor.findMatchBackground": "#f6c177",
+		"editor.findMatchBackground": "#f6c17733",
+		"editor.findMatchBorder": "#f6c17780",
 		"editor.findMatchForeground": "#e0def4",
-		"editor.findMatchHighlightBackground": "#f6c1774d",
-		"editor.findMatchHighlightForeground": "#232136",
+		"editor.findMatchHighlightBackground": "#817c9c4d",
+		"editor.findMatchHighlightForeground": "#e0def4",
 		"editor.findRangeHighlightBackground": "#817c9c4d",
 		"editor.findRangeHighlightBorder": "#0000",
 		"editor.focusedStackFrameHighlightBackground": "#817c9c26",
diff --git a/themes/rose-pine-moon-no-italics-color-theme.json b/themes/rose-pine-moon-no-italics-color-theme.json
index e24975e..25aba9a 100644
--- a/themes/rose-pine-moon-no-italics-color-theme.json
+++ b/themes/rose-pine-moon-no-italics-color-theme.json
@@ -69,10 +69,11 @@
 		"dropdown.foreground": "#e0def4",
 		"dropdown.listBackground": "#2a273f",
 		"editor.background": "#232136",
-		"editor.findMatchBackground": "#f6c177",
+		"editor.findMatchBackground": "#f6c17733",
+		"editor.findMatchBorder": "#f6c17780",
 		"editor.findMatchForeground": "#e0def4",
-		"editor.findMatchHighlightBackground": "#f6c1774d",
-		"editor.findMatchHighlightForeground": "#232136",
+		"editor.findMatchHighlightBackground": "#817c9c4d",
+		"editor.findMatchHighlightForeground": "#e0def4",
 		"editor.findRangeHighlightBackground": "#817c9c4d",
 		"editor.findRangeHighlightBorder": "#0000",
 		"editor.focusedStackFrameHighlightBackground": "#817c9c26",
diff --git a/themes/rose-pine-no-italics-color-theme.json b/themes/rose-pine-no-italics-color-theme.json
index 29328a6..b03437f 100644
--- a/themes/rose-pine-no-italics-color-theme.json
+++ b/themes/rose-pine-no-italics-color-theme.json
@@ -69,10 +69,11 @@
 		"dropdown.foreground": "#e0def4",
 		"dropdown.listBackground": "#1f1d2e",
 		"editor.background": "#191724",
-		"editor.findMatchBackground": "#f6c177",
+		"editor.findMatchBackground": "#f6c17733",
+		"editor.findMatchBorder": "#f6c17780",
 		"editor.findMatchForeground": "#e0def4",
-		"editor.findMatchHighlightBackground": "#f6c1774d",
-		"editor.findMatchHighlightForeground": "#191724",
+		"editor.findMatchHighlightBackground": "#6e6a8666",
+		"editor.findMatchHighlightForeground": "#e0def4",
 		"editor.findRangeHighlightBackground": "#6e6a8666",
 		"editor.findRangeHighlightBorder": "#0000",
 		"editor.focusedStackFrameHighlightBackground": "#6e6a8633",