From d23e103614fb64e34154771a956764443ddf213d Mon Sep 17 00:00:00 2001
From: Ambuj Singh <97109381+that-ambuj@users.noreply.github.com>
Date: Wed, 8 Nov 2023 22:18:43 +0530
Subject: [PATCH 1/4] theme: Add Theme poimandres

---
 runtime/themes/poimandres.toml       | 114 +++++++++++++++++++++++++++
 runtime/themes/poimandres_storm.toml | 114 +++++++++++++++++++++++++++
 2 files changed, 228 insertions(+)
 create mode 100644 runtime/themes/poimandres.toml
 create mode 100644 runtime/themes/poimandres_storm.toml

diff --git a/runtime/themes/poimandres.toml b/runtime/themes/poimandres.toml
new file mode 100644
index 000000000000..3b8b00f6ef61
--- /dev/null
+++ b/runtime/themes/poimandres.toml
@@ -0,0 +1,114 @@
+# Author: Ambuj Kumar <ambujs89@gmail.com>
+# Ported from: https://github.com/drcmda/poimandres-theme
+
+attribute = { fg = "desaturatedBlue", modifiers = ["italic"] }
+keyword = "brightMint"
+"keyword.directive" = "gray"
+"keyword.storage.type" = "desaturatedBlue"
+"keyword.storage.modifier" = "lowerMint"
+"keyword.other" = "brightMint"
+"keyword.operator" = "desaturatedBlue"
+namespace = "lightBlue"
+punctuation = "gray"
+"punctuation.bracket" = "desaturatedBlue"
+operator = "desaturatedBlue"
+special = "desaturatedBlue"
+variable = "offWhite"
+"variable.parameter" = { fg = "offWhite" }
+"variable.builtin" = { fg = "lightBlue", modifiers = ["italic"] }
+"variable.other" = "offWhite"
+type = { fg = "gray.c0" }
+"type.builtin" = { fg = "desaturatedBlue" }
+constructor = "lightBlue"
+function = "lightBlue"
+"function.method" = { fg = "lightBlue" }
+tag = "brightMint"
+comment = { fg = "darkerGray.b0", modifiers = ["italic"] }
+constant = "brightMint"
+"constant.character.escape" = { fg = "offWhite" }
+"constant.numeric" = { fg = "brightMint" }
+"constant.builtin" = { fg = "hotRed" }
+label = { fg = "gray.c0" }
+string = { fg = "brightMint" }
+
+# Markup
+"markup.heading" = { fg = "brightMint" }
+"markup.bold" = { fg = "bluishGrayBrighter", modifiers = ["bold"] }
+"markup.italic" = { fg = "bluishGrayBrighter", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["italic", "crossed-out"] }
+
+# UI
+"markup.link.url" = { fg = "lightBlue", modifiers = ["underlined"] }
+"markup.link.text" = { fg = "lightBlue", modifiers = ["underlined"] }
+"markup.raw" = { fg = "lightBlue" }
+
+"ui.background" = { bg = "bg" }
+"ui.background.separator" = { fg = "darkerGray" }
+"ui.linenr" = "darkerGray.50"
+"ui.linenr.selected" = "offWhite"
+"ui.cursor" = { bg = "gray", fg = "bg" }
+"ui.cursor.match" = { bg = "focus" }
+"ui.cursorline" = { bg = "#242837" }
+
+"ui.popup" = { bg = "#20232d" }
+"ui.window" = "gray"
+
+"ui.text" = "gray"
+"ui.text.focus" = { fg = "offWhite", bg = "focus", modifiers = ["bold"] }
+"ui.text.inactive" = "darkerGray"
+"ui.virtual" = { fg = "darkerGray.b0" }
+"ui.virtual.indent-guide" = "#303442"
+
+"ui.selection" = { bg = "focus" }
+"ui.selection.primary" = { bg = "selection" }
+
+"ui.menu" = { fg = "offWhite", bg = "bg" }
+"ui.menu.selected" = { fg = "bg", bg = "gray" }
+"ui.menu.scroll" = { fg = "gray", bg = "bg" }
+
+"ui.statusline" = { fg = "offWhite", bg = "selection" }
+"ui.statusline.inactive" = { fg = "lightBlue", bg = "bg" }
+"ui.statusline.normal" = { bg = "lightBlue", fg = "bg", modifiers = ["bold"] }
+"ui.statusline.insert" = { bg = "brightMint", fg = "bg", modifiers = ["bold"] }
+"ui.statusline.select" = { bg = "hotRed", fg = "bg", modifiers = ["bold"] }
+
+"diagnostic.hint" = { underline = { color = "lowerMint", style = "curl" } }
+"diagnostic.info" = { underline = { color = "lightBlue", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "brightYellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "hotRed", style = "curl" } }
+
+hint = "lowerMint"
+info = "lightBlue"
+warning = "brightYellow"
+error = "hotRed"
+
+# Version Control
+"diff.plus" = "lowerMint"
+"diff.minus" = "hotRed"
+"diff.delta" = "lightBlue"
+
+[palette]
+brightYellow = "#fffac2"
+brightMint = "#5DE4c7"
+lowerMint = "#5fb3a1"
+blueishGreen = "#42675A"
+lowerBlue = "#89ddff"
+lightBlue = "#ADD7FF"
+desaturatedBlue = "#91B4D5"
+bluishGrayBrighter = "#7390AA"
+hotRed = "#d0679d"
+pink = "#f087bd"
+gray = "#a6accd"
+"gray.c0" = "#98a0c2"
+darkerGray = "#767c9d"
+"darkerGray.50" = "#404559"
+"darkerGray.b0" = "#6c7494"
+bluishGray = "#506477"
+focus = "#303340"
+bg = "#1b1e28"
+offWhite = "#e4f0fb"
+selection = "#2b3042"
+# selection = "#717cb425"
+white = "#ffffff"
+black = "#000000"
+transparent = "#00000000"
diff --git a/runtime/themes/poimandres_storm.toml b/runtime/themes/poimandres_storm.toml
new file mode 100644
index 000000000000..2b3855fa6ea4
--- /dev/null
+++ b/runtime/themes/poimandres_storm.toml
@@ -0,0 +1,114 @@
+# Author: Ambuj Kumar <ambujs89@gmail.com>
+# Ported from: https://github.com/drcmda/poimandres-theme
+
+attribute = { fg = "desaturatedBlue", modifiers = ["italic"] }
+keyword = "brightMint"
+"keyword.directive" = "gray"
+"keyword.storage.type" = "desaturatedBlue"
+"keyword.storage.modifier" = "lowerMint"
+"keyword.other" = "brightMint"
+"keyword.operator" = "desaturatedBlue"
+namespace = "lightBlue"
+punctuation = "gray"
+"punctuation.bracket" = "desaturatedBlue"
+operator = "desaturatedBlue"
+special = "desaturatedBlue"
+variable = "offWhite"
+"variable.parameter" = { fg = "offWhite" }
+"variable.builtin" = { fg = "lightBlue", modifiers = ["italic"] }
+"variable.other" = "offWhite"
+type = { fg = "gray.c0" }
+"type.builtin" = { fg = "desaturatedBlue" }
+constructor = "lightBlue"
+function = "lightBlue"
+"function.method" = { fg = "lightBlue" }
+tag = "brightMint"
+comment = { fg = "darkerGray.b0", modifiers = ["italic"] }
+constant = "brightMint"
+"constant.character.escape" = { fg = "offWhite" }
+"constant.numeric" = { fg = "brightMint" }
+"constant.builtin" = { fg = "hotRed" }
+label = { fg = "gray.c0" }
+string = { fg = "brightMint" }
+
+# Markup
+"markup.heading" = { fg = "brightMint" }
+"markup.bold" = { fg = "bluishGrayBrighter", modifiers = ["bold"] }
+"markup.italic" = { fg = "bluishGrayBrighter", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["italic", "crossed-out"] }
+
+"markup.link.url" = { fg = "lightBlue", modifiers = ["underlined"] }
+"markup.link.text" = { fg = "lightBlue", modifiers = ["underlined"] }
+"markup.raw" = { fg = "lightBlue" }
+
+# UI
+"ui.background" = { bg = "bg" }
+"ui.background.separator" = { fg = "darkerGray" }
+"ui.linenr" = "darkerGray.50"
+"ui.linenr.selected" = "offWhite"
+"ui.cursor" = { bg = "gray", fg = "bg" }
+"ui.cursor.match" = { bg = "focus" }
+"ui.cursorline" = { bg = "#303747" }
+
+"ui.popup" = { bg = "#2a303c" }
+"ui.window" = "gray.c0"
+
+"ui.text" = "gray"
+"ui.text.focus" = { fg = "offWhite", bg = "focus" }
+"ui.text.inactive" = "darkerGray"
+"ui.virtual" = { fg = "darkerGray.b0" }
+"ui.virtual.indent-guide" = "#3a4151"
+
+"ui.selection" = { bg = "focus" }
+"ui.selection.primary" = { bg = "selection" }
+
+"ui.menu" = { fg = "offWhite", bg = "bg" }
+"ui.menu.selected" = { fg = "bg", bg = "gray" }
+"ui.menu.scroll" = { fg = "gray", bg = "bg" }
+
+"ui.statusline" = { fg = "offWhite", bg = "selection" }
+"ui.statusline.inactive" = { fg = "lightBlue", bg = "bg" }
+"ui.statusline.normal" = { bg = "lightBlue", fg = "bg", modifiers = ["bold"] }
+"ui.statusline.insert" = { bg = "brightMint", fg = "bg", modifiers = ["bold"] }
+"ui.statusline.select" = { bg = "hotRed", fg = "bg", modifiers = ["bold"] }
+
+"diagnostic.hint" = { underline = { color = "lowerMint", style = "curl" } }
+"diagnostic.info" = { underline = { color = "lightBlue", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "brightYellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "hotRed", style = "curl" } }
+
+hint = "lowerMint"
+info = "lightBlue"
+warning = "brightYellow"
+error = "hotRed"
+
+# Version Control
+"diff.plus" = "lowerMint"
+"diff.minus" = "hotRed"
+"diff.delta" = "lightBlue"
+
+[palette]
+brightYellow = "#fffac2"
+brightMint = "#5DE4c7"
+lowerMint = "#5fb3a1"
+blueishGreen = "#42675A"
+lowerBlue = "#89ddff"
+lightBlue = "#ADD7FF"
+desaturatedBlue = "#91B4D5"
+bluishGrayBrighter = "#7390AA"
+hotRed = "#d0679d"
+pink = "#f087bd"
+gray = "#a6accd"
+"gray.c0" = "#98a2c4"
+darkerGray = "#868cad"
+"darkerGray.50" = "#4f576d"
+"darkerGray.b0" = "#818cae"
+bluishGray = "#607487"
+focus = "#404350"
+bg = "#252b37"
+offWhite = "#e4f0fb"
+selection = "#3d455c"
+# selection = "#818cc425"
+white = "#ffffff"
+black = "#101010"
+transparent = "#00000000"

From e9fafdae154417f57eb657af6899cd1d5639237b Mon Sep 17 00:00:00 2001
From: Ambuj Singh <97109381+that-ambuj@users.noreply.github.com>
Date: Wed, 8 Nov 2023 23:55:27 +0530
Subject: [PATCH 2/4] theme: inherit `poimandres_storm` from `poimandres` with
 minor tweaks

---
 runtime/themes/poimandres_storm.toml | 97 +---------------------------
 1 file changed, 1 insertion(+), 96 deletions(-)

diff --git a/runtime/themes/poimandres_storm.toml b/runtime/themes/poimandres_storm.toml
index 2b3855fa6ea4..12312207060b 100644
--- a/runtime/themes/poimandres_storm.toml
+++ b/runtime/themes/poimandres_storm.toml
@@ -1,104 +1,13 @@
 # Author: Ambuj Kumar <ambujs89@gmail.com>
 # Ported from: https://github.com/drcmda/poimandres-theme
 
-attribute = { fg = "desaturatedBlue", modifiers = ["italic"] }
-keyword = "brightMint"
-"keyword.directive" = "gray"
-"keyword.storage.type" = "desaturatedBlue"
-"keyword.storage.modifier" = "lowerMint"
-"keyword.other" = "brightMint"
-"keyword.operator" = "desaturatedBlue"
-namespace = "lightBlue"
-punctuation = "gray"
-"punctuation.bracket" = "desaturatedBlue"
-operator = "desaturatedBlue"
-special = "desaturatedBlue"
-variable = "offWhite"
-"variable.parameter" = { fg = "offWhite" }
-"variable.builtin" = { fg = "lightBlue", modifiers = ["italic"] }
-"variable.other" = "offWhite"
-type = { fg = "gray.c0" }
-"type.builtin" = { fg = "desaturatedBlue" }
-constructor = "lightBlue"
-function = "lightBlue"
-"function.method" = { fg = "lightBlue" }
-tag = "brightMint"
-comment = { fg = "darkerGray.b0", modifiers = ["italic"] }
-constant = "brightMint"
-"constant.character.escape" = { fg = "offWhite" }
-"constant.numeric" = { fg = "brightMint" }
-"constant.builtin" = { fg = "hotRed" }
-label = { fg = "gray.c0" }
-string = { fg = "brightMint" }
+inherits = "poimandres"
 
-# Markup
-"markup.heading" = { fg = "brightMint" }
-"markup.bold" = { fg = "bluishGrayBrighter", modifiers = ["bold"] }
-"markup.italic" = { fg = "bluishGrayBrighter", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["italic", "crossed-out"] }
-
-"markup.link.url" = { fg = "lightBlue", modifiers = ["underlined"] }
-"markup.link.text" = { fg = "lightBlue", modifiers = ["underlined"] }
-"markup.raw" = { fg = "lightBlue" }
-
-# UI
-"ui.background" = { bg = "bg" }
-"ui.background.separator" = { fg = "darkerGray" }
-"ui.linenr" = "darkerGray.50"
-"ui.linenr.selected" = "offWhite"
-"ui.cursor" = { bg = "gray", fg = "bg" }
-"ui.cursor.match" = { bg = "focus" }
 "ui.cursorline" = { bg = "#303747" }
-
 "ui.popup" = { bg = "#2a303c" }
-"ui.window" = "gray.c0"
-
-"ui.text" = "gray"
-"ui.text.focus" = { fg = "offWhite", bg = "focus" }
-"ui.text.inactive" = "darkerGray"
-"ui.virtual" = { fg = "darkerGray.b0" }
 "ui.virtual.indent-guide" = "#3a4151"
 
-"ui.selection" = { bg = "focus" }
-"ui.selection.primary" = { bg = "selection" }
-
-"ui.menu" = { fg = "offWhite", bg = "bg" }
-"ui.menu.selected" = { fg = "bg", bg = "gray" }
-"ui.menu.scroll" = { fg = "gray", bg = "bg" }
-
-"ui.statusline" = { fg = "offWhite", bg = "selection" }
-"ui.statusline.inactive" = { fg = "lightBlue", bg = "bg" }
-"ui.statusline.normal" = { bg = "lightBlue", fg = "bg", modifiers = ["bold"] }
-"ui.statusline.insert" = { bg = "brightMint", fg = "bg", modifiers = ["bold"] }
-"ui.statusline.select" = { bg = "hotRed", fg = "bg", modifiers = ["bold"] }
-
-"diagnostic.hint" = { underline = { color = "lowerMint", style = "curl" } }
-"diagnostic.info" = { underline = { color = "lightBlue", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "brightYellow", style = "curl" } }
-"diagnostic.error" = { underline = { color = "hotRed", style = "curl" } }
-
-hint = "lowerMint"
-info = "lightBlue"
-warning = "brightYellow"
-error = "hotRed"
-
-# Version Control
-"diff.plus" = "lowerMint"
-"diff.minus" = "hotRed"
-"diff.delta" = "lightBlue"
-
 [palette]
-brightYellow = "#fffac2"
-brightMint = "#5DE4c7"
-lowerMint = "#5fb3a1"
-blueishGreen = "#42675A"
-lowerBlue = "#89ddff"
-lightBlue = "#ADD7FF"
-desaturatedBlue = "#91B4D5"
-bluishGrayBrighter = "#7390AA"
-hotRed = "#d0679d"
-pink = "#f087bd"
-gray = "#a6accd"
 "gray.c0" = "#98a2c4"
 darkerGray = "#868cad"
 "darkerGray.50" = "#4f576d"
@@ -106,9 +15,5 @@ darkerGray = "#868cad"
 bluishGray = "#607487"
 focus = "#404350"
 bg = "#252b37"
-offWhite = "#e4f0fb"
 selection = "#3d455c"
-# selection = "#818cc425"
-white = "#ffffff"
 black = "#101010"
-transparent = "#00000000"

From 125a875e6731ec6ce7f718bbcf95cf47f6b41526 Mon Sep 17 00:00:00 2001
From: Ambuj Singh <97109381+that-ambuj@users.noreply.github.com>
Date: Thu, 9 Nov 2023 21:18:13 +0530
Subject: [PATCH 3/4] fix(theme): rename `crossed-out` to `crossed_out`

---
 runtime/themes/poimandres.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/themes/poimandres.toml b/runtime/themes/poimandres.toml
index 3b8b00f6ef61..0fd84ee9383c 100644
--- a/runtime/themes/poimandres.toml
+++ b/runtime/themes/poimandres.toml
@@ -35,7 +35,7 @@ string = { fg = "brightMint" }
 "markup.heading" = { fg = "brightMint" }
 "markup.bold" = { fg = "bluishGrayBrighter", modifiers = ["bold"] }
 "markup.italic" = { fg = "bluishGrayBrighter", modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["italic", "crossed-out"] }
+"markup.strikethrough" = { modifiers = ["italic", "crossed_out"] }
 
 # UI
 "markup.link.url" = { fg = "lightBlue", modifiers = ["underlined"] }

From 56fbad9e63b1977d34d0f3336b3a86c90c513060 Mon Sep 17 00:00:00 2001
From: Ambuj Singh <97109381+that-ambuj@users.noreply.github.com>
Date: Thu, 9 Nov 2023 21:19:12 +0530
Subject: [PATCH 4/4] fix(theme:poimandres): improve contrast of selection
 color for regular variant

---
 runtime/themes/poimandres.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/runtime/themes/poimandres.toml b/runtime/themes/poimandres.toml
index 0fd84ee9383c..5dbc799d58a2 100644
--- a/runtime/themes/poimandres.toml
+++ b/runtime/themes/poimandres.toml
@@ -107,8 +107,7 @@ bluishGray = "#506477"
 focus = "#303340"
 bg = "#1b1e28"
 offWhite = "#e4f0fb"
-selection = "#2b3042"
-# selection = "#717cb425"
+selection = "#30354a"
 white = "#ffffff"
 black = "#000000"
 transparent = "#00000000"