diff --git a/helix/config.toml b/helix/config.toml
index e9f573a..adc6c03 100644
--- a/helix/config.toml
+++ b/helix/config.toml
@@ -5,12 +5,16 @@ scrolloff = 1
 cursorline = true
 trim-final-newlines = true
 trim-trailing-whitespace = true
+end-of-line-diagnostics = "hint"
 
 [editor.cursor-shape]
 insert = "bar"
 normal = "block"
 select = "underline"
 
+[editor.inline-diagnostics]
+cursor-line = "warning"
+
 [editor.file-picker]
 hidden = false
 deduplicate-links = false
diff --git a/helix/themes/base.toml b/helix/themes/base.toml
index e0d276a..e29243b 100644
--- a/helix/themes/base.toml
+++ b/helix/themes/base.toml
@@ -174,9 +174,9 @@
 "ui.virtual.ruler"                = { bg = "Ruler" }
 "ui.virtual.whitespace"           = { fg = "Whitespace"}
 "ui.virtual.inlay-hint"           = { fg = "Comment" }
+"ui.virtual.indent-guide"         = { fg = "TextTertiary" }
 "ui.virtual.wrap"                 = { fg = "Whitespace" }
 "ui.virtual.jump-label"           = { fg = "JumpLabel", bg = "TextTertiary" }
-# "ui.virtual.indent-guide"         = {}
 # "ui.virtual.inlay-hint.parameter" = {}
 # "ui.virtual.inlay-hint.type"      = {}
 
@@ -184,17 +184,17 @@
 "ui.menu.selected" = { bg = "TextSecondary" }
 "ui.menu.scroll"   = { bg = "TextSecondary", fg = "TextTertiary" }
 
-"ui.selection"         = { bg = "Selection", modifiers = ["dim"] }
+"ui.selection"         = { bg = "Selection" }
 "ui.selection.primary" = { bg = "Selection" }
 
 "ui.highlight"           = { bg = "Focused" }
 # "ui.highlight.frameline" = {}
 
 "ui.cursorline.primary"   = { bg = "Focused" }
-"ui.cursorline.secondary" = { bg = "TextTertiary" }
+"ui.cursorline.secondary" = {}
 
 "ui.cursorcolumn.primary"   = { fg = "White", bg = "Focused" }
-"ui.cursorcolumn.secondary" = { fg = "White", bg = "TextTertiary" }
+"ui.cursorcolumn.secondary" = {}
 
 ## Gutter
 "warning" = { fg = "Warning" }
@@ -203,12 +203,12 @@
 "hint"    = { fg = "Hint" }
 
 ## Editing area
-"diagnostic"             = { fg = "Comment" }
-"diagnostic.hint"        = { fg = "Hint" }
-"diagnostic.info"        = { fg = "Info" }
-"diagnostic.warning"     = { fg = "Warning" }
-"diagnostic.error"       = { fg = "Error" }
-"diagnostic.unnecessary" = { modifiers = ["dim"] }
+"diagnostic"             = { underline.style = "line", underline.color = "Comment" }
+"diagnostic.hint"        = { underline.style = "line", underline.color = "Hint" }
+"diagnostic.info"        = { underline.style = "line", underline.color = "Info" }
+"diagnostic.warning"     = { underline.style = "line", underline.color = "Warning" }
+"diagnostic.error"       = { underline.style = "line", underline.color = "Error" }
+"diagnostic.unnecessary" = { modifiers = ["crossed_out"] }
 "diagnostic.deprecated"  = { modifiers = ["crossed_out"] }
 
 "tabstop" = { bg = "TextSecondary", modifiers = ["italic"] }