diff --git a/runtime/themes/tokyonight_day.toml b/runtime/themes/tokyonight_day.toml
index 54caf8d6f..18c3b45f5 100644
--- a/runtime/themes/tokyonight_day.toml
+++ b/runtime/themes/tokyonight_day.toml
@@ -36,6 +36,6 @@ border = "#e9e9ed"
 border-highlight = "#2496ac"
 bg = "#e1e2e7"
 bg-inlay = "#acd7eb"
-bg-highlight = "#c4c8da"
+bg-selection = "#c4c8da"
 bg-menu = "#e9e9ec"
-bg-visual = "#b6bfe2"
+bg-focus = "#b6bfe2"
diff --git a/runtime/themes/tokyonight_moon.toml b/runtime/themes/tokyonight_moon.toml
index 8468051e6..09b38db35 100644
--- a/runtime/themes/tokyonight_moon.toml
+++ b/runtime/themes/tokyonight_moon.toml
@@ -36,6 +36,6 @@ border = "#1b1d2b"
 border-highlight = "#589ed7"
 bg = "#222436"
 bg-inlay = "#273644"
-bg-highlight = "#2f334d"
+bg-selection = "#2f334d"
 bg-menu = "#1e2030"
-bg-visual = "#2d3f76"
+bg-focus = "#2d3f76"
diff --git a/runtime/themes/tokyonight_storm.toml b/runtime/themes/tokyonight_storm.toml
index 5ec4a16a0..7bdddd8b4 100644
--- a/runtime/themes/tokyonight_storm.toml
+++ b/runtime/themes/tokyonight_storm.toml
@@ -6,7 +6,7 @@ inherits = "tokyonight"
 border = "#1d202f"
 bg = "#24283b"
 bg-inlay = "#233745"
-bg-highlight = "#373d5a"
+bg-selection = "#373d5a"
 bg-menu = "#1f2335"
-bg-visual = "#2e3c64"
+bg-focus = "#2e3c64"
 border-highlight = "#29a4bd"