diff --git a/crates/zed/assets/themes/_base.toml b/crates/zed/assets/themes/_base.toml
index d74780281c232c5a5ab806e34815c060f5fcdedf..d384b85d68c93cb7c7bcce4fc477f73970926fd1 100644
--- a/crates/zed/assets/themes/_base.toml
+++ b/crates/zed/assets/themes/_base.toml
@@ -226,3 +226,8 @@ line_number = "$text.2.color"
 line_number_active = "$text.0.color"
 selection = "$selection.host"
 guest_selections = "$selection.guests"
+
+error_underline = "$status.bad"
+warning_underline = "$status.warn"
+info_underline = "$status.info"
+hint_underline = "$status.info"
diff --git a/crates/zed/assets/themes/black.toml b/crates/zed/assets/themes/black.toml
index e99629c5ce68b35c337484f0d24c55f8453e0774..d37b7905be476c8499a46e43e7f30b3e551e2385 100644
--- a/crates/zed/assets/themes/black.toml
+++ b/crates/zed/assets/themes/black.toml
@@ -39,10 +39,6 @@ bad = "#b7372e"
 active_line = "#00000033"
 hover = "#00000033"
 
-[editor]
-error_underline = "#ff0000"
-warning_underline = "#00ffff"
-
 [editor.syntax]
 keyword = { color = "#0086c0", weight = "bold" }
 function = "#dcdcaa"
diff --git a/crates/zed/assets/themes/dark.toml b/crates/zed/assets/themes/dark.toml
index ce64e3c3f0002462100c6e1d11dea11d620d76f5..694e3469111890d317c1528c04143b5e36a8d37f 100644
--- a/crates/zed/assets/themes/dark.toml
+++ b/crates/zed/assets/themes/dark.toml
@@ -39,10 +39,6 @@ bad = "#b7372e"
 active_line = "#00000022"
 hover = "#00000033"
 
-[editor]
-error_underline = "#ff0000"
-warning_underline = "#00ffff"
-
 [editor.syntax]
 keyword = { color = "#0086c0", weight = "bold" }
 function = "#dcdcaa"
diff --git a/crates/zed/assets/themes/light.toml b/crates/zed/assets/themes/light.toml
index 13803c11a8060395db10d7ef19aa64032522d198..e2bfbfb650e5c704ac306283cee949547a1a67eb 100644
--- a/crates/zed/assets/themes/light.toml
+++ b/crates/zed/assets/themes/light.toml
@@ -39,10 +39,6 @@ bad = "#b7372e"
 active_line = "#00000008"
 hover = "#0000000D"
 
-[editor]
-error_underline = "#ff0000"
-warning_underline = "#00ffff"
-
 [editor.syntax]
 keyword = { color = "#0000fa", weight = "bold" }
 function = "#795e26"