diff --git a/home/dot_config/hypr/hyprland.conf.tmpl b/home/dot_config/hypr/hyprland.conf.tmpl
new file mode 100644
index 00000000..0b8eeb30
--- /dev/null
+++ b/home/dot_config/hypr/hyprland.conf.tmpl
@@ -0,0 +1,63 @@
+$mod = SUPER
+$term = kitty
+$e = & hyprctl dispatch submap reset
+
+source = ~/.config/hypr/monitors.conf
+source = ~/.config/hypr/workspaces.conf
+source = ~/.config/hypr/keybinds.conf
+source = ~/.config/hypr/windows.conf
+source = ~/.config/hypr/start.conf
+
+env = XCURSOR_SIZE,24
+
+input {
+    kb_layout = us
+    kb_variant =
+    kb_model =
+    kb_options =
+    kb_rules =
+    follow_mouse = 1
+    touchpad {
+        natural_scroll = no
+    }
+    sensitivity = 0
+}
+
+group {
+    col.border_active = rgba({{ .themes.gruvbox.purple0 }}ff)
+    col.border_inactive  = rgba({{ .themes.gruvbox.purple1 }}ff)
+    groupbar {
+        enabled = false
+    }
+}
+
+general {
+    gaps_in = 2
+    gaps_out = 2
+    border_size = 2
+    col.active_border = rgba({{ .themes.gruvbox.yellow }}ff)
+    col.inactive_border = rgba({{ .themes.gruvbox.bg0 }}ff)
+    layout = master
+    allow_tearing = false
+}
+
+decoration {
+    rounding = 2
+}
+
+animations {
+    enabled = no # animations are bloat ;)
+}
+
+master {
+    new_is_master = false
+    mfact = 0.5
+}
+
+gestures {
+    workspace_swipe = off
+}
+
+misc {
+    force_default_wallpaper = 0
+}
diff --git a/home/dot_config/hypr/keybinds.conf b/home/dot_config/hypr/keybinds.conf
index 53335d54..d37bdcfc 100644
--- a/home/dot_config/hypr/keybinds.conf
+++ b/home/dot_config/hypr/keybinds.conf
@@ -3,6 +3,7 @@ bind = $mod SHIFT, return, exec, $term
 bind = $mod, d, killactive, 
 bind = $mod, t, togglefloating, 
 bind = $mod, f, fullscreen, 
+bind = $mod, tab, changegroupactive 
 
 # Audio
 bindl = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +2%
@@ -12,8 +13,8 @@ bindl = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
 # Utility commands 
 bind = $mod, x, submap, utility
 submap = utility
-bind = , s, exec, shutdown now
-bind = , r, exec, reboot
+bind =  , s, exec, shutdown now
+bind =  , r, exec, reboot
 bind =  , q, exit, 
 bind =  , g, exec, ~/.config/hypr/scripts/gamemode.sh $e
 binde = , h, resizeactive, -50 0
@@ -23,6 +24,26 @@ binde = , l, resizeactive, 50 0
 bind =  , 1, exec, ~/.config/hypr/scripts/audio-device-switcher.sh 1 $e
 bind =  , 2, exec, ~/.config/hypr/scripts/audio-device-switcher.sh 2 $e
 bind =  , 3, exec, ~/.config/hypr/scripts/audio-device-switcher.sh 3 $e
+bind =  , escape, submap, reset 
+submap = reset
+
+# Group commands 
+bind = $mod, g, submap, group
+submap = group
+bind = , g, togglegroup 
+bind = , h, moveintogroup, l 
+bind = , j, moveintogroup, d 
+bind = , k, moveintogroup, u 
+bind = , l, moveintogroup, r 
+bind = , o, moveoutofgroup
+
+# Reset submap after commands 
+bind = , g, submap, reset 
+bind = , h, submap, reset 
+bind = , j, submap, reset 
+bind = , k, submap, reset 
+bind = , l, submap, reset 
+bind = , o, submap, reset 
 bind = , escape, submap, reset 
 submap = reset
 
@@ -34,7 +55,7 @@ bind = $mod SHIFT, k, layoutmsg, swapprev
 bind = $mod, p, focuscurrentorlast 
 bind = $mod, m, layoutmsg, focusmaster
 bind = $mod SHIFT, m, layoutmsg, swapwithmaster
-bind = $mod, tab, layoutmsg, orientationcycle
+bind = $mod, space, layoutmsg, orientationcycle
 bind = $mod, period, layoutmsg, addmaster 
 bind = $mod, comma, layoutmsg, removemaster