diff --git a/runtime/themes/modus_vivendi_deuteranopia.toml b/runtime/themes/modus_vivendi_deuteranopia.toml
index acb236537b57c..705480d5d34d3 100644
--- a/runtime/themes/modus_vivendi_deuteranopia.toml
+++ b/runtime/themes/modus_vivendi_deuteranopia.toml
@@ -4,107 +4,7 @@
 # Version 4.3.0
 #
 
-# Syntax highlighting
-# -------------------
-"type" = "cyan-cooler"
-"constructor" = "cyan-cooler"
-
-"constant" = "blue-cooler"
-"constant.character.escape" = "magenta"
-
-"string" = "blue-warmer"
-"string.regexp" = "magenta-faint"
-"string.special" = "blue-faint" # used for colors in CSS
-
-"comment" = "fg-dim"
-
-"variable.parameter" = "cyan"
-"variable.builtin" = "magenta-cooler"
-"label" = "fg-dim" # used for language in markdown code blocks
-"keyword" = "magenta-cooler"
-"keyword.directive" = "red-cooler"
-"function" = "magenta"
-"function.macro" = "magenta-warmer"
-
-punctuation = "fg-dim"
-"tag" = "magenta"
-"attribute" = "cyan-cooler"
-"namespace" = "blue-cooler"
-"special" = "red-cooler"
-
-"markup.heading.marker" = "fg-dim"
-"markup.heading.1" = { fg = "fg-main", modifiers = ["bold"] }
-"markup.heading.2" = { fg = "yellow-faint", modifiers = ["bold"] }
-"markup.heading.3" = { fg = "fg-alt", modifiers = ["bold"] }
-"markup.heading.4" = { fg = "magenta", modifiers = ["bold"] }
-"markup.heading.5" = { fg = "green-faint", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "red-faint", modifiers = ["bold"] }
-"markup.list" = "fg-dim"
-"markup.list.checked" = { fg = "yellow-warmer" }
-"markup.list.unchecked" = { fg = "yellow-warmer" }
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "cyan" }
-"markup.link.text" = { fg = "blue-warmer", modifiers = ["underlined"] }
-"markup.raw.block" = { bg = "bg-dim" }
-"markup.raw.inline" = { fg = "green-cooler" }
-
-"diff.plus" = { fg = "fg-added", bg = "bg-added" }
-"diff.plus.gutter" = "green-intense"
-"diff.minus" = { fg = "fg-removed", bg = "bg-removed" }
-"diff.minus.gutter" = "red-intense"
-"diff.delta" = { fg = "fg-changed", bg = "bg-changed" }
-"diff.delta.gutter" = "yellow-intense"
-
-# User Interface
-# --------------
-
-"ui.background" = { bg = "bg-main" }
-
-"ui.linenr" = { fg = "fg-dim", bg = "bg-dim" }
-"ui.linenr.selected" = { fg = "fg-main", bg = "bg-active" }
-
-"ui.statusline" = { fg = "fg-mode-line-active", bg = "bg-mode-line-active" }
-"ui.statusline.inactive" = { fg = "fg-mode-line-inactive", bg = "bg-mode-line-inactive" }
-"ui.statusline.normal" = { fg = "blue-warmer" }
-"ui.statusline.insert" = { fg = "green-warmer" }
-"ui.statusline.select" = { fg = "magenta-warmer" }
-
-"ui.popup" = { fg = "fg-main", bg = "bg-dim" }
-"ui.window" = { fg = "fg-dim" }
-"ui.help" = { fg = "fg-main", bg = "bg-dim" }
-"ui.gutter" = { bg = "bg-dim" }
-"ui.text" = "fg-main"
-"ui.text.focus" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
-"ui.text.inactive" = { fg = "fg-dim" }
-"ui.virtual" = "bg-active"
-"ui.virtual.ruler" = { bg = "bg-dim" }
-"ui.virtual.inlay-hint" = { fg = "fg-dim", modifiers = ["italic"] }
-
-"ui.selection" = { fg = "fg-main", bg = "bg-inactive" }
-"ui.selection.primary" = { fg = "fg-main", bg = "bg-active" }
-
-"ui.cursor" = { fg = "bg-main", bg = "fg-main" }
-"ui.cursor.primary" = { fg = "bg-main", bg = "fg-dim" }
-"ui.cursor.match" = { bg = "bg-paren-match" }
-"ui.cursorline.primary" = { bg = "bg-hl-line" }
-
-"ui.highlight" = { bg = "bg-hl-line" }
-
-"ui.menu" = { fg = "fg-main", bg = "bg-dim" }
-"ui.menu.selected" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
-"ui.menu.scroll" = { fg = "fg-dim", bg = "bg-cyan-intense" }
-
-"diagnostic.error" = { underline = { color = "red-intense", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "yellow-intense", style = "curl" } }
-"diagnostic.info" = { underline = { color = "cyan-intense", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "blue-intense", style = "curl" } }
-
-error = "red"
-warning = "yellow-warmer"
-info = "cyan-cooler"
-hint = "blue-cooler"
+inherits = "modus_vivendi"
 
 [palette]
 # Basic values
diff --git a/runtime/themes/modus_vivendi_tinted.toml b/runtime/themes/modus_vivendi_tinted.toml
index 17323fadd7d91..532b574488d90 100644
--- a/runtime/themes/modus_vivendi_tinted.toml
+++ b/runtime/themes/modus_vivendi_tinted.toml
@@ -4,107 +4,7 @@
 # Version 4.3.0
 #
 
-# Syntax highlighting
-# -------------------
-"type" = "cyan-cooler"
-"constructor" = "cyan-cooler"
-
-"constant" = "blue-cooler"
-"constant.character.escape" = "magenta"
-
-"string" = "blue-warmer"
-"string.regexp" = "magenta-faint"
-"string.special" = "blue-faint" # used for colors in CSS
-
-"comment" = "fg-dim"
-
-"variable.parameter" = "cyan"
-"variable.builtin" = "magenta-cooler"
-"label" = "fg-dim" # used for language in markdown code blocks
-"keyword" = "magenta-cooler"
-"keyword.directive" = "red-cooler"
-"function" = "magenta"
-"function.macro" = "magenta-warmer"
-
-punctuation = "fg-dim"
-"tag" = "magenta"
-"attribute" = "cyan-cooler"
-"namespace" = "blue-cooler"
-"special" = "red-cooler"
-
-"markup.heading.marker" = "fg-dim"
-"markup.heading.1" = { fg = "fg-main", modifiers = ["bold"] }
-"markup.heading.2" = { fg = "yellow-faint", modifiers = ["bold"] }
-"markup.heading.3" = { fg = "fg-alt", modifiers = ["bold"] }
-"markup.heading.4" = { fg = "magenta", modifiers = ["bold"] }
-"markup.heading.5" = { fg = "green-faint", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "red-faint", modifiers = ["bold"] }
-"markup.list" = "fg-dim"
-"markup.list.checked" = { fg = "yellow-warmer" }
-"markup.list.unchecked" = { fg = "yellow-warmer" }
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "cyan" }
-"markup.link.text" = { fg = "blue-warmer", modifiers = ["underlined"] }
-"markup.raw.block" = { bg = "bg-dim" }
-"markup.raw.inline" = { fg = "green-cooler" }
-
-"diff.plus" = { fg = "fg-added", bg = "bg-added" }
-"diff.plus.gutter" = "green-intense"
-"diff.minus" = { fg = "fg-removed", bg = "bg-removed" }
-"diff.minus.gutter" = "red-intense"
-"diff.delta" = { fg = "fg-changed", bg = "bg-changed" }
-"diff.delta.gutter" = "yellow-intense"
-
-# User Interface
-# --------------
-
-"ui.background" = { bg = "bg-main" }
-
-"ui.linenr" = { fg = "fg-dim", bg = "bg-dim" }
-"ui.linenr.selected" = { fg = "fg-main", bg = "bg-active" }
-
-"ui.statusline" = { fg = "fg-mode-line-active", bg = "bg-mode-line-active" }
-"ui.statusline.inactive" = { fg = "fg-mode-line-inactive", bg = "bg-mode-line-inactive" }
-"ui.statusline.normal" = { fg = "blue-warmer" }
-"ui.statusline.insert" = { fg = "green-warmer" }
-"ui.statusline.select" = { fg = "magenta-warmer" }
-
-"ui.popup" = { fg = "fg-main", bg = "bg-dim" }
-"ui.window" = { fg = "fg-dim" }
-"ui.help" = { fg = "fg-main", bg = "bg-dim" }
-"ui.gutter" = { bg = "bg-dim" }
-"ui.text" = "fg-main"
-"ui.text.focus" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
-"ui.text.inactive" = { fg = "fg-dim" }
-"ui.virtual" = "bg-active"
-"ui.virtual.ruler" = { bg = "bg-dim" }
-"ui.virtual.inlay-hint" = { fg = "fg-dim", modifiers = ["italic"] }
-
-"ui.selection" = { fg = "fg-main", bg = "bg-inactive" }
-"ui.selection.primary" = { fg = "fg-main", bg = "bg-active" }
-
-"ui.cursor" = { fg = "bg-main", bg = "fg-main" }
-"ui.cursor.primary" = { fg = "bg-main", bg = "fg-dim" }
-"ui.cursor.match" = { bg = "bg-paren-match" }
-"ui.cursorline.primary" = { bg = "bg-hl-line" }
-
-"ui.highlight" = { bg = "bg-hl-line" }
-
-"ui.menu" = { fg = "fg-main", bg = "bg-dim" }
-"ui.menu.selected" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
-"ui.menu.scroll" = { fg = "fg-dim", bg = "bg-cyan-intense" }
-
-"diagnostic.error" = { underline = { color = "red-intense", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "yellow-intense", style = "curl" } }
-"diagnostic.info" = { underline = { color = "cyan-intense", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "blue-intense", style = "curl" } }
-
-error = "red"
-warning = "yellow-warmer"
-info = "cyan-cooler"
-hint = "blue-cooler"
+inherits = "modus_vivendi"
 
 [palette]
 # Basic values
diff --git a/runtime/themes/modus_vivendi_tritanopia.toml b/runtime/themes/modus_vivendi_tritanopia.toml
index 18402417d78b1..0333dc2ce3089 100644
--- a/runtime/themes/modus_vivendi_tritanopia.toml
+++ b/runtime/themes/modus_vivendi_tritanopia.toml
@@ -4,107 +4,7 @@
 # Version 4.3.0
 #
 
-# Syntax highlighting
-# -------------------
-"type" = "cyan-cooler"
-"constructor" = "cyan-cooler"
-
-"constant" = "blue-cooler"
-"constant.character.escape" = "magenta"
-
-"string" = "blue-warmer"
-"string.regexp" = "magenta-faint"
-"string.special" = "blue-faint" # used for colors in CSS
-
-"comment" = "fg-dim"
-
-"variable.parameter" = "cyan"
-"variable.builtin" = "magenta-cooler"
-"label" = "fg-dim" # used for language in markdown code blocks
-"keyword" = "magenta-cooler"
-"keyword.directive" = "red-cooler"
-"function" = "magenta"
-"function.macro" = "magenta-warmer"
-
-punctuation = "fg-dim"
-"tag" = "magenta"
-"attribute" = "cyan-cooler"
-"namespace" = "blue-cooler"
-"special" = "red-cooler"
-
-"markup.heading.marker" = "fg-dim"
-"markup.heading.1" = { fg = "fg-main", modifiers = ["bold"] }
-"markup.heading.2" = { fg = "yellow-faint", modifiers = ["bold"] }
-"markup.heading.3" = { fg = "fg-alt", modifiers = ["bold"] }
-"markup.heading.4" = { fg = "magenta", modifiers = ["bold"] }
-"markup.heading.5" = { fg = "green-faint", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "red-faint", modifiers = ["bold"] }
-"markup.list" = "fg-dim"
-"markup.list.checked" = { fg = "yellow-warmer" }
-"markup.list.unchecked" = { fg = "yellow-warmer" }
-"markup.bold" = { modifiers = ["bold"] }
-"markup.italic" = { modifiers = ["italic"] }
-"markup.strikethrough" = { modifiers = ["crossed_out"] }
-"markup.link.url" = { fg = "cyan" }
-"markup.link.text" = { fg = "blue-warmer", modifiers = ["underlined"] }
-"markup.raw.block" = { bg = "bg-dim" }
-"markup.raw.inline" = { fg = "green-cooler" }
-
-"diff.plus" = { fg = "fg-added", bg = "bg-added" }
-"diff.plus.gutter" = "green-intense"
-"diff.minus" = { fg = "fg-removed", bg = "bg-removed" }
-"diff.minus.gutter" = "red-intense"
-"diff.delta" = { fg = "fg-changed", bg = "bg-changed" }
-"diff.delta.gutter" = "yellow-intense"
-
-# User Interface
-# --------------
-
-"ui.background" = { bg = "bg-main" }
-
-"ui.linenr" = { fg = "fg-dim", bg = "bg-dim" }
-"ui.linenr.selected" = { fg = "fg-main", bg = "bg-active" }
-
-"ui.statusline" = { fg = "fg-mode-line-active", bg = "bg-mode-line-active" }
-"ui.statusline.inactive" = { fg = "fg-mode-line-inactive", bg = "bg-mode-line-inactive" }
-"ui.statusline.normal" = { fg = "blue-warmer" }
-"ui.statusline.insert" = { fg = "green-warmer" }
-"ui.statusline.select" = { fg = "magenta-warmer" }
-
-"ui.popup" = { fg = "fg-main", bg = "bg-dim" }
-"ui.window" = { fg = "fg-dim" }
-"ui.help" = { fg = "fg-main", bg = "bg-dim" }
-"ui.gutter" = { bg = "bg-dim" }
-"ui.text" = "fg-main"
-"ui.text.focus" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
-"ui.text.inactive" = { fg = "fg-dim" }
-"ui.virtual" = "bg-active"
-"ui.virtual.ruler" = { bg = "bg-dim" }
-"ui.virtual.inlay-hint" = { fg = "fg-dim", modifiers = ["italic"] }
-
-"ui.selection" = { fg = "fg-main", bg = "bg-inactive" }
-"ui.selection.primary" = { fg = "fg-main", bg = "bg-active" }
-
-"ui.cursor" = { fg = "bg-main", bg = "fg-main" }
-"ui.cursor.primary" = { fg = "bg-main", bg = "fg-dim" }
-"ui.cursor.match" = { bg = "bg-paren-match" }
-"ui.cursorline.primary" = { bg = "bg-hl-line" }
-
-"ui.highlight" = { bg = "bg-hl-line" }
-
-"ui.menu" = { fg = "fg-main", bg = "bg-dim" }
-"ui.menu.selected" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
-"ui.menu.scroll" = { fg = "fg-dim", bg = "bg-cyan-intense" }
-
-"diagnostic.error" = { underline = { color = "red-intense", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "yellow-intense", style = "curl" } }
-"diagnostic.info" = { underline = { color = "cyan-intense", style = "curl" } }
-"diagnostic.hint" = { underline = { color = "blue-intense", style = "curl" } }
-
-error = "red"
-warning = "yellow-warmer"
-info = "cyan-cooler"
-hint = "blue-cooler"
+inherits = "modus_vivendi"
 
 [palette]
 # Basic values