4 files changed, 18 insertions, 10 deletions
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"