diff --git a/modules/home-manager/eww/eww.scss b/modules/home-manager/eww/eww.scss
index 78e8a1d..2b26d6d 100644
--- a/modules/home-manager/eww/eww.scss
+++ b/modules/home-manager/eww/eww.scss
@@ -84,6 +84,7 @@ $rosewater: #f5e0dc;
 }
 
 .workspace {
+  /* height: 100%; */
   padding-left: 10px;
   padding-right: 10px;
   color: #666666;
diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
index 37a1817..983e512 100644
--- a/modules/home-manager/hyprland.nix
+++ b/modules/home-manager/hyprland.nix
@@ -58,8 +58,9 @@ in {
         # NOTE: maybe check out hypridle?
         (lib.concatStringsSep " " [
           "swayidle -w"
-          "timeout 300  'notify-send \"Idling in 300 seconds\"' resume 'notify-send \"Idling cancelled.\"'"
-          "timeout 480  'notify-send -u critical \"Idling in 120 seconds\"'"
+          "before-sleep 'swaylock'"
+          "timeout 300 'notify-send \"Idling in 5 minutes\"' resume 'notify-send \"Idling cancelled.\"'"
+          "timeout 480  'notify-send -u critical \"Idling in 2 minutes\"'"
           "timeout 510  'notify-send -u critical \"Idling in 90 seconds\"'"
           "timeout 540  'notify-send -u critical \"Idling in 60 seconds!\"'"
           "timeout 570  'notify-send -u critical \"Idling in 30 seconds!\"'"
@@ -73,12 +74,9 @@ in {
           "timeout 597  'notify-send -u critical \"Idling in 3 seconds!\"'"
           "timeout 598  'notify-send -u critical \"Idling in 2 seconds!\"'"
           "timeout 599  'notify-send -u critical \"Idling in 1 second!\"'"
-          "timeout 600  'swaylock --daemonize'"
+          "timeout 600  'swaylock -f'"
           "timeout 600  'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'"
-          "after-resume       'maybe-good-morning'"
-          "before-sleep 'swaylock --daemonize'"
         ])
-        ''swayidle -w timeout 600 'notify-send "Locking in 30 seconds..."' timeout 630 'swaylock -f' timeout 660 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on && maybe-good-morning' before-sleep 'swaylock -f'"''
       ];
 
       env = [
@@ -184,10 +182,10 @@ in {
         "$mod, l, movefocus, r"
         "$mod, k, movefocus, u"
         "$mod, j, movefocus, d"
-        "$mod SHIFT, H, swapwindow, l"
-        "$mod SHIFT, L, swapwindow, r"
-        "$mod SHIFT, K, swapwindow, u"
-        "$mod SHIFT, J, swapwindow, d"
+        "$mod SHIFT, H, movewindow, l"
+        "$mod SHIFT, L, movewindow, r"
+        "$mod SHIFT, K, movewindow, u"
+        "$mod SHIFT, J, movewindow, d"
 
         "$mod SHIFT, V, exec, swayosd-client --input-volume mute-toggle"
         ", XF86AudioMicMute, exec, swayosd-client --input-volume mute-toggle"
@@ -236,7 +234,7 @@ in {
         "CTRL SHIFT $mod, L, exec, swaylock"
         "$mod CTRL, space, exec, makoctl dismiss"
         "$mod SHIFT CTRL, space, exec, makoctl restore"
-        "$mod SHIFT, space, exec, makoctl invoke"
+        "$mod SHIFT, space, exec, makoctl invoke default"
         "$mod, E, exec, thunar"
       ];
 
diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix
index c5ccab4..56f7128 100644
--- a/modules/home-manager/sway.nix
+++ b/modules/home-manager/sway.nix
@@ -33,8 +33,10 @@
       on-notify=exec ${pkgs.mpv}/bin/mpv --volume=50 ~/.notify.wav
       actions=1
       icons=1
+      width=400
+      height=150
 
-      background-color=${bg}AA
+      background-color=${bg}DD
       text-color=${text}
       border-color=${primary}
       progress-color=${primary}