3 files changed, 132 insertions, 140 deletions

diff --git a/runtime/themes/ayu_dark.toml b/runtime/themes/ayu_dark.toml
index 43fffee8..3b989f82 100644
--- a/runtime/themes/ayu_dark.toml
+++ b/runtime/themes/ayu_dark.toml
@@ -2,56 +2,56 @@
 # Based on the AYU theme colors from https://github.com/dempfi/ayu
 
 # Syntax highlighting
-"type" = { fg = "blue" }
-"type.builtin" = { fg = "blue" }
-"constructor" = { fg = "green" }
-"constant" = { fg = "magenta" }
-"string" = { fg = "green" }
-"string.regexp" = { fg = "orange" }
-"string.special" = { fg = "yellow" }
+"type" = "blue"
+"type.builtin" = "blue"
+"constructor" = "green"
+"constant" = "magenta"
+"string" = "green"
+"string.regexp" = "orange"
+"string.special" = "yellow"
 "comment" = { fg = "gray", modifiers = ["italic"] }
-"variable" = { fg = "foreground" }
-"variable.parameter" = { fg = "yellow" }
-"label" = { fg = "orange" }
-"punctuation" = { fg = "foreground" }
-"keyword" = { fg = "orange" }
-"keyword.control" = { fg = "yellow" }
-"keyword.directive" = { fg = "yellow" }
-"operator" = { fg = "orange" }
-"function" = { fg = "yellow", modifiers = ["bold"] }
-"tag" = { fg = "blue" }
-"namespace" = { fg = "blue" }
-"markup.heading" = { fg = "orange" }
-"markup.list" = { fg = "yellow" }
+"comment.block.documentation" = { fg = "blue", modifiers = ["italic"] }
+"variable" = "foreground"
+"label" = "orange"
+"punctuation" = "foreground"
+"keyword" = "orange"
+"keyword.control" = "yellow"
+"keyword.directive" = "yellow"
+"operator" = "orange"
+"function" = "yellow"
+"tag" = "blue"
+"namespace" = "blue"
+"markup.heading" = "orange"
+"markup.list" = "yellow"
 "markup.raw.block" = { bg = "gray", fg = "orange" }
-"markup.link.url" = { fg = "blue" }
-"markup.link.text" = { fg = "yellow" }
-"markup.link.label" = { fg = "green" }
-"markup.quote" = { fg = "yellow" }
-"diff.plus" = { fg = "green" }
-"diff.minus" = { fg = "red" }
-"diff.delta" = { fg = "green" }
+"markup.link.url" = "blue"
+"markup.link.text" = "yellow"
+"markup.link.label" = "green"
+"markup.quote" = "yellow"
+"diff.plus" =  "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { bg = "yellow", fg = "dark_gray" }
-"ui.cursor.match" = { fg = "orange" }
-"ui.linenr" = { fg = "dark_gray" }
-"ui.linenr.selected" = { fg = "orange" }
+"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor.match" = "orange"
+"ui.linenr" = "dark_gray"
+"ui.linenr.selected" = "gray"
 "ui.statusline" = { fg = "foreground", bg = "black" }
 "ui.cursorline" = { bg = "black" }
 "ui.popup" = { fg = "#7B91b3", bg = "black" }
-"ui.window" = { fg = "dark_gray" }
+"ui.window" = "dark_gray"
 "ui.help" = { fg = "#7B91b3", bg = "black" }
-"ui.text" = { fg = "foreground" }
+"ui.text" = "foreground"
 "ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
-"ui.text.info" = { fg = "foreground" }
-"ui.virtual.whitespace" = { fg = "dark_gray" }
+"ui.text.info" = "foreground"
+"ui.virtual.whitespace" = "dark_gray"
 "ui.virtual.ruler" = { bg = "black" }
 "ui.menu" = { fg = "foreground", bg = "black" }
-"ui.menu.selected" = { bg = "orange", fg = "background" }
+"ui.menu.selected" = { bg = "gray", fg = "background" }
 "ui.selection" = { bg = "dark_gray" }
-"warning" = { fg = "yellow" }
+"warning" = "yellow"
 "error" = { fg = "red", modifiers = ["bold"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "blue", modifiers = ["bold"] }
@@ -62,7 +62,7 @@
 "ui.bufferline" = { fg = "gray", bg = "background" }
 "ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
-"special" = { fg = "orange" }
+"special" = "orange"
 
 [palette]
 background = "#0f1419"
diff --git a/runtime/themes/ayu_light.toml b/runtime/themes/ayu_light.toml
index 80943613..6a801951 100644
--- a/runtime/themes/ayu_light.toml
+++ b/runtime/themes/ayu_light.toml
@@ -2,55 +2,56 @@
 # Based on the AYU theme colors from https://github.com/dempfi/ayu
 
 # Syntax highlighting
-"type" = { fg = "blue" }
-"type.builtin" = { fg = "blue" }
-"constructor" = { fg = "green" }
-"constant" = { fg = "magenta" }
-"string" = { fg = "green" }
-"string.regexp" = { fg = "orange" }
-"string.special" = { fg = "yellow" }
+"type" = "blue"
+"type.builtin" = "blue"
+"constructor" = "green"
+"constant" = "magenta"
+"string" = "green"
+"string.regexp" = "orange"
+"string.special" = "yellow"
 "comment" = { fg = "gray", modifiers = ["italic"] }
-"variable" = { fg = "foreground" }
-"variable.parameter" = { fg = "yellow" }
-"label" = { fg = "orange" }
-"punctuation" = { fg = "foreground" }
-"keyword" = { fg = "orange" }
-"keyword.control" = { fg = "yellow" }
-"keyword.directive" = { fg = "yellow" }
-"operator" = { fg = "orange" }
-"function" = { fg = "yellow", modifiers = ["bold"] }
-"tag" = { fg = "blue" }
-"namespace" = { fg = "blue" }
-"markup.heading" = { fg = "orange" }
-"markup.list" = { fg = "yellow" }
+"comment.block.documentation" = { fg = "blue", modifiers = ["italic"] }
+"variable" = "foreground"
+"label" = "orange"
+"punctuation" = "foreground"
+"keyword" = "orange"
+"keyword.control" = "yellow"
+"keyword.directive" = "yellow"
+"operator" = "orange"
+"function" = "yellow"
+"tag" = "blue"
+"namespace" = "blue"
+"markup.heading" = "orange"
+"markup.list" = "yellow"
 "markup.raw.block" = { bg = "gray", fg = "orange" }
-"markup.link.url" = { fg = "blue" }
-"markup.link.text" = { fg = "yellow" }
-"markup.link.label" = { fg = "green" }
-"markup.quote" = { fg = "yellow" }
-"diff.plus" = { fg = "green" }
-"diff.minus" = { fg = "red" }
-"diff.delta" = { fg = "green" }
+"markup.link.url" = "blue"
+"markup.link.text" = "yellow"
+"markup.link.label" = "green"
+"markup.quote" = "yellow"
+"diff.plus" =  "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { bg = "yellow", fg = "light_gray" }
-"ui.cursor.match" = { fg = "orange" }
-"ui.linenr" = { fg = "light_gray" }
-"ui.linenr.selected" = { fg = "orange" }
+"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor.match" = "orange"
+"ui.linenr" = "dark_gray"
+"ui.linenr.selected" = "gray"
+"ui.statusline" = { fg = "foreground", bg = "black" }
 "ui.cursorline" = { bg = "black" }
-"ui.popup" = { bg = "black" }
-"ui.window" = { fg = "light_gray" }
-"ui.help" = { fg  = "foreground", bg = "black" }
-"ui.text" = { fg = "foreground" }
-"ui.text.focus" = { bg = "light_gray", fg = "foreground" }
-"ui.text.info" = { fg = "foreground" }
-"ui.virtual.whitespace" = { fg = "light_gray" }
+"ui.popup" = { fg = "#7B91b3", bg = "black" }
+"ui.window" = "dark_gray"
+"ui.help" = { fg = "#7B91b3", bg = "black" }
+"ui.text" = "foreground"
+"ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
+"ui.text.info" = "foreground"
+"ui.virtual.whitespace" = "dark_gray"
 "ui.virtual.ruler" = { bg = "black" }
 "ui.menu" = { fg = "foreground", bg = "black" }
-"ui.menu.selected" = { bg = "orange", fg = "background" }
-"ui.selection" = { bg = "light_gray" }
-"warning" = { fg = "yellow" }
+"ui.menu.selected" = { bg = "gray", fg = "background" }
+"ui.selection" = { bg = "dark_gray" }
+"warning" = "yellow"
 "error" = { fg = "red", modifiers = ["bold"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "blue", modifiers = ["bold"] }
@@ -58,30 +59,22 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
-"ui.bufferline" = { fg = "ui_foreground", bg = "ui_background" }
-"ui.bufferline.active" = { fg = "ui_background", bg = "ui_foreground" }
-"ui.statusline" = { fg = "ui_foreground", bg = "ui_background" }
-"ui.statusline.inactive" = { fg = "ui_foreground", bg = "ui_background" }
-"ui.statusline.normal" = { fg = "white", bg = "light_blue" }
-"ui.statusline.insert" = { fg = "white", bg = "orange" }
-"ui.statusline.select" = { fg = "white", bg = "magenta" }
+"ui.bufferline" = { fg = "gray", bg = "background" }
+"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
-"special" = { fg = "orange" }
+"special" = "orange"
 
 [palette]
-background = "#fcfcfc"
+background = "#fafafa"
 foreground = "#5c6166"
 
-ui_foreground = "#8a9199"
-ui_background = "#f8f9fa"
-
 black = "#e7eaed"
 white = "#fcfcfc"
 blue = "#399ee6"
 light_blue = "#55b4d4"
 cyan = "#478acc"
-light_gray = "#e7eaed"
-gray = "#787b8099"
+dark_gray = "#d8d8d7"
+gray = "#828c9a"
 green = "#86b300"
 magenta = "#a37acc"
 orange = "#fa8d3e"
diff --git a/runtime/themes/ayu_mirage.toml b/runtime/themes/ayu_mirage.toml
index e01866a9..b1abd9a3 100644
--- a/runtime/themes/ayu_mirage.toml
+++ b/runtime/themes/ayu_mirage.toml
@@ -2,57 +2,56 @@
 # Based on the AYU theme colors from https://github.com/dempfi/ayu
 
 # Syntax highlighting
-"type" = { fg = "blue" }
-"type.builtin" = { fg = "blue" }
-"constructor" = { fg = "green" }
-"constant" = { fg = "magenta" }
-"string" = { fg = "green" }
-"string.regexp" = { fg = "orange" }
-"string.special" = { fg = "yellow" }
+"type" = "blue"
+"type.builtin" = "blue"
+"constructor" = "green"
+"constant" = "magenta"
+"string" = "green"
+"string.regexp" = "orange"
+"string.special" = "yellow"
 "comment" = { fg = "gray", modifiers = ["italic"] }
-"variable" = { fg = "foreground" }
-"variable.parameter" = { fg = "yellow" }
-"label" = { fg = "orange" }
-"punctuation" = { fg = "foreground" }
-"keyword" = { fg = "orange" }
-"keyword.control" = { fg = "yellow" }
-"keyword.directive" = { fg = "yellow" }
-"operator" = { fg = "orange" }
-"function" = { fg = "yellow", modifiers = ["bold"] }
-"tag" = { fg = "blue" }
-"namespace" = { fg = "blue" }
-"markup.heading" = { fg = "orange" }
-"markup.list" = { fg = "yellow" }
+"comment.block.documentation" = { fg = "blue", modifiers = ["italic"] }
+"variable" = "foreground"
+"label" = "orange"
+"punctuation" = "foreground"
+"keyword" = "orange"
+"keyword.control" = "yellow"
+"keyword.directive" = "yellow"
+"operator" = "orange"
+"function" = "yellow"
+"tag" = "blue"
+"namespace" = "blue"
+"markup.heading" = "orange"
+"markup.list" = "yellow"
 "markup.raw.block" = { bg = "gray", fg = "orange" }
-"markup.link.url" = { fg = "blue" }
-"markup.link.text" = { fg = "yellow" }
-"markup.link.label" = { fg = "green" }
-"markup.quote" = { fg = "yellow" }
-"diff.plus" = { fg = "green" }
-"diff.minus" = { fg = "red" }
-"diff.delta" = { fg = "green" }
+"markup.link.url" = "blue"
+"markup.link.text" = "yellow"
+"markup.link.label" = "green"
+"markup.quote" = "yellow"
+"diff.plus" =  "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
 
 # Interface
 "ui.background"= { bg = "background" }
-"ui.cursor" = { bg = "green", fg = "dark_gray" }
-"ui.cursor.primary" = { bg = "orange", fg = "dark_gray" }
-"ui.cursor.match" = { fg = "orange" }
-"ui.linenr" = { fg = "dark_gray" }
-"ui.linenr.selected" = { fg = "orange" }
-"ui.cursorline" = { bg = "black" }
+"ui.cursor" = { modifiers = ["reversed"] }
+"ui.cursor.match" = "orange"
+"ui.linenr" = "dark_gray"
+"ui.linenr.selected" = "gray"
 "ui.statusline" = { fg = "foreground", bg = "black" }
-"ui.popup" = { bg = "black" }
-"ui.window" = { fg = "dark_gray" }
-"ui.help" = { fg = "foreground", bg = "black" }
-"ui.text" = { fg = "foreground" }
+"ui.cursorline" = { bg = "black" }
+"ui.popup" = { fg = "#7B91b3", bg = "black" }
+"ui.window" = "dark_gray"
+"ui.help" = { fg = "#7B91b3", bg = "black" }
+"ui.text" = "foreground"
 "ui.text.focus" = { bg = "dark_gray", fg = "foreground" }
-"ui.text.info" = { fg = "foreground" }
-"ui.virtual.whitespace" = { fg = "dark_gray" }
+"ui.text.info" = "foreground"
+"ui.virtual.whitespace" = "dark_gray"
 "ui.virtual.ruler" = { bg = "black" }
 "ui.menu" = { fg = "foreground", bg = "black" }
-"ui.menu.selected" = { bg = "orange", fg = "background" }
+"ui.menu.selected" = { bg = "gray", fg = "background" }
 "ui.selection" = { bg = "dark_gray" }
-"warning" = { fg = "yellow" }
+"warning" = "yellow"
 "error" = { fg = "red", modifiers = ["bold"] }
 "info" = { fg = "blue", modifiers = ["bold"] }
 "hint" = { fg = "blue", modifiers = ["bold"] }
@@ -60,19 +59,19 @@
 "diagnostic.info"= { fg = "blue", modifiers = ["underlined"] }
 "diagnostic.warning"= { fg = "yellow", modifiers = ["underlined"] }
 "diagnostic.error"= { fg = "red", modifiers = ["underlined"] }
-"ui.bufferline" = { fg = "gray", bg = "black" }
-"ui.bufferline.active" = { fg = "foreground", bg = "background" }
+"ui.bufferline" = { fg = "gray", bg = "background" }
+"ui.bufferline.active" = { fg = "foreground", bg = "dark_gray" }
 
-"special" = { fg = "orange" }
+"special" = "orange"
 
 [palette]
-background = "#242936"
+background = "#1f2430"
 foreground = "#cccac2"
 
 black = "#1a1f29"
 blue = "#73d0ff"
-dark_gray = "#8a919959"
-cyan = "#80bfff"
+dark_gray = "#323843"
+cyan = "#444b55"
 gray = "#565b66"
 green = "#d5ff80"
 magenta = "#dfbfff"