9 files changed, 59 insertions, 43 deletions
diff --git a/runtime/themes/base16_default_dark.toml b/runtime/themes/base16_default_dark.toml
index a5dc0852..d65995c0 100644
--- a/runtime/themes/base16_default_dark.toml
+++ b/runtime/themes/base16_default_dark.toml
@@ -16,14 +16,14 @@
 "operator" = "base05"
 "ui.text.focus" = { fg = "base05" }
 "variable" = "base08"
-"number" = "base09"
+"constant.numeric" = "base09"
 "constant" = "base09"
 "attributes" = "base09" 
 "type" = "base0A"
 "ui.cursor.match" = { fg = "base0A", modifiers = ["underlined"] }
 "strings"  = "base0B"
-"property" = "base0B"
-"escape" = "base0C"
+"variable.other.member" = "base0B"
+"constant.character.escape" = "base0C"
 "function" = "base0D"
 "constructor" = "base0D"
 "special" = "base0D"
diff --git a/runtime/themes/bogster.toml b/runtime/themes/bogster.toml
index 37b9adbf..86a6c34b 100644
--- a/runtime/themes/bogster.toml
+++ b/runtime/themes/bogster.toml
@@ -8,7 +8,7 @@
 "punctuation.delimiter" = "#dc7759"
 "operator" = { fg = "#dc7759", modifiers = ["bold"] }
 "special" = "#7fdc59"
-"property" = "#c6b8ad"
+"variable.other.member" = "#c6b8ad"
 "variable" = "#c6b8ad"
 "variable.parameter" = "#c6b8ad"
 "type" = "#dc597f"
@@ -22,8 +22,8 @@
 "constant" = "#59dcb7"
 "constant.builtin" = "#59dcb7"
 "string" = "#59dcb7"
-"number" = "#59c0dc"
-"escape" = { fg = "#7fdc59", modifiers = ["bold"] }
+"constant.numeric" = "#59c0dc"
+"constant.character.escape" = { fg = "#7fdc59", modifiers = ["bold"] }
 "label" = "#59c0dc"
 
 "module" = "#d32c5d"
diff --git a/runtime/themes/dark_plus.toml b/runtime/themes/dark_plus.toml
index c48a7e28..0554f827 100644
--- a/runtime/themes/dark_plus.toml
+++ b/runtime/themes/dark_plus.toml
@@ -7,7 +7,7 @@
 "type.builtin" = { fg = "type" }
 "type.enum.variant" = { fg = "constant" } 
 "constructor" = { fg = "constant" }
-"property" = { fg = "variable" }
+"variable.other.member" = { fg = "variable" }
 
 "keyword" = { fg = "keyword" }
 "keyword.directive" = { fg = "keyword" }
@@ -31,47 +31,64 @@
 "function.macro" = { fg = "keyword" }
 "attribute" = { fg = "fn_declaration" }
 
-"comment" = { fg = "#6A9955" }
+"comment" = { fg = "dark_green" }
 
-"string" = { fg = "#ce9178" }
-"string.regexp" = { fg = "regex" }
-"number" = { fg = "#b5cea8" }
-"escape" = { fg = "#d7ba7d" }
+"string" = { fg = "orange" }
+"constant.character" = { fg = "orange" }
+"string.regexp" = { fg = "gold" }
+"constant.numeric" = { fg = "pale_green" }
+"constant.character.escape" = { fg = "gold" }
 
-"ui.background" = { fg = "#d4d4d4", bg = "#1e1e1e" }
+"ui.background" = { fg = "light_gray", bg = "dark_gray2" }
 
 "ui.window" = { bg = "widget" }
 "ui.popup" = { bg = "widget" }
 "ui.help" = { bg = "widget" }
 "ui.menu.selected" = { bg = "widget" }
 
+# TODO: Alternate bg colour for `ui.cursor.match` and `ui.selection`.
 "ui.cursor" = { fg = "cursor", modifiers = ["reversed"] }
 "ui.cursor.primary" = { fg = "cursor", modifiers = ["reversed"] }
 "ui.cursor.match" = { bg = "#3a3d41", modifiers = ["underlined"] }
 
 "ui.selection" = { bg = "#3a3d41" }
-"ui.selection.primary" = { bg = "#264f78" }
+"ui.selection.primary" = { bg = "dark_blue" }
 
-"ui.linenr" = { fg = "#858585" }
-"ui.linenr.selected" = { fg = "#c6c6c6" }
+"ui.linenr" = { fg = "dark_gray" }
+"ui.linenr.selected" = { fg = "light_gray2" }
 
-"ui.statusline" = { fg = "#ffffff", bg = "#007acc" }
-"ui.statusline.inactive" = { fg = "#ffffff", bg = "#007acc" }
+"ui.statusline" = { fg = "white", bg = "blue" }
+"ui.statusline.inactive" = { fg = "white", bg = "blue" }
 
 "ui.text" = { fg = "text", bg = "background" }
-"ui.text.focus" = { fg = "#ffffff" }
+"ui.text.focus" = { fg = "white" }
 
-"warning" = { fg = "#cca700" }
-"error" = { fg = "#ff1212" }
-"info" = { fg = "#75beff" }
-"hint" = { fg = "#eeeeeeb3" }
+"warning" = { fg = "gold2" }
+"error" = { fg = "red" }
+"info" = { fg = "light_blue" }
+"hint" = { fg = "light_gray3" }
 
 diagnostic = { modifiers = ["underlined"] }
 
 [palette]
+white = "#ffffff"
+orange = "#ce9178"
+gold = "#d7ba7d"
+gold2 = "#cca700"
+pale_green = "#b5cea8"
+dark_green = "#6A9955"
+light_gray = "#d4d4d4"
+light_gray2 = "#c6c6c6"
+light_gray3 = "#eeeeee"
+dark_gray = "#858585"
+dark_gray2 = "#1e1e1e"
+blue = "#007acc"
+light_blue = "#75beff"
+dark_blue = "#264f78"
+red = "#ff1212"
+
 type = "#4EC9B0"
 keyword = "#569CD6"
-regex = "#CE9178"
 special = "#C586C0"
 variable = "#9CDCFE"
 fn_declaration = "#DCDCAA"
diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index 462c8265..bbd005e6 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -8,16 +8,16 @@
 # Email: sainnhe@gmail.com
 # License: MIT License
 
-"escape" = "orange"
+"constant.character.escape" = "orange"
 "type" = "yellow"
 "constant" = "purple"
-"number" = "purple"
+"constant.numeric" = "purple"
 "string" = "grey2"
 "comment" = "grey0"
 "variable" = "fg"
 "variable.builtin" = "blue"
 "variable.parameter" = "fg"
-"variable.property" = "fg"
+"variable.other.member" = "fg"
 "label" = "aqua"
 "punctuation" = "grey2"
 "punctuation.delimiter" = "grey2"
@@ -32,7 +32,6 @@
 "attribute" = "aqua"
 "constructor" = "yellow"
 "module" = "blue"
-"property" = "fg"
 "special" = "orange"
 
 "ui.background" = { bg = "bg0" }
diff --git a/runtime/themes/gruvbox.toml b/runtime/themes/gruvbox.toml
index 0a6eec07..0ff039ea 100644
--- a/runtime/themes/gruvbox.toml
+++ b/runtime/themes/gruvbox.toml
@@ -9,8 +9,7 @@
 "punctuation.delimiter" = "orange1"
 "operator" = "purple1"
 "special" = "purple0"
-"property" = "blue1"
-"variable.property" = "blue1"
+"variable.other.member" = "blue1"
 "variable" = "fg1"
 "variable.builtin" = "orange1"
 "variable.parameter" = "fg2"
@@ -24,8 +23,8 @@
 "constant" = { fg = "purple1" }
 "constant.builtin" = { fg = "purple1", modifiers = ["bold"] }
 "string" = "green1"
-"number" = "purple1"
-"escape" = { fg = "fg2", modifiers = ["bold"] }
+"constant.numeric" = "purple1"
+"constant.character.escape" = { fg = "fg2", modifiers = ["bold"] }
 "label" = "aqua1"
 "module" = "aqua1"
 
diff --git a/runtime/themes/ingrid.toml b/runtime/themes/ingrid.toml
index 6a177ec7..30829475 100644
--- a/runtime/themes/ingrid.toml
+++ b/runtime/themes/ingrid.toml
@@ -8,7 +8,7 @@
 "punctuation.delimiter" = "#C97270"
 "operator" = { fg = "#D74E50", modifiers = ["bold"] }
 "special" = "#D68482"
-"property" = "#89BEB7"
+"variable.other.member" = "#89BEB7"
 "variable" = "#A6B6CE"
 "variable.parameter" = "#89BEB7"
 "type" = { fg = "#A6B6CE", modifiers = ["bold"] }
@@ -22,8 +22,8 @@
 "constant" = "#D4A520"
 "constant.builtin" = "#D4A520"
 "string" = "#D74E50"
-"number" = "#D74E50"
-"escape" = { fg = "#D74E50", modifiers = ["bold"] }
+"constant.numeric" = "#D74E50"
+"constant.character.escape" = { fg = "#D74E50", modifiers = ["bold"] }
 "label" = "#D68482"
 
 "module" = "#839A53"
diff --git a/runtime/themes/monokai.toml b/runtime/themes/monokai.toml
index a8f03ff3..38f9f170 100644
--- a/runtime/themes/monokai.toml
+++ b/runtime/themes/monokai.toml
@@ -7,7 +7,7 @@
 "type.builtin" = { fg = "#66D9EF" }
 "type.enum.variant" = { fg = "text" } 
 "constructor" = { fg = "text" }
-"property" = { fg = "variable" }
+"variable.other.member" = { fg = "variable" }
 
 "keyword" = { fg = "keyword" }
 "keyword.directive" = { fg = "keyword" }
@@ -34,9 +34,10 @@
 "comment" = { fg = "#88846F" }
 
 "string" = { fg = "#e6db74" }
+"constant.character" = { fg = "#e6db74" }
 "string.regexp" = { fg = "regex" }
-"number" = { fg = "#ae81ff" }
-"escape" = { fg = "#ae81ff" }
+"constant.numeric" = { fg = "#ae81ff" }
+"constant.character.escape" = { fg = "#ae81ff" }
 
 "ui.background" = { fg = "text", bg = "background" }
 
diff --git a/runtime/themes/nord.toml b/runtime/themes/nord.toml
index 29f3875d..78736c3b 100644
--- a/runtime/themes/nord.toml
+++ b/runtime/themes/nord.toml
@@ -59,7 +59,7 @@
 # nord9 - operator, tags, units, punctuations
 "punctuation.delimiter" = "nord9"
 "operator" = { fg = "nord9" }
-"property" = "nord9"
+"variable.other.member" = "nord9"
 
 # nord10 - keywords, special
 "keyword" = { fg = "nord10" }
@@ -76,13 +76,13 @@
 
 # nord13 - warnings, escape characters, regex
 "warning" = "nord13"
-"escape" = { fg = "nord13" }
+"constant.character.escape" = { fg = "nord13" }
 
 # nord14 - strings
 "string" = "nord14"
 
 # nord15 - integer, floating point
-"number" = "nord15"
+"constant.numeric" = "nord15"
 
 [palette]
 nord0 = "#2e3440"
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index a982fd6e..53777008 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -16,14 +16,14 @@
 "operator" = "rose"
 "ui.text.focus" = { fg = "base05" }
 "variable" = "text"
-"number" = "iris"
+"constant.numeric" = "iris"
 "constant" = "gold"
 "attributes" = "gold" 
 "type" = "foam"
 "ui.cursor.match" = { fg = "gold", modifiers = ["underlined"] }
 "string"  = "gold"
 "property" = "foam"
-"escape" = "subtle"
+"constant.character.escape" = "subtle"
 "function" = "rose"
 "function.builtin" = "rose"
 "function.method"  = "foam"