diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix
index 54445c3..b4b2b8a 100644
--- a/modules/desktop/hyprland.nix
+++ b/modules/desktop/hyprland.nix
@@ -84,7 +84,16 @@ in {
       # Whether to enable hyprland-session.target on hyprland startup
       systemd.enable = true;
 
+      plugins = [
+        pkgs.hyprlandPlugins.hy3
+      ];
+
       settings = {
+
+        general = {
+          layout = "hy3";
+        };
+
         input = {
           kb_layout = cfg.kb_layout;
         };
@@ -115,26 +124,26 @@ in {
           "${cfg.mod} SHIFT, SPACE, togglefloating"
 
           # Move focus
-          "${cfg.mod}, left, movefocus, l"
-          "${cfg.mod}, right, movefocus, r"
-          "${cfg.mod}, up, movefocus, u"
-          "${cfg.mod}, down, movefocus, d"
+          "${cfg.mod}, left, hy3:movefocus, l"
+          "${cfg.mod}, right, hy3:movefocus, r"
+          "${cfg.mod}, up, hy3:movefocus, u"
+          "${cfg.mod}, down, hy3:movefocus, d"
 
-          "${cfg.mod}, h, movefocus, l"
-          "${cfg.mod}, l, movefocus, r"
-          "${cfg.mod}, k, movefocus, u"
-          "${cfg.mod}, j, movefocus, d"
+          "${cfg.mod}, h, hy3:movefocus, l"
+          "${cfg.mod}, l, hy3:movefocus, r"
+          "${cfg.mod}, k, hy3:movefocus, u"
+          "${cfg.mod}, j, hy3:movefocus, d"
 
           # Move focus
-          "${cfg.mod} SHIFT, left, movewindow, l"
-          "${cfg.mod} SHIFT, right, movewindow, r"
-          "${cfg.mod} SHIFT, up, movewindow, u"
-          "${cfg.mod} SHIFT, down, movewindow, d"
+          "${cfg.mod} SHIFT, left, hy3:movewindow, l"
+          "${cfg.mod} SHIFT, right, hy3:movewindow, r"
+          "${cfg.mod} SHIFT, up, hy3:movewindow, u"
+          "${cfg.mod} SHIFT, down, hy3:movewindow, d"
 
-          "${cfg.mod} SHIFT, h, movewindow, l"
-          "${cfg.mod} SHIFT, l, movewindow, r"
-          "${cfg.mod} SHIFT, k, movewindow, u"
-          "${cfg.mod} SHIFT, j, movewindow, d"
+          "${cfg.mod} SHIFT, h, hy3:movewindow, l"
+          "${cfg.mod} SHIFT, l, hy3:movewindow, r"
+          "${cfg.mod} SHIFT, k, hy3:movewindow, u"
+          "${cfg.mod} SHIFT, j, hy3:movewindow, d"
 
           # Switch workspace
           "${cfg.mod}, 1, workspace, 1"
@@ -165,7 +174,7 @@ in {
           ", XF86AudioStop, exec, playerctl stop"
 
           # - Keyboard ---------------------------
-          "${cfg.mod} SHIFT, K, exec, hyprctl switchxkblayout kanata next"
+          "${cfg.mod}, Escape, exec, hyprctl switchxkblayout kanata next"
 
         ] ++ cfg.extraKeybindings;
 
@@ -176,7 +185,7 @@ in {
         ];
 
         bindm = [
-          "${cfg.mod}, mouse:272, movewindow"
+          "${cfg.mod}, mouse:272, hy3:movewindow"
           "${cfg.mod} SHIFT, mouse:272, resizewindow 1"
         ];
       };