diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix
index 16995d4..f281de7 100644
--- a/modules/home/hyprland/default.nix
+++ b/modules/home/hyprland/default.nix
@@ -41,12 +41,14 @@
           "Unknown-1,disable"
           # North
           "DP-1,2560x1440@144,0x0,1"
-          ",preferred,auto,1,mirror,DP-1"
+          "HDMI-A-1,2560x1440@60,-1440x-617,1,transform,1"
           # Inspiron
           "eDP-1,1920x1080@60,0x0,1"
           ",preferred,auto,1,mirror,eDP-1"
         ];
 
+        workspace = [ "m[HDMI-A-1],layoutopt:orientation:top" ];
+
         input = {
           kb_layout = "de";
           kb_variant = "nodeadkeys";
diff --git a/modules/home/hyprland/keybinds.nix b/modules/home/hyprland/keybinds.nix
index 1186d17..5712067 100644
--- a/modules/home/hyprland/keybinds.nix
+++ b/modules/home/hyprland/keybinds.nix
@@ -49,15 +49,10 @@
       bind = SUPER SHIFT, M, togglespecialworkspace, minimize
 
       # Switch workspace
-      ${lib.concatMapStringsSep "\n" (n: "bind = SUPER, ${toString n}, workspace, ${toString n}") (
-        lib.range 1 9
-      )}
-      ${lib.concatMapStringsSep "\n" (
-        n: "bind = SUPER SHIFT, ${toString n}, movetoworkspacesilent, ${toString n}"
-      ) (lib.range 1 9)}
-      ${lib.concatMapStringsSep "\n" (
-        n: "bind = SUPER CONTROL, ${toString n}, movetoworkspace, ${toString n}"
-      ) (lib.range 1 9)}
+      ${lib.concatMapStringsSep "\n" (n: ''
+        bind = SUPER, ${toString n}, focusworkspaceoncurrentmonitor, ${toString n}
+        bind = SUPER SHIFT, ${toString n}, movetoworkspacesilent, ${toString n}
+      '') (lib.range 1 9)}
 
       # Scroll through workspaces
       bind = SUPER, mouse_down, workspace, e-1
diff --git a/wrappers/waybar/config.jsonc b/wrappers/waybar/config.jsonc
index 23c01bf..ea4fb56 100644
--- a/wrappers/waybar/config.jsonc
+++ b/wrappers/waybar/config.jsonc
@@ -1,4 +1,5 @@
 {
+    "output": ["DP-1", "eDP-1"],
     "layer": "top",
     "position": "bottom",
     "spacing": 10,