diff --git a/nixos/modules/desktop/hyprland/default.nix b/nixos/modules/desktop/hyprland/default.nix
index 73ace5d..d4ed030 100644
--- a/nixos/modules/desktop/hyprland/default.nix
+++ b/nixos/modules/desktop/hyprland/default.nix
@@ -21,11 +21,14 @@ in {
         swaybg
         waybar
         waycorner
+        playerctl
         wlsunset
         wl-clipboard # Copying to system clipboard in vim
         wl-mirror # Mirror an output
         wdisplays # Tool to configure displays
 
+        swaylock-effects
+
         glib
 
         libva
diff --git a/nixos/users/tdpeuter/dotfiles.nix b/nixos/users/tdpeuter/dotfiles.nix
index 53d0e4d..aca5ba8 100644
--- a/nixos/users/tdpeuter/dotfiles.nix
+++ b/nixos/users/tdpeuter/dotfiles.nix
@@ -63,7 +63,7 @@ in {
               source = ../../../stow/swayidle/.config/swayidle;
             };
             ".config/swaylock" = {
-              inherit (config.sisyphus.desktop.sway) enable;
+              enable = config.sisyphus.desktop.sway.enable || config.sisyphus.desktop.hyprland.enable;
               source = ../../../stow/swaylock/.config/swaylock;
             };
             ".config/vifm" = {
diff --git a/stow/hyprland/.config/hypr/hyprland.conf b/stow/hyprland/.config/hypr/hyprland.conf
index e692826..73bfa92 100644
--- a/stow/hyprland/.config/hypr/hyprland.conf
+++ b/stow/hyprland/.config/hypr/hyprland.conf
@@ -249,6 +249,9 @@ exec-once = wlsunset -t 2500 -l 50.51 -L 4.21
 
 exec-once = nextcloud --background
 
+# Turn volume off at boot
+exec-once = pactl set-sink-mute @DEFAULT_SINK@ 1
+
 # STYLING
 exec-once = swaybg -i "${HOME}/.local/state/sisyphus/bg" --mode=fill
 env = XCURSOR_SIZE,24
diff --git a/stow/hyprland/.config/hypr/keybinds.conf b/stow/hyprland/.config/hypr/keybinds.conf
index 514e5f0..880a1f8 100644
--- a/stow/hyprland/.config/hypr/keybinds.conf
+++ b/stow/hyprland/.config/hypr/keybinds.conf
@@ -131,6 +131,30 @@ bind = $flag+Alt+Shift, $right, movetoworkspace, e+1
 bind = $flag+Alt+Shift, left,  movetoworkspace, e-1
 bind = $flag+Alt+Shift, right,  movetoworkspace, e+1
 
+# System
+
+# Brightness
+bind = , XF86MonBrightnessDown,     exec, brightnessctl -e s 5%- && $notify -b
+bind = , XF86MonBrightnessUp,       exec, brightnessctl -e s +5% && $notify -b
+
+# Audio
+bind = , XF86AudioRaiseVolume,      exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 2%+ && $notify -v
+bind = , XF86AudioLowerVolume,      exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%- && $notify -v
+bind = , XF86AudioMute,             exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && $notify -v
+bind = , XF86AudioMicMute,          exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+
+# Media
+bind = , XF86AudioPlay,             exec, playerctl play-pause
+bind = , XF86AudioPrev,             exec, playerctl previous
+bind = , XF86AudioNext,             exec, playerctl next
+
+bind = Shift, XF86AudioMute,        exec, playerctl play-pause
+bind = Shift, XF86AudioLowerVolume, exec, playerctl previous
+bind = Shift, XF86AudioRaiseVolume, exec, playerctl next
+
+# Other special keys
+bind = , XF86Calculator,            exec, qalculate-gtk
+
 # Shortcuts
 
 # Reload