diff --git a/runtime/themes/everforest_dark.toml b/runtime/themes/everforest_dark.toml
index 3dd9243f6..b1fa02ef3 100644
--- a/runtime/themes/everforest_dark.toml
+++ b/runtime/themes/everforest_dark.toml
@@ -8,7 +8,7 @@
 # Email: sainnhe@gmail.com
 # License: MIT License
 
-"type" = { fg = "yellow", modifiers = ["italic"] }
+"type" = "yellow"
 "constant" = "fg"
 "constant.builtin" = { fg = "purple", modifiers = ["italic"] }
 "constant.builtin.boolean" = "purple"
@@ -30,7 +30,7 @@
 "keyword" = "red"
 "keyword.operator" = "orange"
 "keyword.directive" = "purple"
-"keyword.storage" = "orange"
+"keyword.storage" = "red"
 "operator" = "orange"
 "function" = "green"
 "function.macro" = "green"
@@ -85,7 +85,9 @@
 ] }
 "ui.statusline.select" = { fg = "bg0", bg = "blue", modifiers = ["bold"] }
 "ui.bufferline" = { fg = "grey2", bg = "bg3" }
-"ui.bufferline.active" = { fg = "bg0", bg = "statusline1", modifiers = ["bold"] }
+"ui.bufferline.active" = { fg = "bg0", bg = "statusline1", modifiers = [
+  "bold",
+] }
 "ui.popup" = { fg = "grey2", bg = "bg2" }
 "ui.window" = { fg = "bg4", bg = "bg_dim" }
 "ui.help" = { fg = "fg", bg = "bg2" }
diff --git a/runtime/themes/everforest_light.toml b/runtime/themes/everforest_light.toml
index ef0544ac6..54201ab0e 100644
--- a/runtime/themes/everforest_light.toml
+++ b/runtime/themes/everforest_light.toml
@@ -8,7 +8,7 @@
 # Email: sainnhe@gmail.com
 # License: MIT License
 
-"type" = { fg = "yellow", modifiers = ["italic"] }
+"type" = "yellow"
 "constant" = "fg"
 "constant.builtin" = { fg = "purple", modifiers = ["italic"] }
 "constant.builtin.boolean" = "purple"
@@ -30,7 +30,7 @@
 "keyword" = "red"
 "keyword.operator" = "orange"
 "keyword.directive" = "purple"
-"keyword.storage" = "orange"
+"keyword.storage" = "red"
 "operator" = "orange"
 "function" = "green"
 "function.macro" = "green"