diff --git a/bash/.bashrc b/bash/.bashrc
index d145f7a..baa7664 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -5,6 +5,7 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
+# General aliases
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias nano='nano -i'
@@ -13,7 +14,10 @@ alias ls='eza -l --icons'
 alias ll='eza -la --icons'
 alias ip='ip -c'
 alias vim='nvim'
+alias cat='bat'
+alias grep='rg'
 
+# Directory management alaiases
 alias cp='cp -v'
 alias mv='mv -v'
 alias rm='rm -v'
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index fb74338..b781afa 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -49,10 +49,10 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 #
 # Example configuration:
 #
-# exec swayidle -w \
-#          timeout 300 'swaylock -f -c 000000' \
-#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
-#          before-sleep 'swaylock -f -c 000000'
+ exec swayidle -w \
+          timeout 300 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
+          timeout 60 'swaylock -f -c 000000'' \
+          before-sleep 'swaylock -f -c 000000'
 #
 # 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