diff --git a/runtime/themes/serika-dark.toml b/runtime/themes/serika-dark.toml
index 10ceacd15..b86796db6 100644
--- a/runtime/themes/serika-dark.toml
+++ b/runtime/themes/serika-dark.toml
@@ -11,7 +11,7 @@
 "constant" = "purple"
 "number" = "purple"
 "string" = "fg"
-"comment" = "grey2"
+"comment" = { fg = "grey2", modifiers = [ "italic" ] }
 "variable" = "yellow"
 "variable.builtin" = "blue"
 "variable.parameter" = "yellow"
@@ -33,33 +33,49 @@
 "special" = "orange"
 
 "ui.background" = { bg = "bg0" }
-"ui.cursor" = { fg = "bg0", bg = "fg" }
-"ui.cursor.match" = { fg = "grey0", bg = "grey2" }
-"ui.cursor.insert" = { fg = "bg0", bg = "bg_yellow" }
-"ui.cursor.select" = { fg = "bg0", bg = "bg_yellow" }
-"ui.linenr" = "yellow"
-"ui.linenr.selected" = { fg = "fg", modifiers = ["bold", "underlined"] }
+"ui.background.separator" = { fg = "bg2" }
+"ui.bufferline" = { fg = "grey1" }
+"ui.bufferline.active" = { fg = "yellow" }
+"ui.bufferline.background" = { bg = "bg2" }
+"ui.cursor" = { fg = "fg", bg = "dark-red" }
+"ui.cursor.match" = { fg = "grey2", bg = "pale-yellow" }
+"ui.cursor.insert" = { fg = "bg0", bg = "pale-yellow" }
+"ui.cursor.select" = { fg = "bg0", bg = "bg-yellow" }
+"ui.cursor.primary" = { fg = "dark-red", bg = "fg" }
+"ui.cursor.primary.match" = { fg = "pale-yellow", bg = "grey2" }
+"ui.cursor.primary.insert" = { fg = "dark-red", bg = "bg-yellow" }
+"ui.cursor.primary.select" = { fg = "yellow", bg = "nasty-red" }
+"ui.linenr" = { fg = "yellow", modifiers = ["dim"] }
+"ui.linenr.selected" = { fg = "fg", modifiers = ["dim"], underline.style = "line" }
 "ui.cursorline" = { fg = "grey1", bg = "bg2" }
 "ui.statusline" = { fg = "grey1", bg = "bg2" }
-"ui.statusline.inactive" = { fg = "grey2", bg = "bg1" }
+"ui.statusline.inactive" = { fg = "bg5", bg = "bg1" }
+"ui.statusline.insert" = { fg = "blue" }
+"ui.statusline.select" = { fg = "pale-yellow" }
 "ui.popup" = { fg = "grey2", bg = "bg1" }
-"ui.window" = { fg = "grey2", bg = "bg1" }
+"ui.picker.header" = { fg = "bg2", underline.style = "dashed" }
+"ui.window" = { fg = "bg1", bg = "bg1" }
 "ui.help" = { fg = "fg", bg = "bg1" }
 "ui.text" = "fg"
 "ui.text.focus" = "yellow"
+"ui.text.inactive" = { fg = "fg", modifiers = [ "dim" ] }
+"ui.text.directory" = "grey0"
 "ui.menu" = { fg = "fg", bg = "bg2" }
-"ui.menu.selected" = { fg = "bg0", bg = "bg_yellow" }
-"ui.selection" = { bg = "bg3" }
-"ui.virtual.whitespace" = "bg2"
-"ui.virtual.ruler" = { bg = "grey2" } 
+"ui.menu.selected" = { fg = "bg0", bg = "bg-yellow" }
+"ui.selection" = { bg = "yellow", modifiers = [ "dim" ] }
+"ui.selection.prime" = { underline.style = "line" }
 "ui.virtual.inlay-hint" = { fg = "grey2", modifiers = ["italic"] }
 "ui.virtual.jump-label" = { fg = "nasty-red", modifiers = ["bold"] }
+"ui.virtual.ruler" = { bg = "bg1" } 
+"ui.virtual.whitespace" = { fg = "grey2", modifiers = [ "italic" ] }
+"ui.virtual.wrap" = { fg = "grey2", modifiers = [ "italic" ] }
 
 "hint" = "blue"
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "nasty-red"
 
+"diagnostic" = { underline = { style = "curl", color = "purple" } }
 "diagnostic.hint" = { underline = { style = "curl", color = "blue" } }
 "diagnostic.info" = { underline = { style = "curl", color = "aqua" } }
 "diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
@@ -89,22 +105,23 @@ bg2 = "#55585e"
 bg3 = "#61656b"
 bg4 = "#6d7278"
 bg5 = "#797e86"
-bg_visual = "#646669"
-bg_red = "#7e2a33"
-bg_green = "#86b365"
-bg_blue = "#6a89af"
-bg_yellow = "#e2b714"
+bg-visual = "#646669"
+bg-red = "#7e2a33"
+bg-green = "#86b365"
+bg-blue = "#6a89af"
+bg-yellow = "#e2b714"
 
 fg = "#d1d0c5"
-red = "#f9ebed"
+red = "#e29da7"
 nasty-red = "#ca4754"
 dark-red = "#7e2a33"
 orange = "#dd8a3c"
 yellow = "#e2b714"
-green = "#e5eae1"
+pale-yellow = "#f3e0a1"
+green = "#bcd5a8"
 aqua = "#b9c2c6"
-blue = "#bdcadb"
-purple = "#d0c4d4"
+blue = "#adc9db"
+purple = "#be9ec9"
 grey0 = "#aaaeb3"
 grey1 = "#e1e1e3"
 grey2 = "#646669"
diff --git a/runtime/themes/serika-light.toml b/runtime/themes/serika-light.toml
index 00fa84cbb..ccc7cebff 100644
--- a/runtime/themes/serika-light.toml
+++ b/runtime/themes/serika-light.toml
@@ -11,7 +11,7 @@
 "constant" = "purple"
 "number" = "purple"
 "string" = "fg"
-"comment" = "grey2"
+"comment" = { fg = "grey2", modifiers = [ "italic" ] }
 "variable" = "yellow"
 "variable.builtin" = "blue"
 "variable.parameter" = "yellow"
@@ -21,7 +21,7 @@
 "punctuation.delimiter" = "grey2"
 "punctuation.bracket" = "fg"
 "keyword" = "red"
-"operator" = "grey0"
+"operator" = "grey2"
 "function" = "green"
 "function.builtin" = "blue"
 "function.macro" = "aqua"
@@ -33,32 +33,49 @@
 "special" = "orange"
 
 "ui.background" = { bg = "bg0" }
-"ui.cursor" = { fg = "bg0", bg = "fg" }
-"ui.cursor.match" = { fg = "grey1", bg = "grey2" }
-"ui.cursor.insert" = { fg = "bg0", bg = "bg_yellow" }
-"ui.cursor.select" = { fg = "bg0", bg = "bg_yellow" }
-"ui.linenr" = "yellow"
-"ui.linenr.selected" = { fg = "fg", modifiers = ["bold", "underlined"] }
-"ui.cursorline" = { bg = "bg01" }
+"ui.background.separator" = { fg = "bg5" }
+"ui.bufferline" = { fg = "grey1" }
+"ui.bufferline.active" = { fg = "pale-yellow" }
+"ui.bufferline.background" = { bg = "bg5" }
+"ui.cursor" = { fg = "bg0", bg = "dark-red" }
+"ui.cursor.match" = { fg = "pale-yellow", bg = "bg5" }
+"ui.cursor.insert" = { fg = "fg", bg = "pale-yellow" }
+"ui.cursor.select" = { fg = "fg", bg = "bg-yellow" }
+"ui.cursor.primary" = { fg = "nasty-red", bg = "grey0" }
+"ui.cursor.primary.match" = { fg = "grey2", bg = "pale-yellow" }
+"ui.cursor.primary.insert" = { fg = "dark-red", bg = "yellow" }
+"ui.cursor.primary.select" = { fg = "yellow", bg = "dark-red" }
+"ui.linenr" = { fg = "yellow", modifiers = ["dim"] }
+"ui.linenr.selected" = { fg = "fg", modifiers = ["dim"], underline.style = "line" }
+"ui.cursorline" = { bg = "bg0", modifiers = ["dim"] }
 "ui.statusline" = { fg = "grey1", bg = "bg5" }
-"ui.statusline.inactive" = { fg = "grey2", bg = "bg1" }
+"ui.statusline.inactive" = { fg = "grey1", bg = "bg3" }
+"ui.statusline.insert" = { fg = "blue" }
+"ui.statusline.select" = { fg = "pale-yellow" }
 "ui.popup" = { fg = "bg0", bg = "bg5" }
-"ui.window" = { fg = "bg0", bg = "bg5" }
+"ui.picker.header" = { fg = "bg2", underline.style = "dashed" }
+"ui.window" = { fg = "bg5", bg = "bg5" }
 "ui.help" = { fg = "bg0", bg = "bg5" }
 "ui.text" = "fg"
 "ui.text.focus" = "yellow"
+"ui.text.inactive" = { fg = "fg", modifiers = [ "dim" ] }
+"ui.text.directory" = "grey2"
 "ui.menu" = { fg = "bg0", bg = "bg3" }
-"ui.menu.selected" = { fg = "bg0", bg = "bg_yellow" }
-"ui.selection" = { fg = "bg0", bg = "bg3" }
-"ui.virtual.whitespace" = { fg = "bg2" }
-"ui.virtual.ruler" = { bg = "bg01" }
+"ui.menu.selected" = { fg = "bg0", bg = "bg-yellow" }
+"ui.selection" = { bg = "grey0", modifiers = [ "dim" ] }
+"ui.selection.prime" = { underline.style = "line" }
 "ui.virtual.inlay-hint" = { fg = "grey2", modifiers = ["italic"] }
+"ui.virtual.jump-label" = { fg = "nasty-red", modifiers = ["bold"] }
+"ui.virtual.ruler" = { bg = "bg0", modifiers = ["dim"] }
+"ui.virtual.whitespace" = { fg = "grey2", modifiers = [ "italic" ] }
+"ui.virtual.wrap" = { fg = "grey2", modifiers = [ "italic" ] }
 
 "hint" = "blue"
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "nasty-red"
 
+"diagnostic" = { underline = { style = "curl", color = "purple" } }
 "diagnostic.hint" = { underline = { style = "curl", color = "blue" } }
 "diagnostic.info" = { underline = { style = "curl", color = "aqua" } }
 "diagnostic.warning" = { underline = { style = "curl", color = "yellow" } }
@@ -66,8 +83,8 @@
 "diagnostic.unnecessary" = { modifiers = ["dim"] }
 "diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
-"diff.plus" = { fg = "bg_green" }
-"diff.delta" = { fg = "bg_blue" }
+"diff.plus" = { fg = "bg-green" }
+"diff.delta" = { fg = "bg-blue" }
 "diff.minus" = { fg = "nasty-red" }
 
 "markup.heading" = { fg = "purple", modifiers = ["bold"] }
@@ -82,18 +99,17 @@
 
 [palette]
 
-bg0 = "#e1e1e3"
-bg01 = "#eaeaec"
+bg0 = "#d1d0c5"
 bg1 = "#494c50"
 bg2 = "#55585e"
 bg3 = "#61656b"
 bg4 = "#6d7278"
 bg5 = "#797e86"
-bg_visual = "#646669"
-bg_red = "#7e2a33"
-bg_green = "#86b365"
-bg_blue = "#6a89af"
-bg_yellow = "#e2b714"
+bg-visual = "#646669"
+bg-red = "#7e2a33"
+bg-green = "#86b365"
+bg-blue = "#6a89af"
+bg-yellow = "#e2b714"
 
 fg = "#323437"
 red = "#621d28"
@@ -101,10 +117,11 @@ nasty-red = "#da3333"
 dark-red = "#791717"
 orange = "#57320f"
 yellow = "#9a7d0e"
-green = "#3f4b34"
+pale-yellow = "#e2b714"
+green = "#3d5128"
 aqua = "#455054"
 blue = "#3f5673"
-purple = "#534059"
+purple = "#5a4066"
 grey0 = "#aaaeb3"
 grey1 = "#e1e1e3"
 grey2 = "#646669"