diff --git a/src/EditorSetup.ts b/src/EditorSetup.ts
index 0272013..25b5668 100644
--- a/src/EditorSetup.ts
+++ b/src/EditorSetup.ts
@@ -81,8 +81,8 @@ export const getCodeMirrorTheme = (theme: {[key: string]: string}): Extension =>
       },
       "&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection":
         {
-          backgroundColor: selection_foreground,
-          border: `0.5px solid ${selection_background}`,
+          backgroundColor: brightwhite,
+          border: `1px solid ${brightwhite}`,
         },
       ".cm-panels": {
         backgroundColor: selection_background,
@@ -98,18 +98,15 @@ export const getCodeMirrorTheme = (theme: {[key: string]: string}): Extension =>
         backgroundColor: red,
       },
       ".cm-activeLine": {
-        // backgroundColor: highlightBackground
-        backgroundColor: `${selection_foreground}`,
+        backgroundColor: `rgba(${(parseInt(selection_background.slice(1,3), 16))}, ${(parseInt(selection_background.slice(3,5), 16))}, ${(parseInt(selection_background.slice(5,7), 16))}, 0.25)`,
       },
       ".cm-selectionMatch": {
-        backgroundColor: yellow,
-        outline: `1px solid ${red}`,
+        backgroundColor: `rgba(${(parseInt(selection_background.slice(1,3), 16))}, ${(parseInt(selection_background.slice(3,5), 16))}, ${(parseInt(selection_background.slice(5,7), 16))}, 0.25)`,
+        outline: `1px solid ${brightwhite}`,
       },
       "&.cm-focused .cm-matchingBracket": {
-        color: yellow,
-        // outline: `1px solid ${base02}`,
+        color: `rgba(${(parseInt(selection_background.slice(1,3), 16))}, ${(parseInt(selection_background.slice(3,5), 16))}, ${(parseInt(selection_background.slice(5,7), 16))}, 0.25)`,
       },
-
       "&.cm-focused .cm-nonmatchingBracket": {
         color: yellow,
       },