diff --git a/README.md b/README.md
index 8882917..39d0cc8 100644
--- a/README.md
+++ b/README.md
@@ -29,27 +29,28 @@ The whole setup follows the [Tokyo Night](https://github.com/folke/tokyonight.nv
 
 ## Keybindings
 
-| Function                  | Keys                                                    |
-| :------------------------ | :------------------------------------------------------ |
-| Open App Launcher         | `Super + Space`                                         |
-| Open Terminal             | `Super + Enter`                                         |
-| Focus Last Window         | `Super + Tab`                                           |
-| Open Web Browser          | `Super + W`                                             |
-| Kill Active Window        | `Super + Q`                                             |
-| Toggle Fullscreen Window  | `Super + F`                                             |
-| Toggle Floating Window    | `Super + S`                                             |
-| Open Clipboard History    | `Super + C`                                             |
-| Open Emoji Picker         | `Super + E`                                             |
-| Open Color Picker         | `Super + P`                                             |
-| Lock Screen               | `Super + Ctrl + Q`                                      |
-| Open Empty Workspace      | `Super + N`                                             |
-| Switch to Workspace       | `Super + [1-9]`                                         |
-| Move Window to Workspace  | `Super + Shift + [1-9]`                                 |
-| Switch to Scratchpad      | `Super + 0`                                             |
-| Move Window to Scratchpad | `Super + Shift + 0`                                     |
-| Switch to Window          | `Super + [hjkl]` or `Move Mouse`                        |
-| Move Window               | `Super + Shift + [hjkl]` or `Super + Left Mouse Button` |
-| Resize Window             | `Super + Right Mouse Button`                            |
+| Function                       | Keys                                                    |
+| :----------------------------- | :------------------------------------------------------ |
+| Open App Launcher              | `Super + Space`                                         |
+| Open Terminal                  | `Super + Enter`                                         |
+| Focus Last Window              | `Super + Tab`                                           |
+| Open Web Browser               | `Super + W`                                             |
+| Kill Active Window             | `Super + Q`                                             |
+| Toggle Fullscreen Window       | `Super + F`                                             |
+| Toggle Floating Window         | `Super + S`                                             |
+| Open Clipboard History         | `Super + C`                                             |
+| Open Emoji Picker              | `Super + E`                                             |
+| Open Color Picker              | `Super + P`                                             |
+| Lock Screen                    | `Super + Ctrl + Q`                                      |
+| Open Empty Workspace           | `Super + N`                                             |
+| Switch to Workspace            | `Super + [1-9]`                                         |
+| Move Window to Empty Workspace | `Super + Shift + N`                                     |
+| Move Window to Workspace       | `Super + Shift + [1-9]`                                 |
+| Switch to Scratchpad           | `Super + 0`                                             |
+| Move Window to Scratchpad      | `Super + Shift + 0`                                     |
+| Switch to Window               | `Super + [hjkl]` or `Move Mouse`                        |
+| Move Window                    | `Super + Shift + [hjkl]` or `Super + Left Mouse Button` |
+| Resize Window                  | `Super + Right Mouse Button`                            |
 
 ## Terminal Commands
 
diff --git a/flake.lock b/flake.lock
index def1c97..9f63b6d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -105,11 +105,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735053786,
-        "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
+        "lastModified": 1736785676,
+        "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
+        "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1734954597,
-        "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=",
+        "lastModified": 1736441705,
+        "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "def1d472c832d77885f174089b0d34854b007198",
+        "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337",
         "type": "github"
       },
       "original": {
@@ -162,11 +162,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734649271,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "lastModified": 1736798957,
+        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
         "type": "github"
       },
       "original": {
diff --git a/home/window-manager.nix b/home/window-manager.nix
index cc6bad9..1603d9f 100644
--- a/home/window-manager.nix
+++ b/home/window-manager.nix
@@ -33,6 +33,7 @@
       monitor = "eDP-1,preferred,auto,1.5";
       # Smart gaps
       windowrulev2 = [ "bordersize 0, floating:0, onworkspace:w[tv1]" ];
+      animations.enabled = false;
       dwindle = {
         # Put new splits on the right/bottom
         force_split = 2;
@@ -81,7 +82,7 @@
         "$mod SHIFT, L, movewindow, r"
 
         # Switch workspaces
-        "$mod, N, workspace, empty"
+        "$mod, N, workspace, emptym"
         "$mod, 1, workspace, 1"
         "$mod, 2, workspace, 2"
         "$mod, 3, workspace, 3"
@@ -96,6 +97,7 @@
         "$mod, mouse_up, workspace, m-1"
 
         # Move active window to workspace
+        "$mod SHIFT, N, movetoworkspace, emptym"
         "$mod SHIFT, 1, movetoworkspace, 1"
         "$mod SHIFT, 2, movetoworkspace, 2"
         "$mod SHIFT, 3, movetoworkspace, 3"
@@ -351,15 +353,16 @@
           inner-pad = 10;
           line-height = 25;
         };
+        border.width = 3;
         colors = {
-          background = "1a1b26ff";
+          background = "15161eff";
           text = "c0caf5ff";
-          match = "ffffffff";
-          selection = "bb9af7ff";
-          selection-text = "ffffffff";
-          selection-match = "1a1b26ff";
+          match = "bb9af7ff";
+          selection = "343a55ff";
+          selection-match = "bb9af7ff";
+          selection-text = "c0caf5ff";
+          border = "bb9af7ff";
         };
-        border.radius = 0;
       };
     };
 
@@ -444,7 +447,11 @@
     mako = {
       enable = true;
       font = "FiraCode Nerd Font 9";
-      backgroundColor = "#1a1b26";
+      backgroundColor = "#15161e";
+      borderRadius = 5;
+      width = 350;
+      height = 120;
+      padding = "8,10";
       textColor = "#c0caf5";
       borderColor = "#bb9af7";
       defaultTimeout = 8000;