diff --git a/runtime/themes/onedark.toml b/runtime/themes/onedark.toml
index f478b05f8..508109dd3 100644
--- a/runtime/themes/onedark.toml
+++ b/runtime/themes/onedark.toml
@@ -29,16 +29,26 @@
 "warning" = { fg = "#e5c07b", modifiers = ['bold'] }
 "error" = { fg = "#e06c75", modifiers = ['bold'] }
 
-"ui.menu.selected" = { fg = "#282C34", bg = "#61AFEF" }
 "ui.background" = { fg = "#ABB2BF", bg = "#282C34" }
-"ui.help" = { bg = "#3E4452" }
+
+"ui.cursor" = { fg = "#ABB2BF", modifiers = ["reversed"] }
+"ui.cursor.primary" = { fg = "#ABB2BF", modifiers = ["reversed"] }
+"ui.cursor.match" = { fg = "#61AFEF", modifiers = ['underlined']}
+
+"ui.selection" = { bg = "#5C6370" }
+"ui.selection.primary" = { bg = "#3E4452" }
+
 "ui.linenr" = { fg = "#4B5263", modifiers = ['dim'] }
 "ui.linenr.selected" = { fg = "#ABB2BF" }
-"ui.popup" = { bg = "#3E4452" }
+
 "ui.statusline" = { fg = "#ABB2BF", bg = "#2C323C" }
-"ui.statusline.inactive" = { fg = "#ABB2Bf", bg = "#2C323C" }
-"ui.selection" = { bg = "#3E4452" }
+"ui.statusline.inactive" = { fg = "#5C6370", bg = "#2C323C" }
+
 "ui.text" = { fg = "#ABB2BF", bg = "#282C34" }
 "ui.text.focus" = { fg = "#ABB2BF", bg = "#2C323C", modifiers = ['bold'] }
+
+"ui.help" = { bg = "#3E4452" }
+"ui.popup" = { bg = "#3E4452" }
 "ui.window" = { bg = "#3E4452" }
-# "ui.cursor.match"  # TODO might want to override this because dimmed is not widely supported
+"ui.menu.selected" = { fg = "#282C34", bg = "#61AFEF" }
+