From 109ea2a9c3f2df0677ce9d44458d402d4dfab57f Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Mon, 29 Jan 2024 21:26:03 -0500
Subject: [PATCH 1/5] adding 16-color terminal themes

---
 runtime/themes/term16-dark.toml  | 80 +++++++++++++++++++++++++++++++
 runtime/themes/term16-light.toml | 82 ++++++++++++++++++++++++++++++++
 2 files changed, 162 insertions(+)
 create mode 100644 runtime/themes/term16-dark.toml
 create mode 100644 runtime/themes/term16-light.toml

diff --git a/runtime/themes/term16-dark.toml b/runtime/themes/term16-dark.toml
new file mode 100644
index 000000000000..b34a4b4e22f2
--- /dev/null
+++ b/runtime/themes/term16-dark.toml
@@ -0,0 +1,80 @@
+# Author: dgkf
+
+"ui.background" = { }
+"ui.background.separator" = { fg = "red" }
+"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "light-yellow", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "light-gray", modifiers = ["reversed"] }
+"ui.cursor.secondary" = { fg = "gray", modifiers = ["reversed"] }
+"ui.cursorline.primary" = { bg = "black" }
+"ui.gutter" = { }
+"ui.gutter.selected" = { bg = "black" }
+"ui.help" = { fg = "white", bg = "black" }
+"ui.linenr" = { fg = "gray", modifiers = ["bold"] }
+"ui.linenr.selected" = { fg = "white", modifiers = ["bold"] }
+"ui.menu" = { fg = "light-gray", bg = "gray" }
+"ui.menu.selected" = { modifiers = ["reversed"] }
+"ui.menu.scroll" = { fg = "light-blue" }
+"ui.popup" = { bg = "black" }
+"ui.selection" = { bg = "gray" }
+"ui.statusline" = { fg = "light-gray", bg = "gray" }
+"ui.statusline.inactive" = { bg = "black" }
+"ui.virtual" = { bg = "black" }
+"ui.virtual.indent-guide" = { fg = "gray" }
+"ui.virtual.whitespace" = {}
+"ui.virtual.wrap" = { fg = "gray" }
+"ui.virtual.inlay-hint" = { fg = "light-gray", modifiers = ["dim", "italic"] }
+"ui.virtual.inlay-hint.parameter" = { fg = "yellow", modifiers = ["dim", "italic"] }
+"ui.virtual.inlay-hint.type" = { fg = "blue", modifiers = ["dim", "italic"] }
+"ui.window" = { fg = "gray", modifiers = ["dim"] }
+
+"comment" = { fg = "light-gray", modifiers = ["italic", "dim"] }
+
+"attribute" = "light-yellow"
+"constant" = { fg = "light-yellow", modifiers = ["bold", "dim"] }
+"constant.numeric" = "light-yellow"
+"constant.character.escape" = "light-cyan"
+"constructor" = "light-blue"
+"function" = "light-blue"
+"function.macro" = "light-red"
+"function.builtin" = { fg = "light-blue", modifiers = ["bold"] }
+"tag" = { fg = "light-magenta", modifiers = ["dim"] }
+"type" = "blue"
+"type.builtin" = { fg = "blue", modifiers = ["bold"] }
+"type.enum.variant" = { fg = "light-magenta", modifiers = ["dim"] }
+"string"  = "light-green"
+"special" = "light-red"
+"variable" = "white"
+"variable.parameter" = { fg = "light-yellow", modifiers = ["italic"] }
+"variable.other.member" = "light-green"
+"keyword" = "light-magenta"
+"keyword.control.exception" = "light-red"
+"keyword.directive" = { fg = "light-yellow", modifiers = ["bold"] }
+"keyword.operator" = { fg = "light-blue", modifiers = ["bold"] }
+"label" = "light-green"
+"namespace" = { fg = "blue", modifiers = ["dim"] }
+
+"markup.heading" = "light-blue"
+"markup.list" = "light-red"
+"markup.bold" = { fg = "light-cyan", modifiers = ["bold"] }
+"markup.italic" = { fg = "light-blue", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "magenta", modifiers = ["dim"] }
+"markup.link.text" = "light-magenta"
+"markup.quote" = "light-cyan"
+"markup.raw" = "light-green"
+
+"diff.plus" = "light-green"
+"diff.delta" = "light-yellow"
+"diff.minus" = "light-red"
+
+"diagnostic.hint" = { underline = { color = "gray", style = "curl" } }
+"diagnostic.info" = { underline = { color = "light-cyan", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "light-yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "light-red", style = "curl" } }
+
+"info" = "light-cyan"
+"hint" = { fg = "light-gray", modifiers = ["dim"] }
+"debug" = "white"
+"warning" = "yellow"
+"error" = "light-red"
diff --git a/runtime/themes/term16-light.toml b/runtime/themes/term16-light.toml
new file mode 100644
index 000000000000..519f495bbb3a
--- /dev/null
+++ b/runtime/themes/term16-light.toml
@@ -0,0 +1,82 @@
+# Author: dgkf <doug.kelkhoff@gmail.com>
+# Modified from base16_terminal, Author: NNB <nnbnh@protonmail.com>
+
+inherits = "term16-dark"
+
+"ui.background.separator" = "light-gray"
+"ui.cursor" = { fg = "gray", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "yellow", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "black", modifiers = ["reversed"] }
+"ui.cursor.secondary" = { fg = "gray", modifiers = ["reversed"] }
+"ui.cursorline.primary" = { bg = "white" }
+"ui.cursorline.secondary" = { bg = "white" }
+"ui.cursorcolumn.primary" = { bg = "white" }
+"ui.cursorcolumn.secondary" = { bg = "white" }
+"ui.gutter" = { }
+"ui.gutter.selected" = { bg = "white" }
+"ui.linenr" = { fg = "gray", modifiers = ["dim"] }
+"ui.linenr.selected" = { fg = "black",  modifiers = ["bold"] }
+"ui.menu" = { bg = "light-gray" }
+"ui.menu.selected" = { fg = "white", bg = "gray", modifiers = ["bold"] }
+"ui.menu.scroll" = { fg = "light-blue" }
+"ui.help" = { }
+"ui.text" = { }
+"ui.text.focus" = { }
+"ui.popup" = { bg = "white" }
+"ui.selection" = { bg = "light-gray" }
+"ui.statusline" = { bg = "white" }
+"ui.statusline.inactive" = { fg = "gray", modifiers = ["underlined"] }
+"ui.statusline.insert" = { fg = "white", bg = "blue" }
+"ui.statusline.select" = { fg = "white", bg = "magenta" }
+"ui.virtual" = { fg = "light-gray" }
+"ui.virtual.indent-guide" = { fg = "light-gray", modifiers = ["dim"] }
+"ui.virtual.ruler" = { bg = "white" }
+"ui.virtual.wrap" = { fg = "light-gray" }
+"ui.window" = { fg = "gray", modifiers = ["dim"] }
+
+"comment" = { fg = "gray", modifiers = ["italic", "dim"] }
+
+"attribute" = "yellow"
+"constant" = { fg = "yellow", modifiers = ["bold"] }
+"constant.numeric" = { fg = "yellow", modifiers = ["bold"] }
+"constant.character.escape" = "blue"
+"constructor" = "blue"
+"function" = "blue"
+"tag" = { fg = "magenta", modifiers = ["dim"] }
+"type" = "yellow"
+"string"  = "green"
+"special" = "red"
+"variable" = { fg = "black" }
+"variable.parameter" = { fg = "red", modifiers = ["italic", "dim"] }
+"variable.other.member" = "green"
+"keyword" = "magenta"
+"keyword.control.exception" = "red"
+"keyword.directive" = { fg = "yellow", modifiers = ["bold"] }
+"keyword.operator" = { fg = "blue", modifiers = ["bold"] }
+"label" = "red"
+"namespace" = "blue"
+
+"markup.heading" = { fg = "blue", modifiers = ["bold"] }
+"markup.list" = "red"
+"markup.bold" = { fg = "cyan", modifiers = ["bold"] }
+"markup.italic" = { fg = "blue", modifiers = ["italic"] }
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+"markup.link.url" = { fg = "magenta", modifiers = ["dim"] }
+"markup.link.text" = { fg = "magenta", modifiers = ["bold"] }
+"markup.quote" = "cyan"
+"markup.raw" = "blue"
+
+"diff.plus" = "green"
+"diff.delta" = "yellow"
+"diff.minus" = "red"
+
+"diagnostic.hint" = { underline = { color = "cyan", style = "curl" } }
+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+
+"hint" = "cyan"
+"info" = "blue"
+"debug" = "light-yellow"
+"warning" = "yellow"
+"error" = "red"

From 616ea4139f651c13b076f526374aa5de964d5e02 Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Mon, 29 Jan 2024 21:48:24 -0500
Subject: [PATCH 2/5] minor consistency update

---
 runtime/themes/term16-light.toml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/term16-light.toml b/runtime/themes/term16-light.toml
index 519f495bbb3a..535f1dddc64d 100644
--- a/runtime/themes/term16-light.toml
+++ b/runtime/themes/term16-light.toml
@@ -42,11 +42,14 @@ inherits = "term16-dark"
 "constant.character.escape" = "blue"
 "constructor" = "blue"
 "function" = "blue"
+"function.builtin" = { fg = "blue", modifiers = ["bold"] }
 "tag" = { fg = "magenta", modifiers = ["dim"] }
-"type" = "yellow"
+"type" = { fg = "blue", modifiers = ["dim"] }
+"type.builtin" = { fg = "blue", modifiers = ["bold"] }
+"type.enum.variant" = { fg = "magenta", modifiers = ["dim"] }
 "string"  = "green"
 "special" = "red"
-"variable" = { fg = "black" }
+"variable" = { fg = "black", modifiers = ["dim"] }
 "variable.parameter" = { fg = "red", modifiers = ["italic", "dim"] }
 "variable.other.member" = "green"
 "keyword" = "magenta"

From c81bfb64a835fb0b6c1e5d4269f6ee7845f3bf35 Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Mon, 29 Jan 2024 21:50:23 -0500
Subject: [PATCH 3/5] minor consistency update

---
 runtime/themes/term16-light.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/term16-light.toml b/runtime/themes/term16-light.toml
index 535f1dddc64d..0fcc350283a1 100644
--- a/runtime/themes/term16-light.toml
+++ b/runtime/themes/term16-light.toml
@@ -44,7 +44,7 @@ inherits = "term16-dark"
 "function" = "blue"
 "function.builtin" = { fg = "blue", modifiers = ["bold"] }
 "tag" = { fg = "magenta", modifiers = ["dim"] }
-"type" = { fg = "blue", modifiers = ["dim"] }
+"type" = "blue"
 "type.builtin" = { fg = "blue", modifiers = ["bold"] }
 "type.enum.variant" = { fg = "magenta", modifiers = ["dim"] }
 "string"  = "green"
@@ -57,7 +57,7 @@ inherits = "term16-dark"
 "keyword.directive" = { fg = "yellow", modifiers = ["bold"] }
 "keyword.operator" = { fg = "blue", modifiers = ["bold"] }
 "label" = "red"
-"namespace" = "blue"
+"namespace" = { fg = "blue", modifiers = ["dim"] }
 
 "markup.heading" = { fg = "blue", modifiers = ["bold"] }
 "markup.list" = "red"

From 3bc97e66e435946d941f7ff2c8dbfc63ac829d77 Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Mon, 29 Jan 2024 22:27:49 -0500
Subject: [PATCH 4/5] rename to be more consistent with other helix theme name
 conventions

---
 runtime/themes/{term16-dark.toml => term16_dark.toml}   | 0
 runtime/themes/{term16-light.toml => term16_light.toml} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename runtime/themes/{term16-dark.toml => term16_dark.toml} (100%)
 rename runtime/themes/{term16-light.toml => term16_light.toml} (100%)

diff --git a/runtime/themes/term16-dark.toml b/runtime/themes/term16_dark.toml
similarity index 100%
rename from runtime/themes/term16-dark.toml
rename to runtime/themes/term16_dark.toml
diff --git a/runtime/themes/term16-light.toml b/runtime/themes/term16_light.toml
similarity index 100%
rename from runtime/themes/term16-light.toml
rename to runtime/themes/term16_light.toml

From c94d9b1787d3e3e227d64c32c4c6ae4d84f41aef Mon Sep 17 00:00:00 2001
From: dgkf <18220321+dgkf@users.noreply.github.com>
Date: Wed, 31 Jan 2024 12:24:19 -0500
Subject: [PATCH 5/5] fixing improper theme inherits name

---
 runtime/themes/term16_light.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/themes/term16_light.toml b/runtime/themes/term16_light.toml
index 0fcc350283a1..a02784b25072 100644
--- a/runtime/themes/term16_light.toml
+++ b/runtime/themes/term16_light.toml
@@ -1,7 +1,7 @@
-# Author: dgkf <doug.kelkhoff@gmail.com>
+# Author: dgkf
 # Modified from base16_terminal, Author: NNB <nnbnh@protonmail.com>
 
-inherits = "term16-dark"
+inherits = "term16_dark"
 
 "ui.background.separator" = "light-gray"
 "ui.cursor" = { fg = "gray", modifiers = ["reversed"] }