diff --git a/config/omarchy/themed/alacritty.toml.tpl.sample b/config/omarchy/themed/alacritty.toml.tpl.sample
index 951aba62..b86516e2 100644
--- a/config/omarchy/themed/alacritty.toml.tpl.sample
+++ b/config/omarchy/themed/alacritty.toml.tpl.sample
@@ -21,8 +21,6 @@
 #   {{ accent }}                - Theme accent color
 #   {{ selection_background }}  - Selection highlight background
 #   {{ selection_foreground }}  - Selection highlight foreground
-#   {{ active_border_color }}   - Active window/element border
-#   {{ active_tab_background }} - Active tab background
 #
 #   {{ color0 }} through {{ color15 }} - Standard 16-color terminal palette
 #     color0-7:  Normal colors (black, red, green, yellow, blue, magenta, cyan, white)
diff --git a/default/themed/kitty.conf.tpl b/default/themed/kitty.conf.tpl
index 88006243..e74a5bbc 100644
--- a/default/themed/kitty.conf.tpl
+++ b/default/themed/kitty.conf.tpl
@@ -6,8 +6,8 @@ selection_background {{ selection_background }}
 cursor {{ cursor }}
 cursor_text_color {{ background }}
 
-active_border_color {{ active_border_color }}
-active_tab_background {{ active_tab_background }}
+active_border_color {{ accent }}
+active_tab_background {{ accent }}
 
 color0 {{ color0 }}
 color1 {{ color1 }}
diff --git a/themes/catppuccin-latte/colors.toml b/themes/catppuccin-latte/colors.toml
index 93e550d6..87c37d4a 100644
--- a/themes/catppuccin-latte/colors.toml
+++ b/themes/catppuccin-latte/colors.toml
@@ -1,7 +1,4 @@
 accent = "#1e66f5"
-active_border_color = "#8839EF"
-active_tab_background = "#8839EF"
-
 cursor = "#dc8a78"
 foreground = "#4c4f69"
 background = "#eff1f5"
diff --git a/themes/catppuccin/colors.toml b/themes/catppuccin/colors.toml
index 30eef198..6943ef1f 100644
--- a/themes/catppuccin/colors.toml
+++ b/themes/catppuccin/colors.toml
@@ -1,7 +1,4 @@
 accent = "#89b4fa"
-active_border_color = "#CBA6F7"
-active_tab_background = "#CBA6F7"
-
 cursor = "#f5e0dc"
 foreground = "#cdd6f4"
 background = "#1e1e2e"
diff --git a/themes/ethereal/colors.toml b/themes/ethereal/colors.toml
index 3cbe19b7..75cedec8 100644
--- a/themes/ethereal/colors.toml
+++ b/themes/ethereal/colors.toml
@@ -1,7 +1,4 @@
 accent = "#7d82d9"
-active_border_color = "#7d82d9"
-active_tab_background = "#060B1E"
-
 cursor = "#ffcead"
 foreground = "#ffcead"
 background = "#060B1E"
diff --git a/themes/everforest/colors.toml b/themes/everforest/colors.toml
index f2e61588..9aaeeb5a 100644
--- a/themes/everforest/colors.toml
+++ b/themes/everforest/colors.toml
@@ -1,7 +1,4 @@
 accent = "#7fbbb3"
-active_border_color = "#7fbbb3"
-active_tab_background = "#2d353b"
-
 cursor = "#d3c6aa"
 foreground = "#d3c6aa"
 background = "#2d353b"
diff --git a/themes/flexoki-light/colors.toml b/themes/flexoki-light/colors.toml
index b5e3a622..44af88c4 100644
--- a/themes/flexoki-light/colors.toml
+++ b/themes/flexoki-light/colors.toml
@@ -1,7 +1,4 @@
 accent = "#205EA6"
-active_border_color = "#D14D41"
-active_tab_background = "#CECDC3"
-
 cursor = "#100F0F"
 foreground = "#100F0F"
 background = "#FFFCF0"
diff --git a/themes/gruvbox/colors.toml b/themes/gruvbox/colors.toml
index b6e7b351..57847f0a 100644
--- a/themes/gruvbox/colors.toml
+++ b/themes/gruvbox/colors.toml
@@ -1,7 +1,4 @@
 accent = "#7daea3"
-active_border_color = "#458588"
-active_tab_background = "#d65d0e"
-
 cursor = "#bdae93"
 foreground = "#d4be98"
 background = "#282828"
diff --git a/themes/hackerman/colors.toml b/themes/hackerman/colors.toml
index 90792645..52247f68 100644
--- a/themes/hackerman/colors.toml
+++ b/themes/hackerman/colors.toml
@@ -1,7 +1,4 @@
 accent = "#829dd4"
-active_border_color = "#829dd4"
-active_tab_background = "#0B0C16"
-
 cursor = "#ddf7ff"
 foreground = "#ddf7ff"
 background = "#0B0C16"
diff --git a/themes/kanagawa/colors.toml b/themes/kanagawa/colors.toml
index 4e7b987e..7ca002ee 100644
--- a/themes/kanagawa/colors.toml
+++ b/themes/kanagawa/colors.toml
@@ -1,7 +1,4 @@
 accent = "#7e9cd8"
-active_border_color = "#7e9cd8"
-active_tab_background = "#1f1f28"
-
 cursor = "#c8c093"
 foreground = "#dcd7ba"
 background = "#1f1f28"
diff --git a/themes/matte-black/colors.toml b/themes/matte-black/colors.toml
index badef1ab..f0f1d3a6 100644
--- a/themes/matte-black/colors.toml
+++ b/themes/matte-black/colors.toml
@@ -1,7 +1,4 @@
 accent = "#e68e0d"
-active_border_color = "#595959"
-active_tab_background = "#121212"
-
 cursor = "#eaeaea"
 foreground = "#bebebe"
 background = "#121212"
diff --git a/themes/nord/colors.toml b/themes/nord/colors.toml
index 9ff8d33d..79c2ae23 100644
--- a/themes/nord/colors.toml
+++ b/themes/nord/colors.toml
@@ -1,7 +1,4 @@
 accent = "#81a1c1"
-active_border_color = "#81A1C1"
-active_tab_background = "#2E3440"
-
 cursor = "#d8dee9"
 foreground = "#d8dee9"
 background = "#2e3440"
diff --git a/themes/osaka-jade/colors.toml b/themes/osaka-jade/colors.toml
index a93532dc..76f763e8 100644
--- a/themes/osaka-jade/colors.toml
+++ b/themes/osaka-jade/colors.toml
@@ -1,7 +1,4 @@
 accent = "#509475"
-active_border_color = "#509475"
-active_tab_background = "#C1C497"
-
 cursor = "#D7C995"
 foreground = "#C1C497"
 background = "#111c18"
diff --git a/themes/ristretto/colors.toml b/themes/ristretto/colors.toml
index 948c4d39..b5ca9ab9 100644
--- a/themes/ristretto/colors.toml
+++ b/themes/ristretto/colors.toml
@@ -1,7 +1,4 @@
 accent = "#f38d70"
-active_border_color = "#e6d9db"
-active_tab_background = "#f9cc6c"
-
 cursor = "#c3b7b8"
 foreground = "#e6d9db"
 background = "#2c2525"
diff --git a/themes/rose-pine/colors.toml b/themes/rose-pine/colors.toml
index 1321c13d..e757ad03 100644
--- a/themes/rose-pine/colors.toml
+++ b/themes/rose-pine/colors.toml
@@ -1,7 +1,4 @@
 accent = "#56949f"
-active_border_color = "#595959"
-active_tab_background = "#fffaf3"
-
 cursor = "#cecacd"
 foreground = "#575279"
 background = "#faf4ed"
diff --git a/themes/tokyo-night/colors.toml b/themes/tokyo-night/colors.toml
index 7fb020cf..fe51dd04 100644
--- a/themes/tokyo-night/colors.toml
+++ b/themes/tokyo-night/colors.toml
@@ -1,7 +1,4 @@
 accent = "#7aa2f7"
-active_border_color = "#7aa2f7"
-active_tab_background = "#7aa2f7"
-
 cursor = "#c0caf5"
 foreground = "#a9b1d6"
 background = "#1a1b26"