diff --git a/runtime/themes/onelight.toml b/runtime/themes/onelight.toml
index c89e20f9..82121108 100644
--- a/runtime/themes/onelight.toml
+++ b/runtime/themes/onelight.toml
@@ -4,15 +4,15 @@
 "attribute" = { fg = "yellow" }
 "comment" = { fg = "gray", modifiers = ["italic"] }
 
-"constant" = { fg = "red" }
+"constant" = { fg = "cyan" }
 "constant.numeric" = { fg = "gold" }
 "constant.builtin" = { fg = "gold" }
 "constant.character.escape" = { fg = "gold" }
 
-"constructor" = { fg = "blue" }
+"constructor" = { fg = "yellow" }
 
-"function" = { fg = "light-blue" }
-"function.builtin" = { fg = "gray" }
+"function" = { fg = "blue" }
+"function.builtin" = { fg = "cyan" }
 "function.macro" = { fg = "red" }
 
 "keyword" = { fg = "purple" }
@@ -21,7 +21,7 @@
 "keyword.directive" = { fg = "purple" }
 "keyword.operator" = { fg = "purple" }
 
-"tag" = "yellow"
+"tag" = "cyan"
 "label" = { fg = "cyan" }
 "namespace" = { fg = "red" }
 "operator" = { fg = "red" }
@@ -31,15 +31,15 @@
 "module" = { fg = "cyan" }
 
 "type" = { fg = "yellow" }
-"type.builtin" = "blue"
+"type.builtin" = { fg = "purple" }
 
-"punctuation" = "gray"
-"punctuation.delimiter" = "black"
-# "punctuation.bracket" = "black"
+"punctuation" = { fg = "gray" }
+"punctuation.delimiter" = { fg = "black" }
+# "punctuation.bracket" = { fg="black" }
 
-# "variable" = { fg = "blue" }
+"variable" = { fg = "black" }
 "variable.builtin" = { fg = "light-blue" }
-"variable.parameter" = { fg = "blue" }
+"variable.parameter" = { fg = "red" }
 "variable.other.member" = { fg = "red" }
 
 "markup.heading" = { fg = "red" }
@@ -52,11 +52,11 @@
 "markup.link.url" = { fg = "cyan", modifiers = ["underlined"] }
 "markup.link.text" = { fg = "light-blue" }
 "markup.heading.1" = { fg = "red", modifiers = ["bold"] }
-"markup.heading.2" = { fg = "glod", modifiers = ["bold"] }
+"markup.heading.2" = { fg = "gold", modifiers = ["bold"] }
 "markup.heading.3" = { fg = "yellow", modifiers = ["bold"] }
 "markup.heading.4" = { fg = "green", modifiers = ["bold"] }
 "markup.heading.5" = { fg = "blue", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "black", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "purple", modifiers = ["bold"] }
 
 "diff.plus" = "green"
 "diff.delta" = "gold"
@@ -70,20 +70,24 @@
 
 "ui.background" = { bg = "white" }
 
-"ui.cursor" = { fg = "white", bg = "black" }
+"ui.cursor" = { fg = "white", bg = "gray" }
 "ui.cursor.primary" = { fg = "white", bg = "black" }
-"ui.cursor.match" = { fg = "white", bg = "purple" }
+"ui.cursor.match" = { bg = "light-gray" }
+
+"ui.cursorline.primary" = { fg = "white", bg = "grey-200" }
+"ui.cursorline.secondary" = { fg = "white", bg = "light-white" }
 
 "ui.highlight" = { bg = "light-white" }
 
-"ui.selection" = { bg = "light-white" }
-"ui.selection.primary" = { bg = "light-white", modifiers = ["dim"] }
+"ui.selection" = { modifiers = ["reversed"] }
+"ui.selection.primary" = { bg = "light-white" }
 
-"ui.virtual" = { fg = "light-white"}
+"ui.virtual" = { fg = "light-white" }
+"ui.virtual.indent-guide" = { fg = "grey-500" }
 "ui.virtual.ruler" = { bg = "light-white" }
-"ui.virtual.whitespace" = {fg = "light-white" }
+"ui.virtual.whitespace" = { fg = "light-white" }
 
-"ui.linenr" = { fg = "linenr" }
+"ui.linenr" = { fg = "grey-500" }
 "ui.linenr.selected" = { fg = "black", modifiers = ["reversed"] }
 
 "ui.statusline" = { fg = "black", bg = "light-white" }
@@ -93,22 +97,23 @@
 "ui.text.focus" = { fg = "red", bg = "light-white", modifiers = ["bold"] }
 
 "ui.help" = { fg = "black", bg = "light-white" }
-"ui.popup" = { bg = "light-white" }
-"ui.window" = { bg = "light-white" }
-"ui.menu" = { fg = "black", bg = "light-white" }
+"ui.popup" = { fg = "black", bg = "grey-200" }
+"ui.window" = { fg = "black", bg = "grey-200" }
+"ui.menu" = { fg = "black", bg = "grey-200" }
 "ui.menu.selected" = { fg = "white", bg = "light-blue" }
 
 [palette]
 white = "#FAFAFA"
 yellow = "#A06600"
-blue = "#5556FF"
-light-blue = "#2F77FA"
+blue = "#0061FF"
+light-blue = "#1877F2"
 red = "#DC003F"
 purple = "#B500A9"
 green = "#24A443"
-gold = "#D19A66"
+gold = "#D35400"
 cyan = "#0086C1"
 black = "#282C34"
-light-white = "#EAEAEB"
+light-white = "#E0E0E0"
 gray = "#5C6370"
-linenr = "#9D9D9F"
+grey-200 = "#EEEEEE"
+grey-500 = "#9E9E9E"