diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index e6aee74..b271d4c 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -16,6 +16,13 @@ $joplin_class = @joplin/app-desktop
 $bitwarden_class = Bitwarden
 $element_class = Element
 $discord_class = WebCord
+$deezer_class = Deezer
+
+# Colors
+$col_accentdark = rgb(9933ff)
+$col_accentlight = rgb(d966ff)
+$col_inactive = rgba(80808080)
+$col_textlight = rgba(ffffffe8)
 
 # Plugins
 plugin = /usr/lib/libhy3.so
diff --git a/config/hypr/hyprland.d/bindings.conf b/config/hypr/hyprland.d/bindings.conf
index c0bbf2f..19f3199 100644
--- a/config/hypr/hyprland.d/bindings.conf
+++ b/config/hypr/hyprland.d/bindings.conf
@@ -15,13 +15,12 @@ bind = SUPER, X,  workspace, 9
 bind = SUPER, W,  workspace, 10
 bind = SUPER, mouse_down, workspace, e-1
 bind = SUPER, mouse_up, workspace, e+1
+bind = SUPER Alt_L, Return, exec, hyprswapworkspaces
 
 # Windows
-bind = SUPER SHIFT, Q, killactive
-bind = SUPER SHIFT,       F, fullscreen
-bind = SUPER SHIFT Alt_L, F, fakefullscreen
 bindm = SUPER, mouse:272, movewindow
 bindm = SUPER, mouse:273, resizewindow
+bind = SUPER SHIFT, Q, hy3:killactive
 bind = SUPER SHIFT, 10, movetoworkspacesilent, 1
 bind = SUPER SHIFT, 11, movetoworkspacesilent, 2
 bind = SUPER SHIFT, 12, movetoworkspacesilent, 3
@@ -32,18 +31,28 @@ bind = SUPER SHIFT, V,  movetoworkspacesilent, 7
 bind = SUPER SHIFT, C,  movetoworkspacesilent, 8
 bind = SUPER SHIFT, X,  movetoworkspacesilent, 9
 bind = SUPER SHIFT, W,  movetoworkspacesilent, 10
-bind = SUPER Alt_L, space, togglefloating
 bind = SUPER SHIFT, space, pin, active
+bind = SUPER SHIFT, A, hy3:movewindow, l
+bind = SUPER SHIFT, Z, hy3:movewindow, u
+bind = SUPER SHIFT, S, hy3:movewindow, d
+bind = SUPER SHIFT, D, hy3:movewindow, r
+bind = SUPER Alt_L, space, togglefloating
+bind = SUPER Alt_L, F, fullscreen
+bind = SUPER SHIFT Alt_L, F, fakefullscreen
 
 # Focus
 bind = SUPER, A, hy3:movefocus, l
 bind = SUPER, Z, hy3:movefocus, u
 bind = SUPER, S, hy3:movefocus, d
 bind = SUPER, D, hy3:movefocus, r
+bindn = , mouse:272, hy3:focustab, mouse
+bindn = , mouse_up,   hy3:focustab, r, require_hovered, wrap
+bindn = , mouse_down, hy3:focustab, l, require_hovered, wrap
 
 # Groups
-bind = SUPER, Q, hy3:makegroup, h
+bind = SUPER, Q, hy3:makegroup, tab, force_ephemeral
 bind = SUPER, E, hy3:changegroup, opposite
+bind = SUPER, B, hy3:changegroup, toggletab
 
 # Global
 bind = SUPER SHIFT, BackSpace, exit
@@ -66,4 +75,15 @@ bind = SHIFT Alt_L, Print, exec, glurp area file
 bind = SUPER, L, exec, $locker
 
 # Sound
-# TODO
+binde = SUPER, Prior, exec, swayosd-client --output-volume=raise
+binde = SUPER, Next,  exec, swayosd-client --output-volume=lower
+
+# Resize
+bind = SUPER Alt_L, R, submap, resize
+submap = resize
+binde = , A, resizeactive, -25 0
+binde = , Z, resizeactive, 0 -25
+binde = , S, resizeactive, 0 25
+binde = , D, resizeactive, 25 0
+bind = , escape, submap, reset 
+submap = reset
diff --git a/config/hypr/hyprland.d/general.conf b/config/hypr/hyprland.d/general.conf
index 1b865b7..7265ab3 100644
--- a/config/hypr/hyprland.d/general.conf
+++ b/config/hypr/hyprland.d/general.conf
@@ -2,9 +2,9 @@
 general {
     # Borders
     border_size = 2
-    col.inactive_border = rgba(80808080)
-    col.nogroup_border = rgba(80808080)
-    col.active_border = rgb(9933ff) rgb(d966ff) 270deg
+    col.inactive_border = $col_inactive
+    col.nogroup_border = $col_inactive
+    col.active_border = $col_accentdark $col_accentlight 90deg
     col.nogroup_border_active = rgb(00cc66) rgb(33ff99) 270deg
     resize_on_border = false
 
diff --git a/config/hypr/hyprland.d/plugin.conf b/config/hypr/hyprland.d/plugin.conf
index 6d5972c..d6746ce 100644
--- a/config/hypr/hyprland.d/plugin.conf
+++ b/config/hypr/hyprland.d/plugin.conf
@@ -6,5 +6,29 @@ plugin {
 
         # Groups
         node_collapse_policy = 0
+
+        # Tabs
+        tabs {
+            height = 15
+            padding = 5
+            from_top = true
+            rounding = 8
+            render_text = true
+            text_center = false
+            text_font = Hack Nerd Font
+            text_height = 8
+            text_padding = 10
+            col.active = $col_accentdark
+            col.urgent = rgb(ffd966)
+            col.inactive = $col_inactive
+            col.text.active = $col_textlight
+            col.text.urgent = rgba(000000e8)
+            col.text.inactive = $col_textlight
+        }
+
+        # Autotile
+        autotile {
+            enable = true
+        }
     }
 }
diff --git a/config/hypr/hyprland.d/windowrules.conf b/config/hypr/hyprland.d/windowrules.conf
index 6f9587f..f3743d0 100644
--- a/config/hypr/hyprland.d/windowrules.conf
+++ b/config/hypr/hyprland.d/windowrules.conf
@@ -3,3 +3,4 @@ windowrulev2 = workspace 4 silent, class:($joplin_class)
 windowrulev2 = workspace 4 silent, class:($bitwarden_class)
 windowrulev2 = workspace 4 silent, class:($element_class)
 windowrulev2 = workspace 4 silent, class:($discord_class)
+windowrulev2 = workspace 4 silent, class:($deezer_class)