diff --git a/flake.nix b/flake.nix
index 611a048..ad046e1 100755
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,10 @@
       url = "github:elwrcl/copetch";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    Hyprspace = {
+      url = "github:KZDKM/Hyprspace";
+      inputs.hyprland.follows = "hyprland";
+    };
     hyprland.url = "github:hyprwm/Hyprland";
     hyprland-plugins = {
       url = "github:hyprwm/hyprland-plugins";
diff --git a/modules/home/hypr/hyprland/general.nix b/modules/home/hypr/hyprland/general.nix
index 41d1c09..0dab1d8 100755
--- a/modules/home/hypr/hyprland/general.nix
+++ b/modules/home/hypr/hyprland/general.nix
@@ -12,15 +12,7 @@
       "col.inactive_border" = "rgba(ffffff66)";
       resize_on_border = true;
       allow_tearing = true;
-      layout = "scrolling";
-    };
-
-    scrolling = {
-      column_width = 0.45;
-      fullscreen_on_one_column = true;
-      focus_fit_method = 1;
-      follow_focus = true;
-      direction = "right";
+      layout = "dwindle";
     };
 
     decoration = {
diff --git a/modules/home/hypr/hyprland/keybinds.nix b/modules/home/hypr/hyprland/keybinds.nix
index 9996cf4..a9d9d44 100755
--- a/modules/home/hypr/hyprland/keybinds.nix
+++ b/modules/home/hypr/hyprland/keybinds.nix
@@ -12,27 +12,28 @@ in
     ];
 
     bind = [
+
       # workspace
-      "CTRL $mainMod, right, layoutmsg, focus r"
-      "CTRL $mainMod, left,  layoutmsg, focus l"
+      "CTRL $mainMod, right, workspace, r+1"
+      "CTRL $mainMod, left,  workspace, r-1"
       "CTRL $mainMod, down,  workspace, r+1"
       "CTRL $mainMod, up,    workspace, r-1"
-      "CTRL $mainMod SHIFT, right, layoutmsg, movewindowto r"
-      "CTRL $mainMod SHIFT, left,  layoutmsg, movewindowto l"
+      "CTRL $mainMod SHIFT, right, movetoworkspace, r+1"
+      "CTRL $mainMod SHIFT, left,  movetoworkspace, r-1"
       "CTRL $mainMod SHIFT, down,  movetoworkspace, r+1"
       "CTRL $mainMod SHIFT, up,    movetoworkspace, r-1"
-      "$mainMod, R,         layoutmsg, colresize +conf"
-      "$mainMod, C,         layoutmsg, center"
-      "$mainMod SHIFT, R,   layoutmsg, colresize 0.7"
 
       # interface
       "$mainMod, P,           exec, ${ipc} bar toggle"
+      "$mainMod, Tab,         overview:toggle"
       "CTRL ALT, Delete,      exec, ${ipc} sessionMenu toggle"
+
       # plugins
       "$mainMod SHIFT, S,     exec, ${ipc} plugin:screen-shot-and-record screenshot"
       "$mainMod SHIFT, Z,     exec, ${ipc} plugin:screen-shot-and-record search"
       "$mainMod SHIFT, X,     exec, ${ipc} plugin:screen-shot-and-record ocr"
       "$mainMod SHIFT, C,     exec, ${ipc} plugin:music panel"
+
       # launchers
       "$mainMod, Return,      exec, ghostty"
       "$mainMod, W,           exec, zen-beta"
@@ -41,7 +42,7 @@ in
       "$mainMod ALT, V,       exec, pavucontrol"
       "$mainMod SHIFT, V,     exec, ${ipc} launcher clipboard"
       "$mainMod SHIFT, L,     exec, ${ipc} lockScreen lock"
-      "CTRL SHIFT, Escape,      exec, ghostty -e sudo btop"
+      "CTRL SHIFT, Escape,    exec, ghostty -e sudo btop"
 
       # window management
       "$mainMod, Q,           killactive"
@@ -51,13 +52,13 @@ in
       "$mainMod ALT, P,       pin"
 
       # focus windows
-      "$mainMod, left,  layoutmsg, move -col"
-      "$mainMod, right, layoutmsg, move +col"
+      "$mainMod, left,  movefocus, l"
+      "$mainMod, right, movefocus, r"
       "$mainMod, up,    movefocus, u"
       "$mainMod, down,  movefocus, d"
 
-      "$mainMod SHIFT, left,  layoutmsg, movewindowto l"
-      "$mainMod SHIFT, right, layoutmsg, movewindowto r"
+      "$mainMod SHIFT, left,  movewindow, l"
+      "$mainMod SHIFT, right, movewindow, r"
       "$mainMod SHIFT, up,    movewindow, u"
       "$mainMod SHIFT, down,  movewindow, d"
 
@@ -89,7 +90,7 @@ in
       "$mainMod, S,       togglespecialworkspace"
       "$mainMod ALT, S,   movetoworkspacesilent, special"
 
-      #  mouse workspace navigation
+      # mouse workspace navigation
       "$mainMod, mouse_up,   workspace, +1"
       "$mainMod, mouse_down, workspace, -1"
 
@@ -99,13 +100,11 @@ in
       "$mainMod SHIFT, P, exec, playerctl play-pause"
     ];
 
-    # mouse binds
     bindm = [
       "$mainMod, mouse:272, movewindow"
       "$mainMod, mouse:273, resizewindow"
     ];
 
-    # volume and brightness binds
     bindel = [
       ", XF86AudioRaiseVolume,   exec, ${ipc} volume increase"
       ", XF86AudioLowerVolume,   exec, ${ipc} volume decrease"
@@ -113,7 +112,6 @@ in
       ", XF86MonBrightnessDown,  exec, ${ipc} brightness decrease"
     ];
 
-    # volume and media keys
     bindl = [
       ", XF86AudioMute,    exec, ${ipc} volume muteOutput"
       ", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle"
diff --git a/modules/home/hyprland.nix b/modules/home/hyprland.nix
index a7d1347..b7ced67 100755
--- a/modules/home/hyprland.nix
+++ b/modules/home/hyprland.nix
@@ -14,5 +14,9 @@
     xwayland.enable = true;
     systemd.enable = false;
     systemd.variables = [ "-all" ];
+    plugins = [
+      inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.csgo-vulkan-fix
+      inputs.Hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace
+    ];
   };
 }