diff --git a/runtime/themes/autumn.toml b/runtime/themes/autumn.toml
index 4474b0d41..23af7d6f5 100644
--- a/runtime/themes/autumn.toml
+++ b/runtime/themes/autumn.toml
@@ -22,8 +22,9 @@
 "ui.statusline.insert" = {fg = "my_black", bg = "my_gray6", modifiers = ["bold"]}
 "ui.statusline.normal" = {fg = "my_gray7", bg = "my_gray2"}
 "ui.statusline.select" = {fg = "my_gray7", bg = "my_black", modifiers = ["bold"]}
-"ui.cursor" = { fg = "my_gray6", modifiers = ["reversed"] }
+"ui.cursor" = { bg = "my_white4", fg = "my_black" }
 "ui.cursor.primary" = { fg = "my_white", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "my_white", modifiers = ["bold"], underline = { style = "double_line", color = "my_white" }, bg = "my_black"}
 "ui.cursorline.primary" = { bg = "my_black" }
 "ui.cursorline.secondary" = { bg = "my_black" }
 "ui.highlight.frameline" = { bg = "#8b6904" }
@@ -36,7 +37,6 @@
 "constant" = "my_white3"
 "attribute" = "my_turquoise"
 "type" = { fg = "my_white3", modifiers = ["italic"] }
-"ui.cursor.match" = { fg = "my_white3", modifiers = ["underlined"] }
 "string"  = "my_green"
 "variable.other.member" = "my_brown"
 "constant.character.escape" = "my_turquoise"
@@ -47,9 +47,10 @@
 "label" = "my_red"
 "namespace" = "my_white3"
 "ui.help" = { fg = "my_gray7", bg = "my_gray2" }
+"ui.virtual.wrap" = "my_gray4"
 "ui.virtual.whitespace" = { fg = "my_gray6" }
 "ui.virtual.ruler" = { bg = "my_gray1" }
-"ui.virtual.inlay-hint" = { fg = "my_gray4", modifiers = ["normal"] }
+"ui.virtual.inlay-hint" = { fg = "my_gray4", bg="my_black", modifiers = ["normal"] }
 "ui.virtual.inlay-hint.parameter" = { fg = "my_gray4", modifiers = ["normal"] }
 "ui.virtual.inlay-hint.type" = { fg = "my_gray4", modifiers = ["italic"] }
 
@@ -67,7 +68,10 @@
 "diff.delta" = "my_gray5"
 "diff.minus" = "my_red"
 
-"diagnostic" = { modifiers = ["underlined"] }
+"diagnostic" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"}
+"diagnostic.hint" = { underline = { style = "line", color = "my_gray5" }, bg = "my_black"}
+"diagnostic.info" = { underline = { style = "line" } }
+"diagnostic.warning" = { underline = { style = "curl", color = "my_yellow2" } }
 "diagnostic.error" = { underline = { style = "curl", color = "my_red" } }
 "ui.gutter" = { bg = "my_gray0" }
 "hint" = "my_gray6"
@@ -78,18 +82,19 @@
 
 [palette]
 my_black      = "#212121" # Cursorline
-my_gray0      = "#262626" # Default Background
+my_gray0      = "#232323" # Default Background
 my_gray1      = "#2b2b2b" # Ruler
 my_gray2      = "#323232" # Lighter Background (Used for status bars, line number and folding marks)
 my_gray3      = "#404040" # Selection Background
-my_gray4      = "#6a6a6a" # Inlay-hint
-my_gray5      = "#848484" # Comments, Invisibles, Line Highlighting
+my_gray4      = "#646f69" # Inlay-hint
+my_gray5      = "#646f69" # Comments, Invisibles, Line Highlighting
 my_gray6      = "#a8a8a8" # Dark Foreground (Used for status bars)
 my_gray7      = "#c8c8c8" # Light Foreground
 my_gray8      = "#e8e8e8" # Light Background
 my_white      = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators
 my_white2     = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
 my_white3     = "#F3F2CC" # Classes, Markup Bold, Search Text Background
+my_white4     = "#7e7d6a" # Cursor match
 my_turquoise  = "#86c1b9" # Support, Regular Expressions, Escape Characters
 my_turquoise2 = "#72a59e" # URL
 my_green      = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted
diff --git a/runtime/themes/autumn_night.toml b/runtime/themes/autumn_night.toml
index 70045f42d..493976263 100644
--- a/runtime/themes/autumn_night.toml
+++ b/runtime/themes/autumn_night.toml
@@ -15,14 +15,15 @@ my_gray0      = "#090909" # Default Background
 my_gray1      = "#0e0e0e" # Ruler
 my_gray2      = "#1a1a1a" # Lighter Background (Used for status bars, line number and folding marks)
 my_gray3      = "#404040" # Selection Background
-my_gray4      = "#626262" # Inlay-hint
-my_gray5      = "#808080" # Comments, Invisibles, Line Highlighting
+my_gray4      = "#626C66" # Inlay-hint
+my_gray5      = "#626C66" # Comments, Invisibles, Line Highlighting
 my_gray6      = "#aaaaaa" # Dark Foreground (Used for status bars)
 my_gray7      = "#c4c4c4" # Light Foreground
 my_gray8      = "#e8e8e8" # Light Background
 my_white      = "#F3F2CC" # Default Foreground, Caret, Delimiters, Operators
 my_white2     = "#F3F2CC" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
 my_white3     = "#F3F2CC" # Classes, Markup Bold, Search Text Background
+my_white4     = "#7e7d6a" # Secondary cursors
 my_turquoise  = "#86c1b9" # Support, Regular Expressions, Escape Characters
 my_turquoise2 = "#72a59e" # URL
 my_green      = "#99be70" # Strings, Inherited Class, Markup Code, Diff Inserted