diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index 37b6756f5b977..e14aa2140cb34 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -60,12 +60,12 @@
 "markup.raw.inline" = "green"
 "markup.raw.block" = "aqua"
 
-"diff.plus" = "green"
-"diff.delta" = "blue"
-"diff.minus" = "red"
+"diff.plus" =  { bg ="bg_green", fg = "green"}
+"diff.delta" = { bg ="bg_blue", fg = "blue"}
+"diff.minus" = { bg ="bg_red", fg = "red"}
 
 "ui.background" = { bg = "bg0" }
-"ui.background.separator" = "bg_visual"
+"ui.background.separator" = "grey0"
 "ui.cursor" = { fg = "bg1", bg = "grey2" }
 "ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
 "ui.cursor.select" = { fg = "bg0", bg = "blue" }
@@ -90,6 +90,7 @@
   "bold",
 ] }
 "ui.popup" = { fg = "grey2", bg = "bg2" }
+"ui.picker.header" = { modifiers = ["bold", "underlined"] }
 "ui.window" = { fg = "bg4", bg = "bg_dim" }
 "ui.help" = { fg = "fg", bg = "bg2" }
 "ui.text" = "fg"
@@ -107,10 +108,10 @@
 "warning" = "yellow"
 "error" = "red"
 
-"diagnostic.hint" = { underline = { color = "green", style = "curl" } }
-"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.hint" = { bg = "bg_green", underline = { color = "green", style = "curl" } }
+"diagnostic.info" = { bg = "bg_blue", underline = { color = "blue", style = "curl" } }
+"diagnostic.warning" = { bg = "bg_yellow", underline = { color = "yellow", style = "curl" } }
+"diagnostic.error" = { bg = "bg_red", underline = { color = "red", style = "curl" } }
 "diagnostic.unnecessary" = { modifiers = ["dim"] }
 "diagnostic.deprecated" = { modifiers = ["crossed_out"] }
 
diff --git a/runtime/themes/everforest_light.toml b/runtime/themes/everforest_light.toml
index b7448455ca22f..9ec22a87058b2 100644
--- a/runtime/themes/everforest_light.toml
+++ b/runtime/themes/everforest_light.toml
@@ -59,12 +59,12 @@
 "markup.raw.inline" = "green"
 "markup.raw.block" = "aqua"
 
-"diff.plus" = "green"
-"diff.delta" = "blue"
-"diff.minus" = "red"
+"diff.plus" =  { bg ="bg_green", fg = "green"}
+"diff.delta" = { bg ="bg_blue", fg = "blue"}
+"diff.minus" = { bg ="bg_red", fg = "red"}
 
 "ui.background" = { bg = "bg0" }
-"ui.background.separator" = "bg_visual"
+"ui.background.separator" = "grey0"
 "ui.cursor" = { fg = "bg1", bg = "grey2" }
 "ui.cursor.insert" = { fg = "bg0", bg = "grey1" }
 "ui.cursor.select" = { fg = "bg0", bg = "blue" }
@@ -89,6 +89,7 @@
   "bold",
 ] }
 "ui.popup" = { fg = "grey2", bg = "bg2" }
+"ui.picker.header" = { modifiers = ["bold", "underlined"] }
 "ui.window" = { fg = "bg4", bg = "bg_dim" }
 "ui.help" = { fg = "fg", bg = "bg2" }
 "ui.text" = "fg"
@@ -106,10 +107,10 @@
 "warning" = "yellow"
 "error" = "red"
 
-"diagnostic.hint" = { underline = { color = "green", style = "curl" } }
-"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
-"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
-"diagnostic.error" = { underline = { color = "red", style = "curl" } }
+"diagnostic.hint" = { bg = "bg_green", underline = { color = "green", style = "curl" } }
+"diagnostic.info" = { bg = "bg_blue", underline = { color = "blue", style = "curl" } }
+"diagnostic.warning" = { bg = "bg_yellow", underline = { color = "yellow", style = "curl" } }
+"diagnostic.error" = { bg = "bg_red", underline = { color = "red", style = "curl" } }
 "diagnostic.unnecessary" = { modifiers = ["dim"] }
 "diagnostic.deprecated" = { modifiers = ["crossed_out"] }