From 300e1153cae130be19ca53e55a6567593233b9fe Mon Sep 17 00:00:00 2001
From: Clay Tercek <30105080+claytercek@users.noreply.github.com>
Date: Sun, 22 Sep 2024 15:56:51 -0400
Subject: [PATCH] higher contrast search and players

---
 src/theme.js             |  54 ++++-
 themes/github_theme.json | 459 ++++++++++++++++++++++-----------------
 2 files changed, 306 insertions(+), 207 deletions(-)

diff --git a/src/theme.js b/src/theme.js
index 584b7e0..e513ce4 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -18,8 +18,44 @@ export function getTheme({ themeKey, name, type }) {
     return themeKey.startsWith('light') ? tokens[lightTokenName] : tokens[darkTokenName]
   }
 
+
+  /**
+   * @param {string} tokenName
+   * @param {number} alphaValue
+   */
+  const alpha = (tokenName, alphaValue) => {
+    const baseToken = tokens[tokenName];
+    if (!baseToken) {
+      console.warn(`Token '${tokenName}' not found in theme '${themeKey}'`)
+      return null;
+    }
+
+    const hexAlpha = Math.round(alphaValue * 255).toString(16).padStart(2, '0');
+
+    // Remove the '#' if present
+    let color = baseToken.replace('#', '');
+
+    // If it's already an 8-digit HEXA, replace the last two characters
+    if (color.length === 8) {
+      color = color.slice(0, 6) + hexAlpha;
+    }
+    // If it's a 6-digit HEX, append the new alpha
+    else if (color.length === 6) {
+      color += hexAlpha;
+    }
+    // If it's a 3-digit HEX, expand it and append the new alpha
+    else if (color.length === 3) {
+      color = color.split('').map(char => char + char).join('') + hexAlpha;
+    }
+    else {
+      console.warn(`Invalid color format for token '${tokenName}': ${baseToken}`);
+      return baseToken;
+    }
+
+    return '#' + color;
+  }
+
   return {
-    "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
     appearance: type,
     name,
     style: {
@@ -50,8 +86,8 @@ export function getTheme({ themeKey, name, type }) {
       "editor.active_line_number": tokens['fgColor/default'],
       "editor.active_wrap_guide": tokens['borderColor/muted'],
       "editor.background": tokens['bgColor/default'],
-      "editor.document_highlight.read_background": tokens['bgColor/accent-muted'],
-      "editor.document_highlight.write_background": tokens['bgColor/accent-emphasis'],
+      "editor.document_highlight.read_background": alpha("fgColor/accent", 0.3),
+      "editor.document_highlight.write_background": alpha("fgColor/accent", 0.2),
       "editor.foreground": tokens['fgColor/default'],
       "editor.gutter.background": tokens['bgColor/default'],
       "editor.highlighted_line.background": tokens['bgColor/neutral-muted'],
@@ -126,7 +162,7 @@ export function getTheme({ themeKey, name, type }) {
       "scrollbar.track.border": tokens['borderColor/transparent'],
       "scrollbar_thumb.background": tokens['bgColor/neutal-muted'],
 
-      "search.match_background": tokens['bgColor/attention-muted'],
+      "search.match_background": alpha("base/color/yellow/1", 0.3),
 
       "status_bar.background": tokens['bgColor/inset'],
 
@@ -198,9 +234,9 @@ export function getTheme({ themeKey, name, type }) {
           "teal",
           "red"
         ].map(color => ({
-          "cursor": tokens[`data/${color}/color`],
-          "background": tokens[`data/${color}/color/muted`],
-          "border": tokens[`data/${color}/color/muted`]
+          "cursor": tokens[`data/${color}/color/emphasis`],
+          "background": tokens[`data/${color}/color/emphasis`],
+          "selection": alpha(`data/${color}/color/emphasis`, 0.4)
         })),
 
       "syntax": {
@@ -356,8 +392,8 @@ export function getTheme({ themeKey, name, type }) {
         },
         "string.escape": {
           "color": lightDark("base/color/green/6", "base/color/green/1"),
-          "font_style": "bold",
-          "font_weight": null
+          "font_style": null,
+          "font_weight": 700
         },
         "string.regex": {
           "color": lightDark("base/color/blue/8", "base/color/blue/1"),
diff --git a/themes/github_theme.json b/themes/github_theme.json
index 0b2d8c8..b897538 100644
--- a/themes/github_theme.json
+++ b/themes/github_theme.json
@@ -4,7 +4,6 @@
   "author": "Pyae Sone Aung",
   "themes": [
     {
-      "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
       "appearance": "light",
       "name": "Github Light",
       "style": {
@@ -29,8 +28,8 @@
         "editor.active_line_number": "#1f2328ff",
         "editor.active_wrap_guide": "#d1d9e0b3",
         "editor.background": "#ffffffff",
-        "editor.document_highlight.read_background": "#ddf4ffff",
-        "editor.document_highlight.write_background": "#0969daff",
+        "editor.document_highlight.read_background": "#0969da4d",
+        "editor.document_highlight.write_background": "#0969da33",
         "editor.foreground": "#1f2328ff",
         "editor.gutter.background": "#ffffffff",
         "editor.highlighted_line.background": "#818b981f",
@@ -86,7 +85,7 @@
         "scrollbar.thumb.hover_background": "#f6f8faff",
         "scrollbar.track.background": "#ffffff00",
         "scrollbar.track.border": "#ffffff00",
-        "search.match_background": "#fff8c5ff",
+        "search.match_background": "#fae17d4d",
         "status_bar.background": "#f6f8faff",
         "success": "#1a7f37ff",
         "success.background": "#dafbe1ff",
@@ -137,36 +136,44 @@
         "warning.border": "#d1d9e0b3",
         "players": [
           {
-            "background": "#d1f0ffff",
-            "border": "#d1f0ffff"
+            "cursor": "#006edbff",
+            "background": "#006edbff",
+            "selection": "#006edb66"
           },
           {
-            "background": "#ffe7d1ff",
-            "border": "#ffe7d1ff"
+            "cursor": "#eb670fff",
+            "background": "#eb670fff",
+            "selection": "#eb670f66"
           },
           {
-            "background": "#ffe5f1ff",
-            "border": "#ffe5f1ff"
+            "cursor": "#ce2c85ff",
+            "background": "#ce2c85ff",
+            "selection": "#ce2c8566"
           },
           {
-            "background": "#caf7caff",
-            "border": "#caf7caff"
+            "cursor": "#30a147ff",
+            "background": "#30a147ff",
+            "selection": "#30a14766"
           },
           {
-            "background": "#f1e5ffff",
-            "border": "#f1e5ffff"
+            "cursor": "#894cebff",
+            "background": "#894cebff",
+            "selection": "#894ceb66"
           },
           {
-            "background": "#ffec9eff",
-            "border": "#ffec9eff"
+            "cursor": "#b88700ff",
+            "background": "#b88700ff",
+            "selection": "#b8870066"
           },
           {
-            "background": "#c7f5efff",
-            "border": "#c7f5efff"
+            "cursor": "#179b9bff",
+            "background": "#179b9bff",
+            "selection": "#179b9b66"
           },
           {
-            "background": "#ffe2e0ff",
-            "border": "#ffe2e0ff"
+            "cursor": "#df0c24ff",
+            "background": "#df0c24ff",
+            "selection": "#df0c2466"
           }
         ],
         "syntax": {
@@ -321,8 +328,8 @@
           },
           "string.escape": {
             "color": "#116329ff",
-            "font_style": "bold",
-            "font_weight": null
+            "font_style": null,
+            "font_weight": 700
           },
           "string.regex": {
             "color": "#0a3069ff",
@@ -378,7 +385,6 @@
       }
     },
     {
-      "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
       "appearance": "light",
       "name": "Github Light Colorblind",
       "style": {
@@ -403,8 +409,8 @@
         "editor.active_line_number": "#1f2328ff",
         "editor.active_wrap_guide": "#d1d9e0b3",
         "editor.background": "#ffffffff",
-        "editor.document_highlight.read_background": "#ddf4ffff",
-        "editor.document_highlight.write_background": "#0969daff",
+        "editor.document_highlight.read_background": "#0969da4d",
+        "editor.document_highlight.write_background": "#0969da33",
         "editor.foreground": "#1f2328ff",
         "editor.gutter.background": "#ffffffff",
         "editor.highlighted_line.background": "#818b981f",
@@ -460,7 +466,7 @@
         "scrollbar.thumb.hover_background": "#f6f8faff",
         "scrollbar.track.background": "#ffffff00",
         "scrollbar.track.border": "#ffffff00",
-        "search.match_background": "#fff8c5ff",
+        "search.match_background": "#fae17d4d",
         "status_bar.background": "#f6f8faff",
         "success": "#0969daff",
         "success.background": "#ddf4ffff",
@@ -511,36 +517,44 @@
         "warning.border": "#d1d9e0b3",
         "players": [
           {
-            "background": "#d1f0ffff",
-            "border": "#d1f0ffff"
+            "cursor": "#006edbff",
+            "background": "#006edbff",
+            "selection": "#006edb66"
           },
           {
-            "background": "#ffe7d1ff",
-            "border": "#ffe7d1ff"
+            "cursor": "#eb670fff",
+            "background": "#eb670fff",
+            "selection": "#eb670f66"
           },
           {
-            "background": "#ffe5f1ff",
-            "border": "#ffe5f1ff"
+            "cursor": "#ce2c85ff",
+            "background": "#ce2c85ff",
+            "selection": "#ce2c8566"
           },
           {
-            "background": "#caf7caff",
-            "border": "#caf7caff"
+            "cursor": "#30a147ff",
+            "background": "#30a147ff",
+            "selection": "#30a14766"
           },
           {
-            "background": "#f1e5ffff",
-            "border": "#f1e5ffff"
+            "cursor": "#894cebff",
+            "background": "#894cebff",
+            "selection": "#894ceb66"
           },
           {
-            "background": "#ffec9eff",
-            "border": "#ffec9eff"
+            "cursor": "#b88700ff",
+            "background": "#b88700ff",
+            "selection": "#b8870066"
           },
           {
-            "background": "#c7f5efff",
-            "border": "#c7f5efff"
+            "cursor": "#179b9bff",
+            "background": "#179b9bff",
+            "selection": "#179b9b66"
           },
           {
-            "background": "#ffe2e0ff",
-            "border": "#ffe2e0ff"
+            "cursor": "#df0c24ff",
+            "background": "#df0c24ff",
+            "selection": "#df0c2466"
           }
         ],
         "syntax": {
@@ -695,8 +709,8 @@
           },
           "string.escape": {
             "color": "#116329ff",
-            "font_style": "bold",
-            "font_weight": null
+            "font_style": null,
+            "font_weight": 700
           },
           "string.regex": {
             "color": "#0a3069ff",
@@ -752,7 +766,6 @@
       }
     },
     {
-      "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
       "appearance": "light",
       "name": "Github Light High Contrast",
       "style": {
@@ -777,8 +790,8 @@
         "editor.active_line_number": "#010409ff",
         "editor.active_wrap_guide": "#454c54ff",
         "editor.background": "#ffffffff",
-        "editor.document_highlight.read_background": "#dff7ffff",
-        "editor.document_highlight.write_background": "#0349b4ff",
+        "editor.document_highlight.read_background": "#023b954d",
+        "editor.document_highlight.write_background": "#023b9533",
         "editor.foreground": "#010409ff",
         "editor.gutter.background": "#ffffffff",
         "editor.highlighted_line.background": "#e0e6ebff",
@@ -834,7 +847,7 @@
         "scrollbar.thumb.hover_background": "#e6eaefff",
         "scrollbar.track.background": "#ffffff00",
         "scrollbar.track.border": "#ffffff00",
-        "search.match_background": "#fcf7beff",
+        "search.match_background": "#f0ce534d",
         "status_bar.background": "#eff2f5ff",
         "success": "#024c1aff",
         "success.background": "#d2fedbff",
@@ -885,36 +898,44 @@
         "warning.border": "#454c54ff",
         "players": [
           {
-            "background": "#d1f0ffff",
-            "border": "#d1f0ffff"
+            "cursor": "#006edbff",
+            "background": "#006edbff",
+            "selection": "#006edb66"
           },
           {
-            "background": "#ffe7d1ff",
-            "border": "#ffe7d1ff"
+            "cursor": "#eb670fff",
+            "background": "#eb670fff",
+            "selection": "#eb670f66"
           },
           {
-            "background": "#ffe5f1ff",
-            "border": "#ffe5f1ff"
+            "cursor": "#ce2c85ff",
+            "background": "#ce2c85ff",
+            "selection": "#ce2c8566"
           },
           {
-            "background": "#caf7caff",
-            "border": "#caf7caff"
+            "cursor": "#30a147ff",
+            "background": "#30a147ff",
+            "selection": "#30a14766"
           },
           {
-            "background": "#f1e5ffff",
-            "border": "#f1e5ffff"
+            "cursor": "#894cebff",
+            "background": "#894cebff",
+            "selection": "#894ceb66"
           },
           {
-            "background": "#ffec9eff",
-            "border": "#ffec9eff"
+            "cursor": "#b88700ff",
+            "background": "#b88700ff",
+            "selection": "#b8870066"
           },
           {
-            "background": "#c7f5efff",
-            "border": "#c7f5efff"
+            "cursor": "#179b9bff",
+            "background": "#179b9bff",
+            "selection": "#179b9b66"
           },
           {
-            "background": "#ffe2e0ff",
-            "border": "#ffe2e0ff"
+            "cursor": "#df0c24ff",
+            "background": "#df0c24ff",
+            "selection": "#df0c2466"
           }
         ],
         "syntax": {
@@ -1069,8 +1090,8 @@
           },
           "string.escape": {
             "color": "#024c1aff",
-            "font_style": "bold",
-            "font_weight": null
+            "font_style": null,
+            "font_weight": 700
           },
           "string.regex": {
             "color": "#032563ff",
@@ -1126,7 +1147,6 @@
       }
     },
     {
-      "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
       "appearance": "light",
       "name": "Github Light Tritanopia",
       "style": {
@@ -1151,8 +1171,8 @@
         "editor.active_line_number": "#1f2328ff",
         "editor.active_wrap_guide": "#d1d9e0b3",
         "editor.background": "#ffffffff",
-        "editor.document_highlight.read_background": "#ddf4ffff",
-        "editor.document_highlight.write_background": "#0969daff",
+        "editor.document_highlight.read_background": "#0969da4d",
+        "editor.document_highlight.write_background": "#0969da33",
         "editor.foreground": "#1f2328ff",
         "editor.gutter.background": "#ffffffff",
         "editor.highlighted_line.background": "#818b981f",
@@ -1208,7 +1228,7 @@
         "scrollbar.thumb.hover_background": "#f6f8faff",
         "scrollbar.track.background": "#ffffff00",
         "scrollbar.track.border": "#ffffff00",
-        "search.match_background": "#fff8c5ff",
+        "search.match_background": "#fae17d4d",
         "status_bar.background": "#f6f8faff",
         "success": "#0969daff",
         "success.background": "#ddf4ffff",
@@ -1259,36 +1279,44 @@
         "warning.border": "#d1d9e0b3",
         "players": [
           {
-            "background": "#d1f0ffff",
-            "border": "#d1f0ffff"
+            "cursor": "#006edbff",
+            "background": "#006edbff",
+            "selection": "#006edb66"
           },
           {
-            "background": "#ffe7d1ff",
-            "border": "#ffe7d1ff"
+            "cursor": "#eb670fff",
+            "background": "#eb670fff",
+            "selection": "#eb670f66"
           },
           {
-            "background": "#ffe5f1ff",
-            "border": "#ffe5f1ff"
+            "cursor": "#ce2c85ff",
+            "background": "#ce2c85ff",
+            "selection": "#ce2c8566"
           },
           {
-            "background": "#caf7caff",
-            "border": "#caf7caff"
+            "cursor": "#30a147ff",
+            "background": "#30a147ff",
+            "selection": "#30a14766"
           },
           {
-            "background": "#f1e5ffff",
-            "border": "#f1e5ffff"
+            "cursor": "#894cebff",
+            "background": "#894cebff",
+            "selection": "#894ceb66"
           },
           {
-            "background": "#ffec9eff",
-            "border": "#ffec9eff"
+            "cursor": "#b88700ff",
+            "background": "#b88700ff",
+            "selection": "#b8870066"
           },
           {
-            "background": "#c7f5efff",
-            "border": "#c7f5efff"
+            "cursor": "#179b9bff",
+            "background": "#179b9bff",
+            "selection": "#179b9b66"
           },
           {
-            "background": "#ffe2e0ff",
-            "border": "#ffe2e0ff"
+            "cursor": "#df0c24ff",
+            "background": "#df0c24ff",
+            "selection": "#df0c2466"
           }
         ],
         "syntax": {
@@ -1443,8 +1471,8 @@
           },
           "string.escape": {
             "color": "#116329ff",
-            "font_style": "bold",
-            "font_weight": null
+            "font_style": null,
+            "font_weight": 700
           },
           "string.regex": {
             "color": "#0a3069ff",
@@ -1500,7 +1528,6 @@
       }
     },
     {
-      "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
       "appearance": "dark",
       "name": "Github Dark",
       "style": {
@@ -1525,8 +1552,8 @@
         "editor.active_line_number": "#f0f6fcff",
         "editor.active_wrap_guide": "#3d444db3",
         "editor.background": "#0d1117ff",
-        "editor.document_highlight.read_background": "#388bfd1a",
-        "editor.document_highlight.write_background": "#1f6febff",
+        "editor.document_highlight.read_background": "#4493f84d",
+        "editor.document_highlight.write_background": "#4493f833",
         "editor.foreground": "#f0f6fcff",
         "editor.gutter.background": "#0d1117ff",
         "editor.highlighted_line.background": "#656c7633",
@@ -1582,7 +1609,7 @@
         "scrollbar.thumb.hover_background": "#151b23ff",
         "scrollbar.track.background": "#00000000",
         "scrollbar.track.border": "#00000000",
-        "search.match_background": "#bb800926",
+        "search.match_background": "#f2cc604d",
         "status_bar.background": "#010409ff",
         "success": "#3fb950ff",
         "success.background": "#2ea04326",
@@ -1633,36 +1660,44 @@
         "warning.border": "#3d444db3",
         "players": [
           {
-            "background": "#001a47ff",
-            "border": "#001a47ff"
+            "cursor": "#0576ffff",
+            "background": "#0576ffff",
+            "selection": "#0576ff66"
           },
           {
-            "background": "#311708ff",
-            "border": "#311708ff"
+            "cursor": "#984b10ff",
+            "background": "#984b10ff",
+            "selection": "#984b1066"
           },
           {
-            "background": "#2d1524ff",
-            "border": "#2d1524ff"
+            "cursor": "#d34591ff",
+            "background": "#d34591ff",
+            "selection": "#d3459166"
           },
           {
-            "background": "#122117ff",
-            "border": "#122117ff"
+            "cursor": "#2f6f37ff",
+            "background": "#2f6f37ff",
+            "selection": "#2f6f3766"
           },
           {
-            "background": "#211047ff",
-            "border": "#211047ff"
+            "cursor": "#975bf1ff",
+            "background": "#975bf1ff",
+            "selection": "#975bf166"
           },
           {
-            "background": "#2e1a00ff",
-            "border": "#2e1a00ff"
+            "cursor": "#895906ff",
+            "background": "#895906ff",
+            "selection": "#89590666"
           },
           {
-            "background": "#041f25ff",
-            "border": "#041f25ff"
+            "cursor": "#106c70ff",
+            "background": "#106c70ff",
+            "selection": "#106c7066"
           },
           {
-            "background": "#3c0614ff",
-            "border": "#3c0614ff"
+            "cursor": "#eb3342ff",
+            "background": "#eb3342ff",
+            "selection": "#eb334266"
           }
         ],
         "syntax": {
@@ -1817,8 +1852,8 @@
           },
           "string.escape": {
             "color": "#7ee787ff",
-            "font_style": "bold",
-            "font_weight": null
+            "font_style": null,
+            "font_weight": 700
           },
           "string.regex": {
             "color": "#a5d6ffff",
@@ -1874,7 +1909,6 @@
       }
     },
     {
-      "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
       "appearance": "dark",
       "name": "Github Dark Colorblind",
       "style": {
@@ -1899,8 +1933,8 @@
         "editor.active_line_number": "#f0f6fcff",
         "editor.active_wrap_guide": "#3d444db3",
         "editor.background": "#0d1117ff",
-        "editor.document_highlight.read_background": "#388bfd1a",
-        "editor.document_highlight.write_background": "#1f6febff",
+        "editor.document_highlight.read_background": "#4493f84d",
+        "editor.document_highlight.write_background": "#4493f833",
         "editor.foreground": "#f0f6fcff",
         "editor.gutter.background": "#0d1117ff",
         "editor.highlighted_line.background": "#656c7633",
@@ -1956,7 +1990,7 @@
         "scrollbar.thumb.hover_background": "#151b23ff",
         "scrollbar.track.background": "#00000000",
         "scrollbar.track.border": "#00000000",
-        "search.match_background": "#bb800926",
+        "search.match_background": "#f2cc604d",
         "status_bar.background": "#010409ff",
         "success": "#58a6ffff",
         "success.background": "#388bfd26",
@@ -2007,36 +2041,44 @@
         "warning.border": "#3d444db3",
         "players": [
           {
-            "background": "#001a47ff",
-            "border": "#001a47ff"
+            "cursor": "#0576ffff",
+            "background": "#0576ffff",
+            "selection": "#0576ff66"
           },
           {
-            "background": "#311708ff",
-            "border": "#311708ff"
+            "cursor": "#984b10ff",
+            "background": "#984b10ff",
+            "selection": "#984b1066"
           },
           {
-            "background": "#2d1524ff",
-            "border": "#2d1524ff"
+            "cursor": "#d34591ff",
+            "background": "#d34591ff",
+            "selection": "#d3459166"
           },
           {
-            "background": "#122117ff",
-            "border": "#122117ff"
+            "cursor": "#2f6f37ff",
+            "background": "#2f6f37ff",
+            "selection": "#2f6f3766"
           },
           {
-            "background": "#211047ff",
-            "border": "#211047ff"
+            "cursor": "#975bf1ff",
+            "background": "#975bf1ff",
+            "selection": "#975bf166"
           },
           {
-            "background": "#2e1a00ff",
-            "border": "#2e1a00ff"
+            "cursor": "#895906ff",
+            "background": "#895906ff",
+            "selection": "#89590666"
           },
           {
-            "background": "#041f25ff",
-            "border": "#041f25ff"
+            "cursor": "#106c70ff",
+            "background": "#106c70ff",
+            "selection": "#106c7066"
           },
           {
-            "background": "#3c0614ff",
-            "border": "#3c0614ff"
+            "cursor": "#eb3342ff",
+            "background": "#eb3342ff",
+            "selection": "#eb334266"
           }
         ],
         "syntax": {
@@ -2191,8 +2233,8 @@
           },
           "string.escape": {
             "color": "#7ee787ff",
-            "font_style": "bold",
-            "font_weight": null
+            "font_style": null,
+            "font_weight": 700
           },
           "string.regex": {
             "color": "#a5d6ffff",
@@ -2248,7 +2290,6 @@
       }
     },
     {
-      "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
       "appearance": "dark",
       "name": "Github Dark High Contrast",
       "style": {
@@ -2273,8 +2314,8 @@
         "editor.active_line_number": "#ffffffff",
         "editor.active_wrap_guide": "#b7bdc8ff",
         "editor.background": "#010409ff",
-        "editor.document_highlight.read_background": "#5cacff1a",
-        "editor.document_highlight.write_background": "#194fb1ff",
+        "editor.document_highlight.read_background": "#74b9ff4d",
+        "editor.document_highlight.write_background": "#74b9ff33",
         "editor.foreground": "#ffffffff",
         "editor.gutter.background": "#010409ff",
         "editor.highlighted_line.background": "#212830ff",
@@ -2330,7 +2371,7 @@
         "scrollbar.thumb.hover_background": "#151b23ff",
         "scrollbar.track.background": "#00000000",
         "scrollbar.track.border": "#00000000",
-        "search.match_background": "#edaa2726",
+        "search.match_background": "#fbd6694d",
         "status_bar.background": "#010409ff",
         "success": "#2bd853ff",
         "success.background": "#0ac74026",
@@ -2381,36 +2422,44 @@
         "warning.border": "#b7bdc8ff",
         "players": [
           {
-            "background": "#001a47ff",
-            "border": "#001a47ff"
+            "cursor": "#0576ffff",
+            "background": "#0576ffff",
+            "selection": "#0576ff66"
           },
           {
-            "background": "#311708ff",
-            "border": "#311708ff"
+            "cursor": "#984b10ff",
+            "background": "#984b10ff",
+            "selection": "#984b1066"
           },
           {
-            "background": "#2d1524ff",
-            "border": "#2d1524ff"
+            "cursor": "#d34591ff",
+            "background": "#d34591ff",
+            "selection": "#d3459166"
           },
           {
-            "background": "#122117ff",
-            "border": "#122117ff"
+            "cursor": "#2f6f37ff",
+            "background": "#2f6f37ff",
+            "selection": "#2f6f3766"
           },
           {
-            "background": "#211047ff",
-            "border": "#211047ff"
+            "cursor": "#975bf1ff",
+            "background": "#975bf1ff",
+            "selection": "#975bf166"
           },
           {
-            "background": "#2e1a00ff",
-            "border": "#2e1a00ff"
+            "cursor": "#895906ff",
+            "background": "#895906ff",
+            "selection": "#89590666"
           },
           {
-            "background": "#041f25ff",
-            "border": "#041f25ff"
+            "cursor": "#106c70ff",
+            "background": "#106c70ff",
+            "selection": "#106c7066"
           },
           {
-            "background": "#3c0614ff",
-            "border": "#3c0614ff"
+            "cursor": "#eb3342ff",
+            "background": "#eb3342ff",
+            "selection": "#eb334266"
           }
         ],
         "syntax": {
@@ -2565,8 +2614,8 @@
           },
           "string.escape": {
             "color": "#72f088ff",
-            "font_style": "bold",
-            "font_weight": null
+            "font_style": null,
+            "font_weight": 700
           },
           "string.regex": {
             "color": "#addcffff",
@@ -2622,7 +2671,6 @@
       }
     },
     {
-      "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
       "appearance": "dark",
       "name": "Github Dark Tritanopia",
       "style": {
@@ -2647,8 +2695,8 @@
         "editor.active_line_number": "#f0f6fcff",
         "editor.active_wrap_guide": "#3d444db3",
         "editor.background": "#0d1117ff",
-        "editor.document_highlight.read_background": "#388bfd1a",
-        "editor.document_highlight.write_background": "#1f6febff",
+        "editor.document_highlight.read_background": "#4493f84d",
+        "editor.document_highlight.write_background": "#4493f833",
         "editor.foreground": "#f0f6fcff",
         "editor.gutter.background": "#0d1117ff",
         "editor.highlighted_line.background": "#656c7633",
@@ -2704,7 +2752,7 @@
         "scrollbar.thumb.hover_background": "#151b23ff",
         "scrollbar.track.background": "#00000000",
         "scrollbar.track.border": "#00000000",
-        "search.match_background": "#bb800926",
+        "search.match_background": "#f2cc604d",
         "status_bar.background": "#010409ff",
         "success": "#58a6ffff",
         "success.background": "#388bfd26",
@@ -2755,36 +2803,44 @@
         "warning.border": "#3d444db3",
         "players": [
           {
-            "background": "#001a47ff",
-            "border": "#001a47ff"
+            "cursor": "#0576ffff",
+            "background": "#0576ffff",
+            "selection": "#0576ff66"
           },
           {
-            "background": "#311708ff",
-            "border": "#311708ff"
+            "cursor": "#984b10ff",
+            "background": "#984b10ff",
+            "selection": "#984b1066"
           },
           {
-            "background": "#2d1524ff",
-            "border": "#2d1524ff"
+            "cursor": "#d34591ff",
+            "background": "#d34591ff",
+            "selection": "#d3459166"
           },
           {
-            "background": "#122117ff",
-            "border": "#122117ff"
+            "cursor": "#2f6f37ff",
+            "background": "#2f6f37ff",
+            "selection": "#2f6f3766"
           },
           {
-            "background": "#211047ff",
-            "border": "#211047ff"
+            "cursor": "#975bf1ff",
+            "background": "#975bf1ff",
+            "selection": "#975bf166"
           },
           {
-            "background": "#2e1a00ff",
-            "border": "#2e1a00ff"
+            "cursor": "#895906ff",
+            "background": "#895906ff",
+            "selection": "#89590666"
           },
           {
-            "background": "#041f25ff",
-            "border": "#041f25ff"
+            "cursor": "#106c70ff",
+            "background": "#106c70ff",
+            "selection": "#106c7066"
           },
           {
-            "background": "#3c0614ff",
-            "border": "#3c0614ff"
+            "cursor": "#eb3342ff",
+            "background": "#eb3342ff",
+            "selection": "#eb334266"
           }
         ],
         "syntax": {
@@ -2939,8 +2995,8 @@
           },
           "string.escape": {
             "color": "#7ee787ff",
-            "font_style": "bold",
-            "font_weight": null
+            "font_style": null,
+            "font_weight": 700
           },
           "string.regex": {
             "color": "#a5d6ffff",
@@ -2996,7 +3052,6 @@
       }
     },
     {
-      "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
       "appearance": "dark",
       "name": "Github Dark Dimmed",
       "style": {
@@ -3021,8 +3076,8 @@
         "editor.active_line_number": "#d1d7e0ff",
         "editor.active_wrap_guide": "#3d444db3",
         "editor.background": "#212830ff",
-        "editor.document_highlight.read_background": "#4184e41a",
-        "editor.document_highlight.write_background": "#316dcaff",
+        "editor.document_highlight.read_background": "#478be64d",
+        "editor.document_highlight.write_background": "#478be633",
         "editor.foreground": "#d1d7e0ff",
         "editor.gutter.background": "#212830ff",
         "editor.highlighted_line.background": "#656c7633",
@@ -3078,7 +3133,7 @@
         "scrollbar.thumb.hover_background": "#262c36ff",
         "scrollbar.track.background": "#00000000",
         "scrollbar.track.border": "#00000000",
-        "search.match_background": "#ae7c1426",
+        "search.match_background": "#eac55f4d",
         "status_bar.background": "#151b23ff",
         "success": "#57ab5aff",
         "success.background": "#46954a26",
@@ -3129,36 +3184,44 @@
         "warning.border": "#3d444db3",
         "players": [
           {
-            "background": "#001a47ff",
-            "border": "#001a47ff"
+            "cursor": "#0576ffff",
+            "background": "#0576ffff",
+            "selection": "#0576ff66"
           },
           {
-            "background": "#311708ff",
-            "border": "#311708ff"
+            "cursor": "#984b10ff",
+            "background": "#984b10ff",
+            "selection": "#984b1066"
           },
           {
-            "background": "#2d1524ff",
-            "border": "#2d1524ff"
+            "cursor": "#d34591ff",
+            "background": "#d34591ff",
+            "selection": "#d3459166"
           },
           {
-            "background": "#122117ff",
-            "border": "#122117ff"
+            "cursor": "#2f6f37ff",
+            "background": "#2f6f37ff",
+            "selection": "#2f6f3766"
           },
           {
-            "background": "#211047ff",
-            "border": "#211047ff"
+            "cursor": "#975bf1ff",
+            "background": "#975bf1ff",
+            "selection": "#975bf166"
           },
           {
-            "background": "#2e1a00ff",
-            "border": "#2e1a00ff"
+            "cursor": "#895906ff",
+            "background": "#895906ff",
+            "selection": "#89590666"
           },
           {
-            "background": "#041f25ff",
-            "border": "#041f25ff"
+            "cursor": "#106c70ff",
+            "background": "#106c70ff",
+            "selection": "#106c7066"
           },
           {
-            "background": "#3c0614ff",
-            "border": "#3c0614ff"
+            "cursor": "#eb3342ff",
+            "background": "#eb3342ff",
+            "selection": "#eb334266"
           }
         ],
         "syntax": {
@@ -3313,8 +3376,8 @@
           },
           "string.escape": {
             "color": "#8ddb8cff",
-            "font_style": "bold",
-            "font_weight": null
+            "font_style": null,
+            "font_weight": 700
           },
           "string.regex": {
             "color": "#96d0ffff",