diff --git a/runtime/themes/catppuccin.toml b/runtime/themes/catppuccin.toml
index eaa4ba517..0f43d33d9 100644
--- a/runtime/themes/catppuccin.toml
+++ b/runtime/themes/catppuccin.toml
@@ -35,7 +35,7 @@ label = "peach"
 
 "diff.plus" = "#35bf86"
 "diff.minus" = "#f22c86"
-"diff.delta" = "#6f44f0"
+"diff.delta" = "#6F44F0"
 
 "ui.background" = { bg = "black_2" }
 "ui.linenr" = { fg = "gray_0" }
@@ -62,10 +62,10 @@ label = "peach"
 
 diagnostic = { modifiers = ["underlined"] }
 
-warning = "lightning"
-error = "apricot"
-info = "delta"
-hint = "silver"
+warning = "peach"
+error = "maroon"
+info = "blue"
+hint = "lavender"
 
 [palette]
 flamingo = "#F2CDCD"
diff --git a/runtime/themes/dracula.toml b/runtime/themes/dracula.toml
index 6cc037b8e..41312901d 100644
--- a/runtime/themes/dracula.toml
+++ b/runtime/themes/dracula.toml
@@ -22,7 +22,7 @@
 "ui.background" = { fg = "foreground", bg = "background" }
 "ui.cursor" =  { fg = "background", bg = "orange", modifiers = ["dim"] }
 "ui.cursor.match" = { fg = "green", modifiers = ["underlined"] }
-"ui.cursor.primary" = { fg = "background", bg = "cyan", modifier = ["dim"] }
+"ui.cursor.primary" = { fg = "background", bg = "cyan", modifiers = ["dim"] }
 "ui.cursorline.primary" = { bg = "background_dark" }
 "ui.help" = { fg = "foreground", bg = "background_dark" }
 "ui.linenr" = { fg = "comment" }
diff --git a/runtime/themes/dracula_at_night.toml b/runtime/themes/dracula_at_night.toml
index 0a45f024b..31e39aa9f 100644
--- a/runtime/themes/dracula_at_night.toml
+++ b/runtime/themes/dracula_at_night.toml
@@ -23,7 +23,7 @@
 "ui.background" = { fg = "foreground", bg = "background" }
 "ui.cursor" =  { fg = "background", bg = "orange", modifiers = ["dim"] }
 "ui.cursor.match" = { fg = "green", modifiers = ["underlined"] }
-"ui.cursor.primary" = { fg = "background", bg = "cyan", modifier = ["dim"] }
+"ui.cursor.primary" = { fg = "background", bg = "cyan", modifiers = ["dim"] }
 "ui.help" = { fg = "foreground", bg = "background_dark" }
 "ui.linenr" = { fg = "comment" }
 "ui.linenr.selected" = { fg = "foreground" }
diff --git a/runtime/themes/noctis.toml b/runtime/themes/noctis.toml
index 0bd3de2f5..8690ab3a1 100644
--- a/runtime/themes/noctis.toml
+++ b/runtime/themes/noctis.toml
@@ -175,7 +175,7 @@
 # Version control changes.
 
 'diff.plus' = "light-green" # { } # Additions.
-'diff.minus' = "yelllow" # { } # Deletions.
+'diff.minus' = "yellow" # { } # Deletions.
 'diff.delta' = "red" # { } # Modifications.
 # 'diff.delta.moved' = { } # Renamed or moved files / changes.
 
diff --git a/runtime/themes/rose_pine.toml b/runtime/themes/rose_pine.toml
index fd53abd58..1755388f2 100644
--- a/runtime/themes/rose_pine.toml
+++ b/runtime/themes/rose_pine.toml
@@ -56,8 +56,8 @@
 "markup.heading.2" = { fg = "gold", modifiers = ["bold"] }
 "markup.heading.3" = { fg = "rose", modifiers = ["bold"] }
 "markup.heading.4" = { fg = "pine", modifiers = ["bold"] }
-"markup.heading.5" = { fg = "form", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "fg", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "foam", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "iris", modifiers = ["bold"] }
 "markup.list" = { fg = "love" }
 "markup.bold" = { fg = "gold", modifiers = ["bold"] }
 "markup.italic" = { fg = "iris", modifiers = ["italic"] }
diff --git a/runtime/themes/rose_pine_dawn.toml b/runtime/themes/rose_pine_dawn.toml
index 9ba0959db..a3c0f446c 100644
--- a/runtime/themes/rose_pine_dawn.toml
+++ b/runtime/themes/rose_pine_dawn.toml
@@ -53,8 +53,8 @@
 "markup.heading.2" = { fg = "gold", modifiers = ["bold"] }
 "markup.heading.3" = { fg = "rose", modifiers = ["bold"] }
 "markup.heading.4" = { fg = "pine", modifiers = ["bold"] }
-"markup.heading.5" = { fg = "form", modifiers = ["bold"] }
-"markup.heading.6" = { fg = "fg", modifiers = ["bold"] }
+"markup.heading.5" = { fg = "foam", modifiers = ["bold"] }
+"markup.heading.6" = { fg = "iris", modifiers = ["bold"] }
 "markup.list" = { fg = "love" }
 "markup.bold" = { fg = "gold", modifiers = ["bold"] }
 "markup.italic" = { fg = "iris", modifiers = ["italic"] }
diff --git a/runtime/themes/serika-dark.toml b/runtime/themes/serika-dark.toml
index 3b4bc60f5..ec1608741 100644
--- a/runtime/themes/serika-dark.toml
+++ b/runtime/themes/serika-dark.toml
@@ -35,7 +35,7 @@
 
 "ui.background" = { bg = "bg0" }
 "ui.cursor" = { fg = "bg0", bg = "fg" }
-"ui.cursor.match" = { fg = "grey3", bg = "grey2" }
+"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"
@@ -56,7 +56,7 @@
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "nasty-red"
-"diagnostic" = { fg = "dark-red", Modifiers = ["underlined"] }
+"diagnostic" = { fg = "dark-red", modifiers = ["underlined"] }
 
 "diff.plus" = { fg = "green" }
 "diff.delta" = { fg = "orange" }
@@ -69,7 +69,7 @@
 "markup.link.url" = "cyan"
 "markup.link.text" = "pink"
 "markup.quote" = { fg = "yellow", modifiers = ["italic"] }
-"markup.raw" = { fg = "foreground" }
+"markup.raw" = { fg = "fg" }
 
 [palette]
 
@@ -98,3 +98,4 @@ purple = "#d0c4d4"
 grey0 = "#aaaeb3"
 grey1 = "#e1e1e3"
 grey2 = "#646669"
+pink = "#e06c75"
diff --git a/runtime/themes/serika-light.toml b/runtime/themes/serika-light.toml
index 3b0f8fb47..4eca3de94 100644
--- a/runtime/themes/serika-light.toml
+++ b/runtime/themes/serika-light.toml
@@ -56,7 +56,7 @@
 "info" = "aqua"
 "warning" = "yellow"
 "error" = "nasty-red"
-"diagnostic" = { fg = "dark-red", Modifiers = ["underlined"] }
+"diagnostic" = { fg = "dark-red", modifiers = ["underlined"] }
 
 "diff.plus" = { fg = "green" }
 "diff.delta" = { fg = "orange" }
@@ -69,7 +69,7 @@
 "markup.link.url" = "cyan"
 "markup.link.text" = "pink"
 "markup.quote" = { fg = "yellow", modifiers = ["italic"] }
-"markup.raw" = { fg = "foreground" }
+"markup.raw" = { fg = "fg" }
 
 
 [palette]
@@ -91,7 +91,7 @@ red = "#621d28"
 nasty-red = "#da3333"
 dark-red = "#791717"
 orange = "#57320f"
-yellow = "#e2b714"
+yellow = "#9a7d0e"
 green = "#3f4b34"
 aqua = "#455054"
 blue = "#3f5673"
@@ -99,3 +99,4 @@ purple = "#534059"
 grey0 = "#aaaeb3"
 grey1 = "#e1e1e3"
 grey2 = "#646669"
+pink = "#e06c75"
diff --git a/runtime/themes/snazzy.toml b/runtime/themes/snazzy.toml
index da47fd636..f4521e7fc 100644
--- a/runtime/themes/snazzy.toml
+++ b/runtime/themes/snazzy.toml
@@ -24,7 +24,7 @@
 "ui.background" = { fg = "foreground", bg = "background" }
 "ui.cursor" =  { fg = "background", bg = "blue", modifiers = ["dim"] }
 "ui.cursor.match" = { fg = "green", modifiers = ["underlined"] }
-"ui.cursor.primary" = { fg = "background", bg = "cyan", modifier = ["dim"] }
+"ui.cursor.primary" = { fg = "background", bg = "cyan", modifiers = ["dim"] }
 "ui.help" = { fg = "foreground", bg = "background_dark" }
 "ui.linenr" = { fg = "comment" }
 "ui.linenr.selected" = { fg = "foreground" }