diff --git a/.config/sway/config b/.config/sway/config
index c3dc02c..ff9efe9 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -144,6 +144,9 @@ bindsym $mod+Shift+g exec grimshot save area
 bindsym $mod+Mod1+g  exec grimshot save output
 bindsym $mod+Ctrl+g exec grimshot save window
 
+# Turn the system off
+bindsym $mod+Shift+e exec swaynag -t custom -m 'What action would you like to perform?' -b 'Shutdown' 'poweroff' -b 'Restart' 'poweroff --reboot' -b 'Suspend' 'systemctl suspend'
+
 # Notifications
 exec_always --no-startup-id dunst
 
@@ -192,12 +195,10 @@ for_window [app_id="galendae"] floating enable, sticky enable, move position cur
 # This will lock your screen after 300 seconds of inactivity, then turn off
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
-exec swayidle -w \
-     timeout 300 'swaylock -f' \
-     timeout 1200 'swaymsg "output * dpms off"' \
-     resume 'swaymsg "output * dpms on"' \
-     timeout \
-     before-sleep 'swaylock -f'
+exec swayidle -w timeout 60 'swaylock -f' \
+     # timeout 600 'swaymsg "output * dpms off"' \
+     # resume 'swaymsg "output * dpms on"' \
+     # before-sleep 'swaylock -f'
 
 ### Input configuration
 #
diff --git a/.config/zsh/zsh_aliases b/.config/zsh/zsh_aliases
index 9af87fc..53f8d77 100644
--- a/.config/zsh/zsh_aliases
+++ b/.config/zsh/zsh_aliases
@@ -2,7 +2,7 @@
 alias install="sudo pacman -S"
 alias remove="sudo pacman -R"
 alias search="pacman -Ss"
-alias upgrade="sudo pacman -Syyu"
+alias update="sudo pacman -Syyu"
 
 # ~ Commands ~ #
 alias ip="ip -c"
diff --git a/desktop.org b/desktop.org
index 3a47675..b110189 100644
--- a/desktop.org
+++ b/desktop.org
@@ -166,11 +166,9 @@ bindsym $mod+Mod1+g  exec grimshot save output
 bindsym $mod+Ctrl+g exec grimshot save window
 #+end_src
 *** Swaynag
-#+begin_src shell
-# Exit sway (logs you out of your Wayland session)
-bindsym $mod+Shift+e exec swaynag -t custom -m 'Do you wish to fully reload your Sway session?' -b 'Yes' 'swaymsg exit'
+#+begin_src shell :tangle ~/dotfiles/.config/sway/config :mkdirp yes
 # Turn the system off
-bindsym $mod+p exec swaynag -t custom -m 'What action would you like to perform?' -b 'Shutdown' 'poweroff' -b 'Restart' 'poweroff --reboot' -b 'Suspend' 'systemctl suspend'
+bindsym $mod+Shift+e exec swaynag -t custom -m 'What action would you like to perform?' -b 'Shutdown' 'poweroff' -b 'Restart' 'poweroff --reboot' -b 'Suspend' 'systemctl suspend'
 #+end_src
 ** Autostart
 #+begin_src shell :tangle ~/dotfiles/.config/sway/config :mkdirp yes
@@ -230,12 +228,10 @@ for_window [app_id="galendae"] floating enable, sticky enable, move position cur
 # This will lock your screen after 300 seconds of inactivity, then turn off
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
-exec swayidle -w \
-     timeout 300 'swaylock -f' \
-     timeout 1200 'swaymsg "output * dpms off"' \
-     resume 'swaymsg "output * dpms on"' \
-     timeout \
-     before-sleep 'swaylock -f'
+exec swayidle -w timeout 60 'swaylock -f' \
+     # timeout 600 'swaymsg "output * dpms off"' \
+     # resume 'swaymsg "output * dpms on"' \
+     # before-sleep 'swaylock -f'
 #+end_src
 ** Input
 *** Keyboard
@@ -711,7 +707,7 @@ FUNCTION_LOCATION="$XDG_CONFIG_HOME/zsh/zsh_functions"
 alias install="sudo pacman -S"
 alias remove="sudo pacman -R"
 alias search="pacman -Ss"
-alias upgrade="sudo pacman -Syyu"
+alias update="sudo pacman -Syyu"
 
 # ~ Commands ~ #
 alias ip="ip -c"