diff --git a/.config/sway/config b/.config/sway/config
index 610b22f..c732cbb 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -37,13 +37,15 @@ bindsym Shift+F6 move container to workspace 6
 bindsym Shift+F7 move container to workspace 7
 bindsym Shift+F8 move container to workspace 8
 bindsym Shift+F9 move container to workspace 9
+bindsym Mod4+Shift+c kill
 bindsym Mod4+Return exec alacritty
 bindsym Mod4+p exec rofi -font "Roboto Mono 10" -show run
 bindsym Mod4+l exec swaylock -c 000000 -i /home/dln/i3lock.png
+bindsym Mod4+space exec makoctl dismiss -a
 
 floating_modifier Mod4
-bindsym Mod4+Shift+space floating toggle
-bindsym Mod4+space focus mode_toggle
+bindsym Mod4+Shift+f floating toggle
+bindsym Mod4+f focus mode_toggle
 
 hide_edge_borders both
 smart_borders on
diff --git a/.config/systemd/user/mako.service b/.config/systemd/user/mako.service
new file mode 100644
index 0000000..6051304
--- /dev/null
+++ b/.config/systemd/user/mako.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=A lightweight Wayland notification daemon
+Documentation=man:mako(1)
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/mako --font 'IBM Plex Sans 20' --anchor bottom-right --margin 5
+
+[Install]
+WantedBy=sway-session.target
diff --git a/.config/systemd/user/swayidle.service b/.config/systemd/user/swayidle.service
new file mode 100644
index 0000000..e20975d
--- /dev/null
+++ b/.config/systemd/user/swayidle.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Idle manager for Wayland
+Documentation=man:swayidle(1)
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/swayidle -w \
+            timeout 300 'swaylock -f -c 000000 -i /home/dln/i3lock.png' \
+            timeout 600 'swaymsg "output * dpms off"' \
+                resume 'swaymsg "output * dpms on"' \
+            before-sleep 'swaylock -f -c 000000 -i /home/dln/i3lock.png'
+
+[Install]
+WantedBy=sway-session.target