diff --git a/runtime/themes/catppuccin.toml b/runtime/themes/catppuccin.toml
deleted file mode 100644
index 0f43d33d9..000000000
--- a/runtime/themes/catppuccin.toml
+++ /dev/null
@@ -1,93 +0,0 @@
-attribute = "blue"
-keyword = "blue"
-"keyword.directive" = "red" # -- preprocessor comments (#if in C)
-namespace = "peach"
-punctuation = "white"
-"punctuation.delimiter" = "blue"
-operator = "blue"
-special = "peach"
-"variable.other.member" = "green"
-variable = "peach"
-"variable.parameter" = { fg = "pink" }
-"variable.builtin" = "green"
-type = "blue"
-"type.builtin" = "white"
-constructor = "blue"
-function = "red"
-"function.macro" = "blue"
-"function.builtin" = "blue"
-tag = "peach"
-comment = "gray_1"
-constant = "white"
-"constant.builtin" = "green"
-string = "green"
-"constant.numeric" = "blue"
-"constant.character.escape" = "peach"
-# used for lifetimes
-label = "peach"
-
-"markup.heading" = "mauve"
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.link.url" = { fg = "gray_2", modifiers = ["underlined"] }
-"markup.link.text" = "peach"
-"markup.raw" = "peach"
-
-"diff.plus" = "#35bf86"
-"diff.minus" = "#f22c86"
-"diff.delta" = "#6F44F0"
-
-"ui.background" = { bg = "black_2" }
-"ui.linenr" = { fg = "gray_0" }
-"ui.linenr.selected" = { fg = "mauve" }
-"ui.statusline" = { fg = "black_2", bg = "blue" }
-"ui.statusline.inactive" = { fg = "pink", bg = "gray_1" }
-"ui.popup" = { bg = "black_1" }
-"ui.window" = { fg = "maroon" }
-"ui.help" = { bg = "#7958DC", fg = "#171452" }
-
-"ui.text" = { fg = "pink" }
-"ui.text.focus" = { fg = "white" }
-"ui.virtual.whitespace" = { fg = "gray_0" }
-
-"ui.selection" = { bg = "#540099" }
-"ui.selection.primary" = { bg = "#540099" }
-"ui.cursor.select" = { bg = "lavender" }
-"ui.cursor.insert" = { bg = "white" }
-"ui.cursor.match" = { fg = "#212121", bg = "#6C6999" }
-"ui.cursor" = { modifiers = ["reversed"] }
-"ui.highlight" = { bg = "maroon" }
-
-"ui.menu.selected" = { fg = "gray_1", bg = "white" }
-
-diagnostic = { modifiers = ["underlined"] }
-
-warning = "peach"
-error = "maroon"
-info = "blue"
-hint = "lavender"
-
-[palette]
-flamingo = "#F2CDCD"
-mauve = "#DDB6F2"
-pink = "#F5C2E7"
-maroon = "#E8A2AF"
-red = "#F28FAD"
-peach = "#F8BD96"
-yellow = "#FAE3B0"
-green = "#ABE9B3"
-teal = "#B5E8E0"
-blue = "#96CDFB"
-sky = "#89DCEB"
-
-black_0 = "#161320"
-black_1 = "#1A1826"
-black_2 = "#1E1E2E"
-black_3 = "#302D41"
-black_4 = "#575268"
-gray_0 = "#6E6C7E"
-gray_1 = "#988BA2"
-gray_2 = "#C3BAC6"
-white = "#D9E0EE"
-lavender = "#C9CBFF"
-rosewater = "#F5E0DC"
diff --git a/runtime/themes/catppuccin_frappe.toml b/runtime/themes/catppuccin_frappe.toml
new file mode 100644
index 000000000..e7db8b161
--- /dev/null
+++ b/runtime/themes/catppuccin_frappe.toml
@@ -0,0 +1,137 @@
+# Syntax highlighting
+# -------------------
+"type" = "yellow"
+"type.enum.variant" = "peach"
+
+"constructor" = "sapphire"
+
+"constant" = "peach"
+"constant.character" = "teal"
+"constant.character.escape" = "pink"
+
+"string" = "green"
+"string.regexp" = "peach"
+"string.special" = "pink"
+
+"comment" = { fg = "overlay1", modifiers = ["italic"] }
+
+"variable" = "text"
+"variable.parameter" = { fg = "maroon", modifiers = ["italic"] }
+"variable.builtin" = "red"
+"variable.other.member" = "teal"
+
+"label" = "sapphire" # used for lifetimes
+
+"punctuation" = "overlay2"
+
+"keyword" = "mauve"
+"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] }
+
+"operator" = "sky"
+
+"function" = "blue"
+"function.builtin" = "peach"
+"function.macro" = "teal"
+
+"tag" = "mauve"
+
+"namespace" = { fg = "blue", modifiers = ["italic"] }
+
+"special" = "blue" # fuzzy highlight
+
+"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] }
+"markup.heading.1" = "lavender"
+"markup.heading.2" = "mauve"
+"markup.heading.3" = "green"
+"markup.heading.4" = "yellow"
+"markup.heading.5" = "pink"
+"markup.heading.6" = "teal"
+"markup.list" = "mauve"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { fg = "peach", modifiers = ["underlined"] }
+"markup.link.text" = "blue"
+"markup.raw" = "flamingo"
+
+"diff.plus" = "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
+
+# User Interface
+# --------------
+"ui.background" = { fg = "text", bg = "base" }
+
+"ui.linenr" = { fg = "surface1" }
+"ui.linenr.selected" = { fg = "lavender" }
+
+"ui.statusline" = { fg = "overlay1", bg = "surface0" }
+"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" }
+"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
+"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
+
+"ui.popup" = { fg = "text", bg = "surface0" }
+"ui.window" = { fg = "crust" }
+"ui.help" = { fg = "overlay2", bg = "surface0" }
+
+"ui.text" = "text" 
+"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
+
+"ui.virtual" = "overlay0"
+"ui.virtual.ruler" = { bg = "surface0" }
+"ui.virtual.indent-guide" = "surface0"
+
+"ui.selection" = { bg = "surface1" }
+
+"ui.cursor" = { fg = "base", bg = "secondary_cursor" }
+"ui.cursor.primary" = { fg = "base", bg = "rosewater" }
+"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
+
+"ui.cursorline.primary" = { bg = "cursorline" }
+
+"ui.highlight" = { bg = "surface1" }
+
+"ui.menu" = { fg = "overlay2", bg = "surface0" }
+"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] }
+
+diagnostic = { modifiers = ["underlined"] }
+
+error = "red"
+warning = "yellow"
+info = "sky"
+hint = "teal"
+
+[palette]
+# catppuccin palette colors
+rosewater = "#f2d5cf"
+flamingo = "#eebebe"
+pink = "#f4b8e4"
+mauve = "#ca9ee6"
+red = "#e78284"
+maroon = "#ea999c"
+peach = "#ef9f76"
+yellow = "#e5c890"
+green = "#a6d189"
+teal = "#81c8be"
+sky = "#99d1db"
+sapphire = "#85c1dc"
+blue = "#8caaee"
+lavender = "#babbf1"
+
+text = "#c6d0f5"
+subtext1 = "#b5bfe2"
+subtext0 = "#a5adce"
+overlay2 = "#949cbb"
+overlay1 = "#838ba7"
+overlay0 = "#737994"
+surface2 = "#626880"
+surface1 = "#51576d"
+surface0 = "#414559"
+
+base = "#303446"
+mantle = "#292c3c"
+crust = "#232634"
+
+# derived colors by blending existing palette colors
+cursorline = "#3b3f52"
+secondary_cursor = "#b8a5a6"
\ No newline at end of file
diff --git a/runtime/themes/catppuccin_latte.toml b/runtime/themes/catppuccin_latte.toml
new file mode 100644
index 000000000..4cd8b3c12
--- /dev/null
+++ b/runtime/themes/catppuccin_latte.toml
@@ -0,0 +1,137 @@
+# Syntax highlighting
+# -------------------
+"type" = "yellow"
+"type.enum.variant" = "peach"
+
+"constructor" = "sapphire"
+
+"constant" = "peach"
+"constant.character" = "teal"
+"constant.character.escape" = "pink"
+
+"string" = "green"
+"string.regexp" = "peach"
+"string.special" = "pink"
+
+"comment" = { fg = "overlay1", modifiers = ["italic"] }
+
+"variable" = "text"
+"variable.parameter" = { fg = "maroon", modifiers = ["italic"] }
+"variable.builtin" = "red"
+"variable.other.member" = "teal"
+
+"label" = "sapphire" # used for lifetimes
+
+"punctuation" = "overlay2"
+
+"keyword" = "mauve"
+"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] }
+
+"operator" = "sky"
+
+"function" = "blue"
+"function.builtin" = "peach"
+"function.macro" = "teal"
+
+"tag" = "mauve"
+
+"namespace" = { fg = "blue", modifiers = ["italic"] }
+
+"special" = "blue" # fuzzy highlight
+
+"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] }
+"markup.heading.1" = "lavender"
+"markup.heading.2" = "mauve"
+"markup.heading.3" = "green"
+"markup.heading.4" = "yellow"
+"markup.heading.5" = "pink"
+"markup.heading.6" = "teal"
+"markup.list" = "mauve"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { fg = "peach", modifiers = ["underlined"] }
+"markup.link.text" = "blue"
+"markup.raw" = "flamingo"
+
+"diff.plus" = "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
+
+# User Interface
+# --------------
+"ui.background" = { fg = "text", bg = "base" }
+
+"ui.linenr" = { fg = "surface1" }
+"ui.linenr.selected" = { fg = "lavender" }
+
+"ui.statusline" = { fg = "overlay1", bg = "surface0" }
+"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" }
+"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
+"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
+
+"ui.popup" = { fg = "text", bg = "surface0" }
+"ui.window" = { fg = "crust" }
+"ui.help" = { fg = "overlay2", bg = "surface0" }
+
+"ui.text" = "text" 
+"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
+
+"ui.virtual" = "overlay0"
+"ui.virtual.ruler" = { bg = "surface0" }
+"ui.virtual.indent-guide" = "surface0"
+
+"ui.selection" = { bg = "surface1" }
+
+"ui.cursor" = { fg = "base", bg = "secondary_cursor" }
+"ui.cursor.primary" = { fg = "base", bg = "rosewater" }
+"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
+
+"ui.cursorline.primary" = { bg = "cursorline" }
+
+"ui.highlight" = { bg = "surface1" }
+
+"ui.menu" = { fg = "overlay2", bg = "surface0" }
+"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] }
+
+diagnostic = { modifiers = ["underlined"] }
+
+error = "red"
+warning = "yellow"
+info = "sky"
+hint = "teal"
+
+[palette]
+# catppuccin palette colors
+rosewater = "#dc8a78"
+flamingo = "#dd7878"
+pink = "#ea76cb"
+mauve = "#8839ef"
+red = "#d20f39"
+maroon = "#e64553"
+peach = "#fe640b"
+yellow = "#df8e1d"
+green = "#40a02b"
+teal = "#179299"
+sky = "#04a5e5"
+sapphire = "#209fb5"
+blue = "#1e66f5"
+lavender = "#7287fd"
+
+text = "#4c4f69"
+subtext1 = "#5c5f77"
+subtext0 = "#6c6f85"
+overlay2 = "#7c7f93"
+overlay1 = "#8c8fa1"
+overlay0 = "#9ca0b0"
+surface2 = "#acb0be"
+surface1 = "#bcc0cc"
+surface0 = "#ccd0da"
+
+base = "#eff1f5"
+mantle = "#e6e9ef"
+crust = "#dce0e8"
+
+# derived colors by blending existing palette colors
+cursorline = "#e9ebf1"
+secondary_cursor = "#e2a99e"
\ No newline at end of file
diff --git a/runtime/themes/catppuccin_macchiato.toml b/runtime/themes/catppuccin_macchiato.toml
new file mode 100644
index 000000000..da589101f
--- /dev/null
+++ b/runtime/themes/catppuccin_macchiato.toml
@@ -0,0 +1,137 @@
+# Syntax highlighting
+# -------------------
+"type" = "yellow"
+"type.enum.variant" = "peach"
+
+"constructor" = "sapphire"
+
+"constant" = "peach"
+"constant.character" = "teal"
+"constant.character.escape" = "pink"
+
+"string" = "green"
+"string.regexp" = "peach"
+"string.special" = "pink"
+
+"comment" = { fg = "overlay1", modifiers = ["italic"] }
+
+"variable" = "text"
+"variable.parameter" = { fg = "maroon", modifiers = ["italic"] }
+"variable.builtin" = "red"
+"variable.other.member" = "teal"
+
+"label" = "sapphire" # used for lifetimes
+
+"punctuation" = "overlay2"
+
+"keyword" = "mauve"
+"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] }
+
+"operator" = "sky"
+
+"function" = "blue"
+"function.builtin" = "peach"
+"function.macro" = "teal"
+
+"tag" = "mauve"
+
+"namespace" = { fg = "blue", modifiers = ["italic"] }
+
+"special" = "blue" # fuzzy highlight
+
+"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] }
+"markup.heading.1" = "lavender"
+"markup.heading.2" = "mauve"
+"markup.heading.3" = "green"
+"markup.heading.4" = "yellow"
+"markup.heading.5" = "pink"
+"markup.heading.6" = "teal"
+"markup.list" = "mauve"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { fg = "peach", modifiers = ["underlined"] }
+"markup.link.text" = "blue"
+"markup.raw" = "flamingo"
+
+"diff.plus" = "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
+
+# User Interface
+# --------------
+"ui.background" = { fg = "text", bg = "base" }
+
+"ui.linenr" = { fg = "surface1" }
+"ui.linenr.selected" = { fg = "lavender" }
+
+"ui.statusline" = { fg = "overlay1", bg = "surface0" }
+"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" }
+"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
+"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
+
+"ui.popup" = { fg = "text", bg = "surface0" }
+"ui.window" = { fg = "crust" }
+"ui.help" = { fg = "overlay2", bg = "surface0" }
+
+"ui.text" = "text" 
+"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
+
+"ui.virtual" = "overlay0"
+"ui.virtual.ruler" = { bg = "surface0" }
+"ui.virtual.indent-guide" = "surface0"
+
+"ui.selection" = { bg = "surface1" }
+
+"ui.cursor" = { fg = "base", bg = "secondary_cursor" }
+"ui.cursor.primary" = { fg = "base", bg = "rosewater" }
+"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
+
+"ui.cursorline.primary" = { bg = "cursorline" }
+
+"ui.highlight" = { bg = "surface1" }
+
+"ui.menu" = { fg = "overlay2", bg = "surface0" }
+"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] }
+
+diagnostic = { modifiers = ["underlined"] }
+
+error = "red"
+warning = "yellow"
+info = "sky"
+hint = "teal"
+
+[palette]
+# catppuccin palette colors
+rosewater = "#f4dbd6"
+flamingo = "#f0c6c6"
+pink = "#f5bde6"
+mauve = "#c6a0f6"
+red = "#ed8796"
+maroon = "#ee99a0"
+peach = "#f5a97f"
+yellow = "#eed49f"
+green = "#a6da95"
+teal = "#8bd5ca"
+sky = "#91d7e3"
+sapphire = "#7dc4e4"
+blue = "#8aadf4"
+lavender = "#b7bdf8"
+
+text = "#cad3f5"
+subtext1 = "#b8c0e0"
+subtext0 = "#a5adcb"
+overlay2 = "#939ab7"
+overlay1 = "#8087a2"
+overlay0 = "#6e738d"
+surface2 = "#5b6078"
+surface1 = "#494d64"
+surface0 = "#363a4f"
+
+base = "#24273a"
+mantle = "#1e2030"
+crust = "#181926"
+
+# derived colors by blending existing palette colors
+cursorline = "#303347"
+secondary_cursor = "#b6a5a7"
\ No newline at end of file
diff --git a/runtime/themes/catppuccin_mocha.toml b/runtime/themes/catppuccin_mocha.toml
new file mode 100644
index 000000000..279859b22
--- /dev/null
+++ b/runtime/themes/catppuccin_mocha.toml
@@ -0,0 +1,137 @@
+# Syntax highlighting
+# -------------------
+"type" = "yellow"
+"type.enum.variant" = "peach"
+
+"constructor" = "sapphire"
+
+"constant" = "peach"
+"constant.character" = "teal"
+"constant.character.escape" = "pink"
+
+"string" = "green"
+"string.regexp" = "peach"
+"string.special" = "pink"
+
+"comment" = { fg = "overlay1", modifiers = ["italic"] }
+
+"variable" = "text"
+"variable.parameter" = { fg = "maroon", modifiers = ["italic"] }
+"variable.builtin" = "red"
+"variable.other.member" = "teal"
+
+"label" = "sapphire" # used for lifetimes
+
+"punctuation" = "overlay2"
+
+"keyword" = "mauve"
+"keyword.control.conditional" = { fg = "mauve", modifiers = ["italic"] }
+
+"operator" = "sky"
+
+"function" = "blue"
+"function.builtin" = "peach"
+"function.macro" = "teal"
+
+"tag" = "mauve"
+
+"namespace" = { fg = "blue", modifiers = ["italic"] }
+
+"special" = "blue" # fuzzy highlight
+
+"markup.heading.marker" = { fg = "peach", modifiers = ["bold"] }
+"markup.heading.1" = "lavender"
+"markup.heading.2" = "mauve"
+"markup.heading.3" = "green"
+"markup.heading.4" = "yellow"
+"markup.heading.5" = "pink"
+"markup.heading.6" = "teal"
+"markup.list" = "mauve"
+"markup.bold" = { modifiers = ["bold"] }
+"markup.italic" = { modifiers = ["italic"] }
+"markup.link.url" = { fg = "peach", modifiers = ["underlined"] }
+"markup.link.text" = "blue"
+"markup.raw" = "flamingo"
+
+"diff.plus" = "green"
+"diff.minus" = "red"
+"diff.delta" = "yellow"
+
+# User Interface
+# --------------
+"ui.background" = { fg = "text", bg = "base" }
+
+"ui.linenr" = { fg = "surface1" }
+"ui.linenr.selected" = { fg = "lavender" }
+
+"ui.statusline" = { fg = "overlay1", bg = "surface0" }
+"ui.statusline.inactive" = { fg = "overlay1", bg = "mantle" }
+"ui.statusline.normal" = { fg = "surface0", bg = "lavender", modifiers = ["bold"] }
+"ui.statusline.insert" = { fg = "surface0", bg = "green", modifiers = ["bold"]  }
+"ui.statusline.select" = { fg = "surface0", bg = "flamingo", modifiers = ["bold"]  }
+
+"ui.popup" = { fg = "text", bg = "surface0" }
+"ui.window" = { fg = "crust" }
+"ui.help" = { fg = "overlay2", bg = "surface0" }
+
+"ui.text" = "text" 
+"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
+
+"ui.virtual" = "overlay0"
+"ui.virtual.ruler" = { bg = "surface0" }
+"ui.virtual.indent-guide" = "surface0"
+
+"ui.selection" = { bg = "surface1" }
+
+"ui.cursor" = { fg = "base", bg = "secondary_cursor" }
+"ui.cursor.primary" = { fg = "base", bg = "rosewater" }
+"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
+
+"ui.cursorline.primary" = { bg = "cursorline" }
+
+"ui.highlight" = { bg = "surface1" }
+
+"ui.menu" = { fg = "overlay2", bg = "surface0" }
+"ui.menu.selected" = { fg = "text", bg = "surface1", modifiers = ["bold"] }
+
+diagnostic = { modifiers = ["underlined"] }
+
+error = "red"
+warning = "yellow"
+info = "sky"
+hint = "teal"
+
+[palette]
+# catppuccin palette colors
+rosewater = "#f5e0dc"
+flamingo = "#f2cdcd"
+pink = "#f5c2e7"
+mauve = "#cba6f7"
+red = "#f38ba8"
+maroon = "#eba0ac"
+peach = "#fab387"
+yellow = "#f9e2af"
+green = "#a6e3a1"
+teal = "#94e2d5"
+sky = "#89dceb"
+sapphire = "#74c7ec"
+blue = "#89b4fa"
+lavender = "#b4befe"
+
+text = "#cdd6f4"
+subtext1 = "#bac2de"
+subtext0 = "#a6adc8"
+overlay2 = "#9399b2"
+overlay1 = "#7f849c"
+overlay0 = "#6c7086"
+surface2 = "#585b70"
+surface1 = "#45475a"
+surface0 = "#313244"
+
+base = "#1e1e2e"
+mantle = "#181825"
+crust = "#11111b"
+
+# derived colors by blending existing palette colors
+cursorline = "#2a2b3c"
+secondary_cursor = "#b5a6a8"
\ No newline at end of file