From 43d17c482cda07fa0dc4985d60c14391a4926940 Mon Sep 17 00:00:00 2001
From: NNB
Date: Thu, 11 Nov 2021 15:23:27 +0700
Subject: Fix Base16 Dark, add Base16 Light and Terminal

Improve accuracy with line number and cursor color
---
 runtime/themes/base16_terminal.toml | 41 +++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 runtime/themes/base16_terminal.toml

(limited to 'runtime/themes/base16_terminal.toml')

diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
new file mode 100644
index 00000000..bf3c73f1
--- /dev/null
+++ b/runtime/themes/base16_terminal.toml
@@ -0,0 +1,41 @@
+# Author: NNB <nnbnh@protonmail.com>
+
+"ui.menu" = "black"
+"ui.menu.selected" = { fg = "white", bg = "black" }
+"ui.linenr" = { fg = "light-gray", bg = "black" }
+"ui.popup" = { bg = "black" }
+"ui.window" = { bg = "black" }
+"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
+"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
+"comment" = { fg = "light-gray", modifiers = ["italic"] }
+"ui.statusline" = { fg = "white", bg = "black" }
+"ui.help" = { fg = "white", bg = "black" }
+"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } #FIXME
+"ui.text" = "white" #FIXME
+"operator" = "white" #FIXME
+"ui.text.focus" = "white" #FIXME
+"variable" = "light-red"
+"constant.numeric" = "yellow"
+"constant" = "yellow"
+"attributes" = "yellow"
+"type" = "light-yellow"
+"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
+"string"  = "light-green"
+"variable.other.member" = "light-green"
+"constant.character.escape" = "light-cyan"
+"function" = "light-blue"
+"constructor" = "light-blue"
+"special" = "light-blue"
+"keyword" = "light-magenta"
+"label" = "light-magenta"
+"namespace" = "light-magenta"
+"ui.popup" = { bg = "black" }
+"ui.window" = { bg = "base00" }
+"ui.help" = { fg = "white", bg = "black" }
+
+"info" = "light-gray"
+"hint" = "light-gray"
+"debug" = "light-gray"
+"diagnostic" = "light-gray"
+"error" = "light-magenta"
-- 
cgit v1.2.3-70-g09d2


From 98ce2a301da25152563137047377026d72fd644c Mon Sep 17 00:00:00 2001
From: Omnikar
Date: Sun, 14 Nov 2021 07:26:48 -0500
Subject: Load alt default theme if true color is not supported

* Move `runtime/themes/base16_default_terminal.toml` to
  `base16_theme.toml` alongside `theme.toml`
* Use `terminfo` crate to detect whether the terminal supports true
  color and, if the user has no theme configured and their terminal does
  not support true color, load the alt default theme instead of the
  normal default.

Remove `terminfo` dependency, use `COLORTERM` env instead

Prevent user from switching to an unsupported theme

Add `true-color-override` option

If the terminal is wrongly detected to not support true color,
`true-color-override = true` will override the detection.

Rename `true-color-override` to `true-color`
---
 base16_theme.toml                   | 41 +++++++++++++++++++++++++++++++++++++
 book/src/configuration.md           |  1 +
 helix-term/src/application.rs       | 28 +++++++++++++++++--------
 helix-term/src/commands.rs          | 14 +++++++++++--
 helix-term/src/lib.rs               |  6 ++++++
 helix-term/src/ui/mod.rs            |  1 +
 helix-view/src/editor.rs            | 12 +++--------
 helix-view/src/theme.rs             | 20 ++++++++++++++++++
 runtime/themes/base16_terminal.toml | 41 -------------------------------------
 9 files changed, 103 insertions(+), 61 deletions(-)
 create mode 100644 base16_theme.toml
 delete mode 100644 runtime/themes/base16_terminal.toml

(limited to 'runtime/themes/base16_terminal.toml')

diff --git a/base16_theme.toml b/base16_theme.toml
new file mode 100644
index 00000000..bf3c73f1
--- /dev/null
+++ b/base16_theme.toml
@@ -0,0 +1,41 @@
+# Author: NNB <nnbnh@protonmail.com>
+
+"ui.menu" = "black"
+"ui.menu.selected" = { fg = "white", bg = "black" }
+"ui.linenr" = { fg = "light-gray", bg = "black" }
+"ui.popup" = { bg = "black" }
+"ui.window" = { bg = "black" }
+"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
+"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
+"comment" = { fg = "light-gray", modifiers = ["italic"] }
+"ui.statusline" = { fg = "white", bg = "black" }
+"ui.help" = { fg = "white", bg = "black" }
+"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } #FIXME
+"ui.text" = "white" #FIXME
+"operator" = "white" #FIXME
+"ui.text.focus" = "white" #FIXME
+"variable" = "light-red"
+"constant.numeric" = "yellow"
+"constant" = "yellow"
+"attributes" = "yellow"
+"type" = "light-yellow"
+"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
+"string"  = "light-green"
+"variable.other.member" = "light-green"
+"constant.character.escape" = "light-cyan"
+"function" = "light-blue"
+"constructor" = "light-blue"
+"special" = "light-blue"
+"keyword" = "light-magenta"
+"label" = "light-magenta"
+"namespace" = "light-magenta"
+"ui.popup" = { bg = "black" }
+"ui.window" = { bg = "base00" }
+"ui.help" = { fg = "white", bg = "black" }
+
+"info" = "light-gray"
+"hint" = "light-gray"
+"debug" = "light-gray"
+"diagnostic" = "light-gray"
+"error" = "light-magenta"
diff --git a/book/src/configuration.md b/book/src/configuration.md
index 2ed48d51..33a933b2 100644
--- a/book/src/configuration.md
+++ b/book/src/configuration.md
@@ -23,6 +23,7 @@ To override global configuration parameters, create a `config.toml` file located
 | `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant. | `400` |
 | `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
 | `auto-info` | Whether to display infoboxes | `true` |
+| `true-color` | Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative. | `false` |
 
 `[editor.filepicker]` section of the config. Sets options for file picker and global search. All but the last key listed in the default file-picker configuration below are IgnoreOptions: whether hidden files and files listed within ignore files are ignored by (not visible in) the helix file picker and global search. There is also one other key, `max-depth` available, which is not defined by default.
 
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 90330751..3e0b6d59 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -76,17 +76,27 @@ impl Application {
             None => Ok(def_lang_conf),
         };
 
-        let theme = if let Some(theme) = &config.theme {
-            match theme_loader.load(theme) {
-                Ok(theme) => theme,
-                Err(e) => {
-                    log::warn!("failed to load theme `{}` - {}", theme, e);
+        let true_color = config.editor.true_color || crate::true_color();
+        let theme = config
+            .theme
+            .as_ref()
+            .and_then(|theme| {
+                theme_loader
+                    .load(theme)
+                    .map_err(|e| {
+                        log::warn!("failed to load theme `{}` - {}", theme, e);
+                        e
+                    })
+                    .ok()
+                    .filter(|theme| (true_color || theme.is_16_color()))
+            })
+            .unwrap_or_else(|| {
+                if true_color {
                     theme_loader.default()
+                } else {
+                    theme_loader.base16_default()
                 }
-            }
-        } else {
-            theme_loader.default()
-        };
+            });
 
         let syn_loader_conf: helix_core::syntax::Configuration = lang_conf
             .and_then(|conf| conf.try_into())
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 0ae225e9..22c23043 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -2366,8 +2366,18 @@ pub mod cmd {
         args: &[Cow<str>],
         _event: PromptEvent,
     ) -> anyhow::Result<()> {
-        let theme = args.first().context("theme not provided")?;
-        cx.editor.set_theme_from_name(theme)
+        let theme = args.first().context("Theme not provided")?;
+        let theme = cx
+            .editor
+            .theme_loader
+            .load(theme)
+            .with_context(|| format!("Failed setting theme {}", theme))?;
+        let true_color = cx.editor.config.true_color || crate::true_color();
+        if !(true_color || theme.is_16_color()) {
+            bail!("Unsupported theme: theme requires true color support");
+        }
+        cx.editor.set_theme(theme);
+        Ok(())
     }
 
     fn yank_main_selection_to_clipboard(
diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index f5e3a8cd..4fe76cd5 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -9,3 +9,9 @@ pub mod config;
 pub mod job;
 pub mod keymap;
 pub mod ui;
+
+fn true_color() -> bool {
+    std::env::var("COLORTERM")
+        .map(|v| matches!(v.as_str(), "truecolor" | "24bit"))
+        .unwrap_or(false)
+}
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index cdf42311..f57e2e2b 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -186,6 +186,7 @@ pub mod completers {
             &helix_core::config_dir().join("themes"),
         ));
         names.push("default".into());
+        names.push("base16_default".into());
 
         let mut names: Vec<_> = names
             .into_iter()
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index dcbcbe4f..753defa1 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -105,6 +105,8 @@ pub struct Config {
     /// Whether to display infoboxes. Defaults to true.
     pub auto_info: bool,
     pub file_picker: FilePickerConfig,
+    /// Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative. Defaults to `false`.
+    pub true_color: bool,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize)]
@@ -137,6 +139,7 @@ impl Default for Config {
             completion_trigger_len: 2,
             auto_info: true,
             file_picker: FilePickerConfig::default(),
+            true_color: false,
         }
     }
 }
@@ -265,15 +268,6 @@ impl Editor {
         self._refresh();
     }
 
-    pub fn set_theme_from_name(&mut self, theme: &str) -> anyhow::Result<()> {
-        let theme = self
-            .theme_loader
-            .load(theme.as_ref())
-            .with_context(|| format!("failed setting theme `{}`", theme))?;
-        self.set_theme(theme);
-        Ok(())
-    }
-
     /// Refreshes the language server for a given document
     pub fn refresh_language_server(&mut self, doc_id: DocumentId) -> Option<()> {
         let doc = self.documents.get_mut(&doc_id)?;
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 47fc6262..ddcdad99 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -15,6 +15,10 @@ pub use crate::graphics::{Color, Modifier, Style};
 pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
     toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
 });
+pub static BASE16_DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
+    toml::from_slice(include_bytes!("../../base16_theme.toml"))
+        .expect("Failed to parse base 16 default theme")
+});
 
 #[derive(Clone, Debug)]
 pub struct Loader {
@@ -35,6 +39,9 @@ impl Loader {
         if name == "default" {
             return Ok(self.default());
         }
+        if name == "base16_default" {
+            return Ok(self.base16_default());
+        }
         let filename = format!("{}.toml", name);
 
         let user_path = self.user_dir.join(&filename);
@@ -74,6 +81,11 @@ impl Loader {
     pub fn default(&self) -> Theme {
         DEFAULT_THEME.clone()
     }
+
+    /// Returns the alternative 16-color default theme
+    pub fn base16_default(&self) -> Theme {
+        BASE16_DEFAULT_THEME.clone()
+    }
 }
 
 #[derive(Clone, Debug)]
@@ -154,6 +166,14 @@ impl Theme {
     pub fn find_scope_index(&self, scope: &str) -> Option<usize> {
         self.scopes().iter().position(|s| s == scope)
     }
+
+    pub fn is_16_color(&self) -> bool {
+        self.styles.iter().all(|(_, style)| {
+            [style.fg, style.bg]
+                .into_iter()
+                .all(|color| !matches!(color, Some(Color::Rgb(..))))
+        })
+    }
 }
 
 struct ThemePalette {
diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
deleted file mode 100644
index bf3c73f1..00000000
--- a/runtime/themes/base16_terminal.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Author: NNB <nnbnh@protonmail.com>
-
-"ui.menu" = "black"
-"ui.menu.selected" = { fg = "white", bg = "black" }
-"ui.linenr" = { fg = "light-gray", bg = "black" }
-"ui.popup" = { bg = "black" }
-"ui.window" = { bg = "black" }
-"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
-"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
-"comment" = { fg = "light-gray", modifiers = ["italic"] }
-"ui.statusline" = { fg = "white", bg = "black" }
-"ui.help" = { fg = "white", bg = "black" }
-"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
-"ui.cursor.primary" = { fg = "white", modifiers = ["reversed"] } #FIXME
-"ui.text" = "white" #FIXME
-"operator" = "white" #FIXME
-"ui.text.focus" = "white" #FIXME
-"variable" = "light-red"
-"constant.numeric" = "yellow"
-"constant" = "yellow"
-"attributes" = "yellow"
-"type" = "light-yellow"
-"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
-"string"  = "light-green"
-"variable.other.member" = "light-green"
-"constant.character.escape" = "light-cyan"
-"function" = "light-blue"
-"constructor" = "light-blue"
-"special" = "light-blue"
-"keyword" = "light-magenta"
-"label" = "light-magenta"
-"namespace" = "light-magenta"
-"ui.popup" = { bg = "black" }
-"ui.window" = { bg = "base00" }
-"ui.help" = { fg = "white", bg = "black" }
-
-"info" = "light-gray"
-"hint" = "light-gray"
-"debug" = "light-gray"
-"diagnostic" = "light-gray"
-"error" = "light-magenta"
-- 
cgit v1.2.3-70-g09d2


From 42e6d96a75c743c2fa8da6c8a0587487b3c21bf0 Mon Sep 17 00:00:00 2001
From: Omnikar
Date: Thu, 2 Dec 2021 22:34:54 -0500
Subject: Use `base16_tty` as 16-color default, fix theme name

---
 base16_terminal.toml                | 37 -------------------------------------
 base16_theme.toml                   | 36 ++++++++++++++++++++++++++++++++++++
 helix-view/src/theme.rs             |  5 ++---
 runtime/themes/base16_terminal.toml | 37 +++++++++++++++++++++++++++++++++++++
 runtime/themes/base16_tty.toml      | 36 ------------------------------------
 5 files changed, 75 insertions(+), 76 deletions(-)
 delete mode 100644 base16_terminal.toml
 create mode 100644 base16_theme.toml
 create mode 100644 runtime/themes/base16_terminal.toml
 delete mode 100644 runtime/themes/base16_tty.toml

(limited to 'runtime/themes/base16_terminal.toml')

diff --git a/base16_terminal.toml b/base16_terminal.toml
deleted file mode 100644
index a76cfd7e..00000000
--- a/base16_terminal.toml
+++ /dev/null
@@ -1,37 +0,0 @@
-# Author: NNB <nnbnh@protonmail.com>
-
-"ui.menu" = "black"
-"ui.menu.selected" = { modifiers = ["reversed"] }
-"ui.linenr" = { fg = "light-gray", bg = "black" }
-"ui.popup" = { bg = "black" }
-"ui.window" = { bg = "black" }
-"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
-"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
-"comment" = { fg = "light-gray", modifiers = ["italic"] }
-"ui.statusline" = { fg = "white", bg = "black" }
-"ui.statusline.inactive" = { fg = "gray", bg = "black" }
-"ui.help" = { fg = "white", bg = "black" }
-"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
-"ui.cursor.primary" = { modifiers = ["reversed"] }
-"variable" = "light-red"
-"constant.numeric" = "yellow"
-"constant" = "yellow"
-"attributes" = "yellow"
-"type" = "light-yellow"
-"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
-"string"  = "light-green"
-"variable.other.member" = "light-green"
-"constant.character.escape" = "light-cyan"
-"function" = "light-blue"
-"constructor" = "light-blue"
-"special" = "light-blue"
-"keyword" = "light-magenta"
-"label" = "light-magenta"
-"namespace" = "light-magenta"
-"ui.help" = { fg = "white", bg = "black" }
-
-"info" = "light-gray"
-"hint" = "light-gray"
-"debug" = "light-gray"
-"diagnostic" = "light-gray"
-"error" = "light-red"
diff --git a/base16_theme.toml b/base16_theme.toml
new file mode 100644
index 00000000..e1d1647b
--- /dev/null
+++ b/base16_theme.toml
@@ -0,0 +1,36 @@
+# Author: NNB <nnbnh@protonmail.com>
+
+"ui.menu" = "black"
+"ui.menu.selected" = { modifiers = ["reversed"] }
+"ui.linenr" = { fg = "gray", bg = "black" }
+"ui.popup" = { modifiers = ["reversed"] }
+"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
+"ui.selection" = { fg = "black", bg = "blue" }
+"ui.selection.primary" = { fg = "white", bg = "blue" }
+"comment" = { fg = "gray" }
+"ui.statusline" = { fg = "black", bg = "white" }
+"ui.statusline.inactive" = { fg = "gray", bg = "white" }
+"ui.help" = { modifiers = ["reversed"] }
+"ui.cursor" = { modifiers = ["reversed"] }
+"variable" = "red"
+"constant.numeric" = "yellow"
+"constant" = "yellow"
+"attributes" = "yellow"
+"type" = "yellow"
+"ui.cursor.match" = { fg = "yellow", modifiers = ["underlined"] }
+"string"  = "green"
+"variable.other.member" = "green"
+"constant.character.escape" = "cyan"
+"function" = "blue"
+"constructor" = "blue"
+"special" = "blue"
+"keyword" = "magenta"
+"label" = "magenta"
+"namespace" = "magenta"
+"ui.help" = { fg = "white", bg = "black" }
+
+"info" = "gray"
+"hint" = "gray"
+"debug" = "gray"
+"diagnostic" = "gray"
+"error" = "red"
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index 6ca021a9..4a2ecbba 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -16,7 +16,7 @@ pub static DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
     toml::from_slice(include_bytes!("../../theme.toml")).expect("Failed to parse default theme")
 });
 pub static BASE16_DEFAULT_THEME: Lazy<Theme> = Lazy::new(|| {
-    toml::from_slice(include_bytes!("../../base16_tty.toml"))
+    toml::from_slice(include_bytes!("../../base16_theme.toml"))
         .expect("Failed to parse base 16 default theme")
 });
 
@@ -150,8 +150,7 @@ impl Theme {
     }
 
     pub fn get(&self, scope: &str) -> Style {
-        self.try_get(scope)
-            .unwrap_or_default()
+        self.try_get(scope).unwrap_or_default()
     }
 
     pub fn try_get(&self, scope: &str) -> Option<Style> {
diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
new file mode 100644
index 00000000..a76cfd7e
--- /dev/null
+++ b/runtime/themes/base16_terminal.toml
@@ -0,0 +1,37 @@
+# Author: NNB <nnbnh@protonmail.com>
+
+"ui.menu" = "black"
+"ui.menu.selected" = { modifiers = ["reversed"] }
+"ui.linenr" = { fg = "light-gray", bg = "black" }
+"ui.popup" = { bg = "black" }
+"ui.window" = { bg = "black" }
+"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
+"ui.selection" = { fg = "gray", modifiers = ["reversed"] }
+"comment" = { fg = "light-gray", modifiers = ["italic"] }
+"ui.statusline" = { fg = "white", bg = "black" }
+"ui.statusline.inactive" = { fg = "gray", bg = "black" }
+"ui.help" = { fg = "white", bg = "black" }
+"ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
+"ui.cursor.primary" = { modifiers = ["reversed"] }
+"variable" = "light-red"
+"constant.numeric" = "yellow"
+"constant" = "yellow"
+"attributes" = "yellow"
+"type" = "light-yellow"
+"ui.cursor.match" = { fg = "light-yellow", modifiers = ["underlined"] }
+"string"  = "light-green"
+"variable.other.member" = "light-green"
+"constant.character.escape" = "light-cyan"
+"function" = "light-blue"
+"constructor" = "light-blue"
+"special" = "light-blue"
+"keyword" = "light-magenta"
+"label" = "light-magenta"
+"namespace" = "light-magenta"
+"ui.help" = { fg = "white", bg = "black" }
+
+"info" = "light-gray"
+"hint" = "light-gray"
+"debug" = "light-gray"
+"diagnostic" = "light-gray"
+"error" = "light-red"
diff --git a/runtime/themes/base16_tty.toml b/runtime/themes/base16_tty.toml
deleted file mode 100644
index e1d1647b..00000000
--- a/runtime/themes/base16_tty.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-# Author: NNB <nnbnh@protonmail.com>
-
-"ui.menu" = "black"
-"ui.menu.selected" = { modifiers = ["reversed"] }
-"ui.linenr" = { fg = "gray", bg = "black" }
-"ui.popup" = { modifiers = ["reversed"] }
-"ui.linenr.selected" = { fg = "white", bg = "black", modifiers = ["bold"] }
-"ui.selection" = { fg = "black", bg = "blue" }
-"ui.selection.primary" = { fg = "white", bg = "blue" }
-"comment" = { fg = "gray" }
-"ui.statusline" = { fg = "black", bg = "white" }
-"ui.statusline.inactive" = { fg = "gray", bg = "white" }
-"ui.help" = { modifiers = ["reversed"] }
-"ui.cursor" = { modifiers = ["reversed"] }
-"variable" = "red"
-"constant.numeric" = "yellow"
-"constant" = "yellow"
-"attributes" = "yellow"
-"type" = "yellow"
-"ui.cursor.match" = { fg = "yellow", modifiers = ["underlined"] }
-"string"  = "green"
-"variable.other.member" = "green"
-"constant.character.escape" = "cyan"
-"function" = "blue"
-"constructor" = "blue"
-"special" = "blue"
-"keyword" = "magenta"
-"label" = "magenta"
-"namespace" = "magenta"
-"ui.help" = { fg = "white", bg = "black" }
-
-"info" = "gray"
-"hint" = "gray"
-"debug" = "gray"
-"diagnostic" = "gray"
-"error" = "red"
-- 
cgit v1.2.3-70-g09d2


From c7ace15fd4cf6794782aca0927ff4d43fffbd473 Mon Sep 17 00:00:00 2001
From: NNB
Date: Tue, 7 Dec 2021 23:33:54 +0700
Subject: Add `ui.gutter` theming

---
 base16_theme.toml                        |  6 ++++--
 runtime/themes/base16_default_dark.toml  |  6 ++++--
 runtime/themes/base16_default_light.toml |  6 ++++--
 runtime/themes/base16_terminal.toml      | 10 ++++++----
 4 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'runtime/themes/base16_terminal.toml')

diff --git a/base16_theme.toml b/base16_theme.toml
index e1d1647b..5ec74bcc 100644
--- a/base16_theme.toml
+++ b/base16_theme.toml
@@ -29,8 +29,10 @@
 "namespace" = "magenta"
 "ui.help" = { fg = "white", bg = "black" }
 
-"info" = "gray"
+"diagnostic" = { modifiers = ["underlined"] }
+"ui.gutter" = { bg = "black" }
+"info" = "blue"
 "hint" = "gray"
 "debug" = "gray"
-"diagnostic" = "gray"
+"warning" = "yellow"
 "error" = "red"
diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml
index 0b12bdbc..fd4b0fea 100644
--- a/runtime/themes/base16_default_dark.toml
+++ b/runtime/themes/base16_default_dark.toml
@@ -33,10 +33,12 @@
 "namespace" = "base0E"
 "ui.help" = { fg = "base06", bg = "base01" }
 
-"info" = "base03"
+"diagnostic" = { modifiers = ["underlined"] }
+"ui.gutter" = { bg = "base01" }
+"info" = "base0D"
 "hint" = "base03"
 "debug" = "base03"
-"diagnostic" = "base03"
+"warning" = "base09"
 "error" = "base08"
 
 [palette]
diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml
index 144144d1..596990da 100644
--- a/runtime/themes/base16_default_light.toml
+++ b/runtime/themes/base16_default_light.toml
@@ -33,10 +33,12 @@
 "namespace" = "base0E"
 "ui.help" = { fg = "base06", bg = "base01" }
 
-"info" = "base03"
+"diagnostic" = { modifiers = ["underlined"] }
+"ui.gutter" = { bg = "base01" }
+"info" = "base0D"
 "hint" = "base03"
 "debug" = "base03"
-"diagnostic" = "base03"
+"warning" = "base09"
 "error" = "base08"
 
 [palette]
diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
index a76cfd7e..123ceaea 100644
--- a/runtime/themes/base16_terminal.toml
+++ b/runtime/themes/base16_terminal.toml
@@ -30,8 +30,10 @@
 "namespace" = "light-magenta"
 "ui.help" = { fg = "white", bg = "black" }
 
-"info" = "light-gray"
-"hint" = "light-gray"
-"debug" = "light-gray"
-"diagnostic" = "light-gray"
+"diagnostic" = { modifiers = ["underlined"] }
+"ui.gutter" = { bg = "black" }
+"info" = "light-blue"
+"hint" = "gray"
+"debug" = "gray"
+"warning" = "yellow"
 "error" = "light-red"
-- 
cgit v1.2.3-70-g09d2


From 3b800025af0bdf7e8179cbb42ad0b4374b9005f1 Mon Sep 17 00:00:00 2001
From: Michael Davis
Date: Wed, 22 Dec 2021 09:54:23 -0600
Subject: add diff.{plus,minus,delta} to themes

---
 base16_theme.toml                         | 4 ++++
 runtime/themes/base16_default_dark.toml   | 4 ++++
 runtime/themes/base16_default_light.toml  | 4 ++++
 runtime/themes/base16_terminal.toml       | 4 ++++
 runtime/themes/bogster.toml               | 4 ++++
 runtime/themes/dark_plus.toml             | 4 ++++
 runtime/themes/dracula.toml               | 4 ++++
 runtime/themes/everforest_dark.toml       | 4 ++++
 runtime/themes/gruvbox.toml               | 4 ++++
 runtime/themes/ingrid.toml                | 4 ++++
 runtime/themes/monokai.toml               | 6 +++++-
 runtime/themes/monokai_pro.toml           | 5 +++++
 runtime/themes/monokai_pro_machine.toml   | 5 +++++
 runtime/themes/monokai_pro_octagon.toml   | 5 +++++
 runtime/themes/monokai_pro_ristretto.toml | 5 +++++
 runtime/themes/monokai_pro_spectrum.toml  | 5 +++++
 runtime/themes/nord.toml                  | 5 +++++
 runtime/themes/onedark.toml               | 4 ++++
 runtime/themes/rose_pine.toml             | 3 +++
 runtime/themes/rose_pine_dawn.toml        | 3 +++
 runtime/themes/solarized_dark.toml        | 4 ++++
 runtime/themes/solarized_light.toml       | 4 ++++
 runtime/themes/spacebones_light.toml      | 4 ++++
 theme.toml                                | 4 ++++
 24 files changed, 101 insertions(+), 1 deletion(-)

(limited to 'runtime/themes/base16_terminal.toml')

diff --git a/base16_theme.toml b/base16_theme.toml
index 5ec74bcc..bb60a3ea 100644
--- a/base16_theme.toml
+++ b/base16_theme.toml
@@ -29,6 +29,10 @@
 "namespace" = "magenta"
 "ui.help" = { fg = "white", bg = "black" }
 
+"diff.plus" = "green"
+"diff.delta" = "yellow"
+"diff.minus" = "red"
+
 "diagnostic" = { modifiers = ["underlined"] }
 "ui.gutter" = { bg = "black" }
 "info" = "blue"
diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml
index fd4b0fea..33ff87fa 100644
--- a/runtime/themes/base16_default_dark.toml
+++ b/runtime/themes/base16_default_dark.toml
@@ -33,6 +33,10 @@
 "namespace" = "base0E"
 "ui.help" = { fg = "base06", bg = "base01" }
 
+"diff.plus" = "base0B"
+"diff.delta" = "base09"
+"diff.minus" = "base08"
+
 "diagnostic" = { modifiers = ["underlined"] }
 "ui.gutter" = { bg = "base01" }
 "info" = "base0D"
diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml
index 596990da..3f4de265 100644
--- a/runtime/themes/base16_default_light.toml
+++ b/runtime/themes/base16_default_light.toml
@@ -33,6 +33,10 @@
 "namespace" = "base0E"
 "ui.help" = { fg = "base06", bg = "base01" }
 
+"diff.plus" = "base0B"
+"diff.delta" = "base09"
+"diff.minus" = "base08"
+
 "diagnostic" = { modifiers = ["underlined"] }
 "ui.gutter" = { bg = "base01" }
 "info" = "base0D"
diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
index 123ceaea..cbbfbf24 100644
--- a/runtime/themes/base16_terminal.toml
+++ b/runtime/themes/base16_terminal.toml
@@ -30,6 +30,10 @@
 "namespace" = "light-magenta"
 "ui.help" = { fg = "white", bg = "black" }
 
+"diff.plus" = "light-green"
+"diff.delta" = "yellow"
+"diff.minus" = "light-red"
+
 "diagnostic" = { modifiers = ["underlined"] }
 "ui.gutter" = { bg = "black" }
 "info" = "light-blue"
diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index 86a6c34b..ea6844f2 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -28,6 +28,10 @@
 
 "module" = "#d32c5d"
 
+"diff.plus" = "#59dcb7"
+"diff.delta" = "#dc7759"
+"diff.minus" = "#dc597f"
+
 "ui.background" = { bg = "#161c23" }
 "ui.linenr" = { fg = "#415367" }
 "ui.linenr.selected" = { fg = "#e5ded6" }  # TODO
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index 0554f827..78437649 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -39,6 +39,10 @@
 "constant.numeric" = { fg = "pale_green" }
 "constant.character.escape" = { fg = "gold" }
 
+"diff.plus" = { fg = "pale_green" }
+"diff.delta" = { fg = "gold" }
+"diff.minus" = { fg = "red" }
+
 "ui.background" = { fg = "light_gray", bg = "dark_gray2" }
 
 "ui.window" = { bg = "widget" }
diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index 956fd0f5..f01c7323 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -15,6 +15,10 @@
 "variable.builtin" = { fg = "cyan", modifiers = ["italic"] }
 "variable.parameter" = { fg ="orange", modifiers = ["italic"] }
 
+"diff.plus" = { fg = "green" }
+"diff.delta" = { fg = "orange" }
+"diff.minus" = { fg = "red" }
+
 "ui.background" = { fg = "foreground", bg = "background" }
 "ui.cursor" =  { fg = "background", bg = "orange", modifiers = ["dim"] }
 "ui.cursor.match" = { fg = "green", modifiers = ["underlined"] }
diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index bbd005e6..3be9f1f0 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -34,6 +34,10 @@
 "module" = "blue"
 "special" = "orange"
 
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "red"
+
 "ui.background" = { bg = "bg0" }
 "ui.cursor" = { fg = "bg0", bg = "fg" }
 "ui.cursor.match" = { fg = "orange", bg = "bg_yellow" }
diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index 0ff039ea..9eae0915 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -28,6 +28,10 @@
 "label" = "aqua1"
 "module" = "aqua1"
 
+"diff.plus" = "green1"
+"diff.delta" = "orange1"
+"diff.minus" = "red1"
+
 "warning" = { fg = "orange1", bg = "bg1" }
 "error" = { fg = "red1", bg = "bg1" }
 "info" = { fg = "aqua1", bg = "bg1" }
diff --git a/runtime/themes/ingrid.toml b/runtime/themes/ingrid.toml
index 30829475..df8a922f 100644
--- a/runtime/themes/ingrid.toml
+++ b/runtime/themes/ingrid.toml
@@ -28,6 +28,10 @@
 
 "module" = "#839A53"
 
+"diff.plus" = "#839A53"
+"diff.delta" = "#D4A520"
+"diff.minus" = "#D74E50"
+
 "ui.background" = { bg = "#FFFCFD" }
 "ui.linenr" = { fg = "#bbbbbb" }
 "ui.linenr.selected" = { fg = "#F3EAE9" }  # TODO
diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index 38f9f170..c8bf8ebd 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -39,6 +39,10 @@
 "constant.numeric" = { fg = "#ae81ff" }
 "constant.character.escape" = { fg = "#ae81ff" }
 
+"diff.plus" = { fg = "#a6e22e" }
+"diff.delta" = { fg = "#fd971f" }
+"diff.minus" = { fg = "#f92672" }
+
 "ui.background" = { fg = "text", bg = "background" }
 
 "ui.window" = { bg = "widget" }
@@ -65,7 +69,7 @@
 "warning" = { fg = "#cca700" }
 "error" = { fg = "#f48771" }
 "info" = { fg = "#75beff" }
-"hint" = { fg = "#eeeeeeb3" }
+"hint" = { fg = "#eeeeeb3" }
 
 diagnostic = { modifiers = ["underlined"] }
 
diff --git a/runtime/themes/monokai_pro.toml b/runtime/themes/monokai_pro.toml
index bf8a4a84..5daeaf6c 100644
--- a/runtime/themes/monokai_pro.toml
+++ b/runtime/themes/monokai_pro.toml
@@ -77,6 +77,11 @@
 # integer, floating point
 "constant.numeric" = "purple"
 
+# vcs
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "red"
+
 # make diagnostic underlined, to distinguish with selection text.
 diagnostic = { modifiers = ["underlined"] }
 
diff --git a/runtime/themes/monokai_pro_machine.toml b/runtime/themes/monokai_pro_machine.toml
index d8a701f1..0763a5fb 100644
--- a/runtime/themes/monokai_pro_machine.toml
+++ b/runtime/themes/monokai_pro_machine.toml
@@ -77,6 +77,11 @@
 # integer, floating point
 "constant.numeric" = "purple"
 
+# vcs
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "red"
+
 # make diagnostic underlined, to distinguish with selection text.
 diagnostic = { modifiers = ["underlined"] }
 
diff --git a/runtime/themes/monokai_pro_octagon.toml b/runtime/themes/monokai_pro_octagon.toml
index 74459472..6a74a8d0 100644
--- a/runtime/themes/monokai_pro_octagon.toml
+++ b/runtime/themes/monokai_pro_octagon.toml
@@ -77,6 +77,11 @@
 # integer, floating point
 "constant.numeric" = "purple"
 
+# vcs
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "red"
+
 # make diagnostic underlined, to distinguish with selection text.
 diagnostic = { modifiers = ["underlined"] }
 
diff --git a/runtime/themes/monokai_pro_ristretto.toml b/runtime/themes/monokai_pro_ristretto.toml
index a9cf4b34..1a1a32ff 100644
--- a/runtime/themes/monokai_pro_ristretto.toml
+++ b/runtime/themes/monokai_pro_ristretto.toml
@@ -77,6 +77,11 @@
 # integer, floating point
 "constant.numeric" = "purple"
 
+# vcs
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "red"
+
 # make diagnostic underlined, to distinguish with selection text.
 diagnostic = { modifiers = ["underlined"] }
 
diff --git a/runtime/themes/monokai_pro_spectrum.toml b/runtime/themes/monokai_pro_spectrum.toml
index 232adfbd..36630493 100644
--- a/runtime/themes/monokai_pro_spectrum.toml
+++ b/runtime/themes/monokai_pro_spectrum.toml
@@ -77,6 +77,11 @@
 # integer, floating point
 "constant.numeric" = "purple"
 
+# vcs
+"diff.plus" = "green"
+"diff.delta" = "orange"
+"diff.minus" = "red"
+
 # make diagnostic underlined, to distinguish with selection text.
 diagnostic = { modifiers = ["underlined"] }
 
diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index a619f902..ae1ea29b 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -84,6 +84,11 @@
 # nord15 - integer, floating point
 "constant.numeric" = "nord15"
 
+# vcs
+"diff.plus" = "nord14"
+"diff.delta" = "nord12"
+"diff.minus" = "nord11"
+
 [palette]
 nord0 = "#2e3440"
 nord1 = "#3b4252"
diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index 4ab1dd95..dfeadbb2 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -36,6 +36,10 @@
 "markup.link.url" = { fg = "cyan", modifiers = ["underlined"]}
 "markup.link.label" = { fg = "purple" }
 
+"diff.plus" = "green"
+"diff.delta" = "gold"
+"diff.minus" = "red"
+
 diagnostic = { modifiers = ["underlined"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "green", modifiers = ["bold"] }
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index a3c12bce..bf3a040b 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -38,6 +38,9 @@
 "ui.window" = { bg = "base" }
 "ui.help" = { bg = "overlay", fg = "foam" }
 "text" = "text"
+"diff.plus" = "foam"
+"diff.delta" = "rose"
+"diff.minus" = "love"
 
 "info" = "gold"
 "hint" = "gold"
diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml
index 6654c8c9..cc6d287e 100644
--- a/runtime/themes/rose_pine_dawn.toml
+++ b/runtime/themes/rose_pine_dawn.toml
@@ -38,6 +38,9 @@
 "ui.window" = { bg = "base" }
 "ui.help" = { bg = "overlay", fg = "foam" }
 "text" = "text"
+"diff.plus" = "foam"
+"diff.delta" = "rose"
+"diff.minus" = "love"
 
 "info" = "gold"
 "hint" = "gold"
diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index 979fdaac..ab345c8d 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -22,6 +22,10 @@
 "module" = { fg = "violet" }
 "tag" = { fg = "magenta" }
 
+"diff.plus" = { fg = "green" }
+"diff.delta" = { fg = "orange" }
+"diff.minus" = { fg = "red" }
+
 # 背景
 "ui.background" = { bg = "base03" }
 
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
index ded90cc4..6b0137fb 100644
--- a/runtime/themes/solarized_light.toml
+++ b/runtime/themes/solarized_light.toml
@@ -22,6 +22,10 @@
 "module" = { fg = "violet" }
 "tag" = { fg = "magenta" }
 
+"diff.plus" = { fg = "green" }
+"diff.delta" = { fg = "orange" }
+"diff.minus" = { fg = "red" }
+
 # 背景
 "ui.background" = { bg = "base03" }
 
diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
index 92f116ab..fcbe7b37 100644
--- a/runtime/themes/spacebones_light.toml
+++ b/runtime/themes/spacebones_light.toml
@@ -30,6 +30,10 @@
 "label" = "#b1951d"
 "module" = "#b1951d"
 
+"diff.plus" = "#2d9574"
+"diff.delta" = "#715ab1"
+"diff.minus" = "#ba2f59"
+
 "warning" = { fg = "#da8b55" }
 "error" = { fg = "#e0211d" }
 "info" = { fg = "#b1951d" }
diff --git a/theme.toml b/theme.toml
index b316e814..ca0b2805 100644
--- a/theme.toml
+++ b/theme.toml
@@ -34,6 +34,10 @@ label = "honey"
 "markup.link.url" = { fg = "silver", modifiers = ["underlined"] }
 "markup.raw" = "almond"
 
+"diff.plus" = "#35bf86"
+"diff.minus" = "#f22c86"
+"diff.delta" = "#6f44f0"
+
 # TODO: diferentiate doc comment
 # concat (ERROR) @error.syntax and "MISSING ;" selectors for errors
 
-- 
cgit v1.2.3-70-g09d2


From 83bde1004d596740a7bb63ec7fe2271734492f59 Mon Sep 17 00:00:00 2001
From: NNB
Date: Sun, 23 Jan 2022 09:18:50 +0700
Subject: Add markup support (#1525)

* Add markup support for all Base16 themes

* Fix rose_pine `markup.link.text` attribute misname

* Add basic default markup support for all themes

* Fix cursor change color on Base16 terminal and default

* Remove old markup monokai_pro support and fix Onedark `markup.link.text` attribute misname

* Remove old markup dracula support---
 base16_theme.toml                        | 11 ++++++++++-
 runtime/themes/base16_default_dark.toml  |  9 +++++++++
 runtime/themes/base16_default_light.toml |  9 +++++++++
 runtime/themes/base16_terminal.toml      | 11 ++++++++++-
 runtime/themes/bogster.toml              | 10 ++++++++++
 runtime/themes/dark_plus.toml            | 10 ++++++++++
 runtime/themes/everforest_dark.toml      | 10 ++++++++++
 runtime/themes/everforest_light.toml     | 10 ++++++++++
 runtime/themes/ingrid.toml               | 10 ++++++++++
 runtime/themes/monokai.toml              | 10 ++++++++++
 runtime/themes/nord.toml                 | 10 ++++++++++
 runtime/themes/onedark.toml              |  2 +-
 runtime/themes/rose_pine.toml            |  2 +-
 runtime/themes/rose_pine_dawn.toml       |  2 +-
 runtime/themes/solarized_dark.toml       | 10 ++++++++++
 runtime/themes/solarized_light.toml      | 10 ++++++++++
 runtime/themes/spacebones_light.toml     | 10 ++++++++++
 17 files changed, 141 insertions(+), 5 deletions(-)

(limited to 'runtime/themes/base16_terminal.toml')

diff --git a/base16_theme.toml b/base16_theme.toml
index bb60a3ea..42e02a98 100644
--- a/base16_theme.toml
+++ b/base16_theme.toml
@@ -11,7 +11,7 @@
 "ui.statusline" = { fg = "black", bg = "white" }
 "ui.statusline.inactive" = { fg = "gray", bg = "white" }
 "ui.help" = { modifiers = ["reversed"] }
-"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor" = { fg = "white", modifiers = ["reversed"] }
 "variable" = "red"
 "constant.numeric" = "yellow"
 "constant" = "yellow"
@@ -29,6 +29,15 @@
 "namespace" = "magenta"
 "ui.help" = { fg = "white", bg = "black" }
 
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 "diff.plus" = "green"
 "diff.delta" = "yellow"
 "diff.minus" = "red"
diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml
index 33ff87fa..d19863e0 100644
--- a/runtime/themes/base16_default_dark.toml
+++ b/runtime/themes/base16_default_dark.toml
@@ -33,6 +33,15 @@
 "namespace" = "base0E"
 "ui.help" = { fg = "base06", bg = "base01" }
 
+"markup.heading" = "base0D"
+"markup.list" = "base08"
+"markup.bold" = { fg = "base0A", modifiers = ["bold"] }
+"markup.italic" = { fg = "base0E", modifiers = ["italic"] }
+"markup.link.url" = { fg = "base09", modifiers = ["underlined"] }
+"markup.link.text" = "base08"
+"markup.quote" = "base0C"
+"markup.raw" = "base0B"
+
 "diff.plus" = "base0B"
 "diff.delta" = "base09"
 "diff.minus" = "base08"
diff --git a/runtime/themes/base16_default_light.toml b/runtime/themes/base16_default_light.toml
index 3f4de265..483e87cc 100644
--- a/runtime/themes/base16_default_light.toml
+++ b/runtime/themes/base16_default_light.toml
@@ -33,6 +33,15 @@
 "namespace" = "base0E"
 "ui.help" = { fg = "base06", bg = "base01" }
 
+"markup.heading" = "base0D"
+"markup.list" = "base08"
+"markup.bold" = { fg = "base0A", modifiers = ["bold"] }
+"markup.italic" = { fg = "base0E", modifiers = ["italic"] }
+"markup.link.url" = { fg = "base09", modifiers = ["underlined"] }
+"markup.link.text" = "base08"
+"markup.quote" = "base0C"
+"markup.raw" = "base0B"
+
 "diff.plus" = "base0B"
 "diff.delta" = "base09"
 "diff.minus" = "base08"
diff --git a/runtime/themes/base16_terminal.toml b/runtime/themes/base16_terminal.toml
index cbbfbf24..23240d8d 100644
--- a/runtime/themes/base16_terminal.toml
+++ b/runtime/themes/base16_terminal.toml
@@ -12,7 +12,7 @@
 "ui.statusline.inactive" = { fg = "gray", bg = "black" }
 "ui.help" = { fg = "white", bg = "black" }
 "ui.cursor" = { fg = "light-gray", modifiers = ["reversed"] }
-"ui.cursor.primary" = { modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "light-white", modifiers = ["reversed"] }
 "variable" = "light-red"
 "constant.numeric" = "yellow"
 "constant" = "yellow"
@@ -30,6 +30,15 @@
 "namespace" = "light-magenta"
 "ui.help" = { fg = "white", bg = "black" }
 
+"markup.heading" = "light-blue"
+"markup.list" = "light-red"
+"markup.bold" = { fg = "light-yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "light-magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "light-red"
+"markup.quote" = "light-cyan"
+"markup.raw" = "light-green"
+
 "diff.plus" = "light-green"
 "diff.delta" = "yellow"
 "diff.minus" = "light-red"
diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index 493e5ace..32b58d0a 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -28,6 +28,16 @@
 
 "module" = "#d32c5d"
 
+# TODO
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 "diff.plus" = "#59dcb7"
 "diff.delta" = "#dc7759"
 "diff.minus" = "#dc597f"
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index 78437649..ab7c16ec 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -39,6 +39,16 @@
 "constant.numeric" = { fg = "pale_green" }
 "constant.character.escape" = { fg = "gold" }
 
+# TODO
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 "diff.plus" = { fg = "pale_green" }
 "diff.delta" = { fg = "gold" }
 "diff.minus" = { fg = "red" }
diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index f5a0088c..a6389da2 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -34,6 +34,16 @@
 "module" = "blue"
 "special" = "orange"
 
+# TODO
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 "diff.plus" = "green"
 "diff.delta" = "orange"
 "diff.minus" = "red"
diff --git a/runtime/themes/everforest_light.toml b/runtime/themes/everforest_light.toml
index 3038ef9c..5490adb3 100644
--- a/runtime/themes/everforest_light.toml
+++ b/runtime/themes/everforest_light.toml
@@ -34,6 +34,16 @@
 "module" = "blue"
 "special" = "orange"
 
+# TODO
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 "diff.plus" = "green"
 "diff.delta" = "orange"
 "diff.minus" = "red"
diff --git a/runtime/themes/ingrid.toml b/runtime/themes/ingrid.toml
index df8a922f..a7c33e2d 100644
--- a/runtime/themes/ingrid.toml
+++ b/runtime/themes/ingrid.toml
@@ -28,6 +28,16 @@
 
 "module" = "#839A53"
 
+# TODO
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 "diff.plus" = "#839A53"
 "diff.delta" = "#D4A520"
 "diff.minus" = "#D74E50"
diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index c8bf8ebd..e6ff0a5e 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -39,6 +39,16 @@
 "constant.numeric" = { fg = "#ae81ff" }
 "constant.character.escape" = { fg = "#ae81ff" }
 
+# TODO
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 "diff.plus" = { fg = "#a6e22e" }
 "diff.delta" = { fg = "#fd971f" }
 "diff.minus" = { fg = "#f92672" }
diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index ae1ea29b..deb90452 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -84,6 +84,16 @@
 # nord15 - integer, floating point
 "constant.numeric" = "nord15"
 
+# TODO markup
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 # vcs
 "diff.plus" = "nord14"
 "diff.delta" = "nord12"
diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index dfeadbb2..acdaf99c 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -34,7 +34,7 @@
 "markup.list" = { fg = "red" }
 "markup.quote" = { fg = "yellow" }
 "markup.link.url" = { fg = "cyan", modifiers = ["underlined"]}
-"markup.link.label" = { fg = "purple" }
+"markup.link.text" = { fg = "purple" }
 
 "diff.plus" = "green"
 "diff.delta" = "gold"
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index bf3a040b..027cc5ed 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -55,7 +55,7 @@
 "markup.list" = { fg = "love" }
 "markup.quote" = { fg = "rose" }
 "markup.link.url" = { fg = "pine", modifiers = ["underlined"]}
-"markup.link.label" = { fg = "foam" }
+"markup.link.text" = { fg = "foam" }
 
 [palette]
 base     = "#191724" 
diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml
index cc6d287e..73b01844 100644
--- a/runtime/themes/rose_pine_dawn.toml
+++ b/runtime/themes/rose_pine_dawn.toml
@@ -55,7 +55,7 @@
 "markup.list" = { fg = "love" }
 "markup.quote" = { fg = "rose" }
 "markup.link.url" = { fg = "pine", modifiers = ["underlined"]}
-"markup.link.label" = { fg = "foam" }
+"markup.link.test" = { fg = "foam" }
 
 [palette]
 base     = "#faf4ed" 
diff --git a/runtime/themes/solarized_dark.toml b/runtime/themes/solarized_dark.toml
index ab345c8d..dfaa104a 100644
--- a/runtime/themes/solarized_dark.toml
+++ b/runtime/themes/solarized_dark.toml
@@ -22,6 +22,16 @@
 "module" = { fg = "violet" }
 "tag" = { fg = "magenta" }
 
+# TODO
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 "diff.plus" = { fg = "green" }
 "diff.delta" = { fg = "orange" }
 "diff.minus" = { fg = "red" }
diff --git a/runtime/themes/solarized_light.toml b/runtime/themes/solarized_light.toml
index 6b0137fb..c8a3dee1 100644
--- a/runtime/themes/solarized_light.toml
+++ b/runtime/themes/solarized_light.toml
@@ -22,6 +22,16 @@
 "module" = { fg = "violet" }
 "tag" = { fg = "magenta" }
 
+# TODO
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 "diff.plus" = { fg = "green" }
 "diff.delta" = { fg = "orange" }
 "diff.minus" = { fg = "red" }
diff --git a/runtime/themes/spacebones_light.toml b/runtime/themes/spacebones_light.toml
index fcbe7b37..5318dc2d 100644
--- a/runtime/themes/spacebones_light.toml
+++ b/runtime/themes/spacebones_light.toml
@@ -30,6 +30,16 @@
 "label" = "#b1951d"
 "module" = "#b1951d"
 
+# TODO
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
 "diff.plus" = "#2d9574"
 "diff.delta" = "#715ab1"
 "diff.minus" = "#ba2f59"
-- 
cgit v1.2.3-70-g09d2