diff --git a/themes/catppuccin-latte/hyprland.conf b/themes/catppuccin-latte/hyprland.conf
index afc429d4..4a72d792 100644
--- a/themes/catppuccin-latte/hyprland.conf
+++ b/themes/catppuccin-latte/hyprland.conf
@@ -1,4 +1,9 @@
+$activeBorderColor = rgb(1e66f5)
+
 general {
-    col.active_border = rgb(1e66f5)
+    col.active_border = $activeBorderColor
 }
 
+group {
+    col.border_active = $activeBorderColor
+}
diff --git a/themes/catppuccin/hyprland.conf b/themes/catppuccin/hyprland.conf
index 46ff7e64..da3374ba 100644
--- a/themes/catppuccin/hyprland.conf
+++ b/themes/catppuccin/hyprland.conf
@@ -1,3 +1,9 @@
+$activeBorderColor = rgb(c6d0f5)
+
 general {
-    col.active_border = rgb(c6d0f5)
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }
diff --git a/themes/everforest/hyprland.conf b/themes/everforest/hyprland.conf
index e88f030c..10e2c5d4 100644
--- a/themes/everforest/hyprland.conf
+++ b/themes/everforest/hyprland.conf
@@ -1,3 +1,9 @@
+$activeBorderColor = rgb(d3c6aa)
+
 general {
-    col.active_border = rgb(d3c6aa)
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }
diff --git a/themes/flexoki-light/hyprland.conf b/themes/flexoki-light/hyprland.conf
index 4e4b20a0..1baef471 100644
--- a/themes/flexoki-light/hyprland.conf
+++ b/themes/flexoki-light/hyprland.conf
@@ -1,3 +1,9 @@
+$activeBorderColor = rgba(205EA6ee)
+
 general {
-    col.active_border = rgba(205EA6ee)
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }
diff --git a/themes/gruvbox/hyprland.conf b/themes/gruvbox/hyprland.conf
index 85dbf144..029cc908 100644
--- a/themes/gruvbox/hyprland.conf
+++ b/themes/gruvbox/hyprland.conf
@@ -1,3 +1,9 @@
+$activeBorderColor = rgb(a89984)
+
 general {
-    col.active_border = rgb(a89984)
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }
diff --git a/themes/kanagawa/hyprland.conf b/themes/kanagawa/hyprland.conf
index 5153e8a8..b5b6403a 100644
--- a/themes/kanagawa/hyprland.conf
+++ b/themes/kanagawa/hyprland.conf
@@ -1,5 +1,11 @@
+$activeBorderColor = rgb(dcd7ba)
+
 general {
-    col.active_border = rgb(dcd7ba)
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }
 
 # Kanagawa backdrop is too strong for detault opacity
diff --git a/themes/matte-black/hyprland.conf b/themes/matte-black/hyprland.conf
index bb90b384..4fd7ff60 100644
--- a/themes/matte-black/hyprland.conf
+++ b/themes/matte-black/hyprland.conf
@@ -1,3 +1,9 @@
+$activeBorderColor = rgb(8A8A8D)
+
 general {
-    col.active_border = rgb(8A8A8D)
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }
diff --git a/themes/nord/hyprland.conf b/themes/nord/hyprland.conf
index bce729fe..ac91e8bb 100644
--- a/themes/nord/hyprland.conf
+++ b/themes/nord/hyprland.conf
@@ -1,3 +1,9 @@
+$activeBorderColor = rgb(D8DEE9)
+
 general {
-    col.active_border = rgb(D8DEE9)
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }
diff --git a/themes/osaka-jade/hyprland.conf b/themes/osaka-jade/hyprland.conf
index 1b8b0a9b..fd7c0363 100644
--- a/themes/osaka-jade/hyprland.conf
+++ b/themes/osaka-jade/hyprland.conf
@@ -1,4 +1,9 @@
-# focus window color (border)
+$activeBorderColor = rgb(71CEAD)
+
 general {
-    col.active_border = rgb(71CEAD)
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }
diff --git a/themes/ristretto/hyprland.conf b/themes/ristretto/hyprland.conf
index d81a993b..d8ffcdb9 100644
--- a/themes/ristretto/hyprland.conf
+++ b/themes/ristretto/hyprland.conf
@@ -1,4 +1,9 @@
+$activeBorderColor = rgb(e6d9db)
+
 general {
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
-    col.active_border = rgb(e6d9db)
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }
diff --git a/themes/rose-pine/hyprland.conf b/themes/rose-pine/hyprland.conf
index ae0f2b6b..34d47643 100644
--- a/themes/rose-pine/hyprland.conf
+++ b/themes/rose-pine/hyprland.conf
@@ -1,3 +1,9 @@
+$activeBorderColor = rgb(575279)
+
 general {
-    col.active_border = rgb(575279)
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }
diff --git a/themes/tokyo-night/hyprland.conf b/themes/tokyo-night/hyprland.conf
index f0b824a1..779a27d4 100644
--- a/themes/tokyo-night/hyprland.conf
+++ b/themes/tokyo-night/hyprland.conf
@@ -1,4 +1,10 @@
+$activeBorderColor = rgba(33ccffee) rgba(00ff99ee) 45deg
+
 general {
-    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.active_border = $activeBorderColor
+}
+
+group {
+    col.border_active = $activeBorderColor
 }