diff --git a/hyprland.conf b/hyprland.conf
index 362f990..4623d4b 100644
--- a/hyprland.conf
+++ b/hyprland.conf
@@ -48,6 +48,20 @@ dwindle {
 	smart_resizing = true
 }
 
+group {
+    groupbar {
+        font_family = JetBrains Mono NF
+        font_size = 15
+        gradients = true
+        gradient_round_only_edges = false
+        gradient_rounding = 5
+        height = 25
+        indicator_height = 0
+        gaps_in = 3
+        gaps_out = 3
+    }
+}
+
 misc {
     vfr = true
     vrr = 1
diff --git a/hyprland/colours.conf b/hyprland/colours.conf
index bd5ed96..318e465 100644
--- a/hyprland/colours.conf
+++ b/hyprland/colours.conf
@@ -13,4 +13,14 @@ decoration {
     }
 }
 
+group {
+    groupbar {
+        text_color = rgb($base)
+        col.active = rgb($primary)
+        col.inactive = rgba($overlay2d4)
+        col.locked_active = rgb($primary)
+        col.locked_inactive = rgba($secondaryd4)
+    }
+}
+
 windowrulev2 = bordercolor rgb($primary) rgba($primary94), pinned:1
diff --git a/hyprland/keybinds.conf b/hyprland/keybinds.conf
index 4199f48..4166f51 100644
--- a/hyprland/keybinds.conf
+++ b/hyprland/keybinds.conf
@@ -67,6 +67,12 @@ bind = Ctrl+Super+Shift, up, movetoworkspace, special:special
 bind = Ctrl+Super+Shift, down, movetoworkspace, e+0
 bind = Super+Alt, S, movetoworkspace, special:special
 
+# Window groups
+binde = Alt, Tab, changegroupactive, f
+binde = Shift+Alt, Tab, changegroupactive, b
+bind = Super, Comma, togglegroup
+bind = Super+Shift, Comma, lockactivegroup, toggle
+
 # Window actions
 bind = Super, left, movefocus, l
 bind = Super, right, movefocus, r