diff --git a/default/hypr/bindings/tiling.conf b/default/hypr/bindings/tiling.conf
index a0e0f0b..ea9c36a 100644
--- a/default/hypr/bindings/tiling.conf
+++ b/default/hypr/bindings/tiling.conf
@@ -69,3 +69,24 @@ bindd = SUPER, MOUSE_UP, Scroll active workspace backward, workspace, e-1
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindmd = SUPER, mouse:272, Move window, movewindow
 bindmd = SUPER, mouse:273, Resize window, resizewindow
+
+# Toggle groups
+bindd = SUPER ALT, RETURN, Toggle window grouping, togglegroup
+bindd = SUPER ALT, BACKSPACE, Move active window out of group, moveoutofgroup
+
+# Join groups
+bindd = SUPER ALT, LEFT, Move window to group on left, moveintogroup, l
+bindd = SUPER ALT, RIGHT, Move window to group on right, moveintogroup, r
+bindd = SUPER ALT, UP, Move window to group on top, moveintogroup, u
+bindd = SUPER ALT, DOWN, Move window to group on bottom, moveintogroup, d
+
+# Navigate a single set of grouped windows
+bindd = SUPER ALT, TAB, Next window in group, changegroupactive, f
+bindd = SUPER ALT SHIFT, TAB, Previous window in group, changegroupactive, b
+
+# Activate window in a group by number
+bindd = SUPER ALT, 1, Switch to group window 1, changegroupactive, 1
+bindd = SUPER ALT, 2, Switch to group window 2, changegroupactive, 2
+bindd = SUPER ALT, 3, Switch to group window 3, changegroupactive, 3
+bindd = SUPER ALT, 4, Switch to group window 4, changegroupactive, 4
+bindd = SUPER ALT, 5, Switch to group window 5, changegroupactive, 5
diff --git a/default/hypr/looknfeel.conf b/default/hypr/looknfeel.conf
index f4b4a44..488f410 100644
--- a/default/hypr/looknfeel.conf
+++ b/default/hypr/looknfeel.conf
@@ -1,5 +1,9 @@
 # Refer to https://wiki.hyprland.org/Configuring/Variables/
 
+# Variables
+$activeBorderColor = rgba(33ccffee) rgba(00ff99ee) 45deg
+$inactiveBorderColor = rgba(595959aa)
+
 # https://wiki.hyprland.org/Configuring/Variables/#general
 general {
     gaps_in = 5
@@ -8,8 +12,8 @@ general {
     border_size = 2
 
     # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
-    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-    col.inactive_border = rgba(595959aa)
+    col.active_border = $activeBorderColor
+    col.inactive_border = $inactiveBorderColor
 
     # Set to true enable resizing windows by clicking and dragging on borders and gaps
     resize_on_border = false
@@ -41,6 +45,38 @@ decoration {
     }
 }
 
+# https://wiki.hypr.land/Configuring/Variables/#group
+group {
+    col.border_active = $activeBorderColor
+    col.border_inactive = $inactiveBorderColor
+    col.border_locked_active = -1
+    col.border_locked_inactive = -1
+
+    groupbar {
+        font_size = 12
+        font_family = monospace
+        font_weight_active = ultraheavy
+        font_weight_inactive = normal
+
+        indicator_height = 0
+        indicator_gap = 5
+        height = 22
+		gaps_in = 5
+		gaps_out = 0
+
+        text_color = rgb(ffffff)
+        text_color_inactive = rgba(ffffff90)
+    	col.active = rgba(00000040)
+    	col.inactive = rgba(00000020)
+
+        gradients = true
+        gradient_rounding = 0
+        gradient_round_only_edges = false
+
+    }
+}
+
+
 # https://wiki.hyprland.org/Configuring/Variables/#animations
 animations {
     enabled = yes, please :)