diff --git a/.Xresources b/.Xresources
index edcf58e..fb91125 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,7 +1,6 @@
 ! Terminal Customization
 URxvt.depth: 32
 URxvt.background: [80]#000000
-!Urxvt*buffered: true
 URxvt.foreground: #ffffff
 URxvt.internalBorder: 10
 URxvt.scrollBar: false
diff --git a/.config/i3/config b/.config/i3/config
index 18b5709..7f37e54 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -167,12 +167,9 @@ client.focused_inactive #333333 #222222 #888888 #292d2e #eeeeee
 client.unfocused #333333 #222222 #888888 #292d2e #eeeeee
 
 # Startup Applications
-exec --no-startup-id "$HOME/.screenlayout/launch.sh"
-exec --no-startup-id "xmodmap $HOME/.Xmodmap"
-exec --no-startup-id "polybar"
-exec --no-startup-id "lxpolkit &"
-exec --no-startup-id "dex -a"
-
-# Tweak keyboard and trackpad
-exec --no-startup-id "synclient VertEdgeScroll=1 VertScrollDelta=-111"
-exec --no-startup-id "setxkbmap -option caps:escape"
+exec --no-startup-id "$HOME/.screenlayout/launch.sh" # load xrandr screen layout
+exec --no-startup-id "xmodmap $HOME/.Xmodmap" # update capslock key
+exec --no-startup-id "lxpolkit &" # start authentication agent (prompt)
+exec --no-startup-id "xcompmgr &" # startup composition manager (transparency)
+exec --no-startup-id "polybar" # status bar
+exec --no-startup-id "dex -a" # run autostart desktop apps
diff --git a/.xinitrc b/.xinitrc
index 42fb774..f1e075b 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -30,6 +30,5 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
 fi
 
 feh --bg-scale $HOME/Pictures/wallpaper.jpg &
-flameshot &
 $HOME/.screenlayout/launch.sh &
 exec i3
diff --git a/.zshrc b/.zshrc
index f6ec7c4..4b5a710 100644
--- a/.zshrc
+++ b/.zshrc
@@ -184,10 +184,8 @@ if [ -f /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh ]; then
 fi
 
 # Load zplug and extensions
-if [ -f "/usr/share/zplug/init.zsh" ]; then
-    source /usr/share/zplug/init.zsh
-elif [ -f "/usr/share/zsh/scripts/zplug/init.zsh" ]; then
-    source /usr/share/zsh/scripts/zplug/init.zsh
+if [ -f "$HOME/.zplug/init.zsh" ]; then
+    source "$HOME/.zplug/init.zsh"
 elif [ -f "/opt/homebrew/Cellar/zplug/2.4.2/init.zsh" ]; then
     source "/opt/homebrew/Cellar/zplug/2.4.2/init.zsh"
 fi
@@ -196,19 +194,15 @@ zplug romkatv/powerlevel10k, as:theme, depth:1
 zplug load
 
 # Source completion and highlighting scripts
-if [ -f "/usr/share/doc/fzf/examples/completion.zsh" ]; then
-    source /usr/share/doc/fzf/examples/completion.zsh
-elif [ -f "/usr/share/fzf/completion.zsh" ]; then
-    source /usr/share/fzf/completion.zsh
+if [ -f "/usr/share/fzf/completion.zsh" ]; then
+    source "/usr/share/fzf/completion.zsh"
 elif [ -f /opt/homebrew/Cellar/fzf/*/shell/completion.zsh ]; then
     source /opt/homebrew/Cellar/fzf/*/shell/completion.zsh
 else
     echo "completion.zsh not installed"
 fi
 
-if [ -f "/usr/share/doc/fzf/examples/key-bindings.zsh" ]; then
-    source /usr/share/doc/fzf/examples/key-bindings.zsh
-elif [ -f "/usr/share/fzf/key-bindings.zsh" ]; then
+if [ -f "/usr/share/fzf/key-bindings.zsh" ]; then
     source /usr/share/fzf/key-bindings.zsh
 elif [ -f /opt/homebrew/Cellar/fzf/*/shell/key-bindings.zsh ]; then
     source /opt/homebrew/Cellar/fzf/*/shell/key-bindings.zsh
@@ -216,10 +210,8 @@ else
     echo "key-bidings.zsh not installed"
 fi
 
-if [ -f "/usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh" ]; then
-    source /usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-elif [ -f "/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh" ]; then
-    source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+if [ -f "/usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh" ]; then
+    source /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
 elif [ -f "/opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ]; then
     source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 else
@@ -237,6 +229,7 @@ fi
 [[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh
 
 # Initializing zoxide
+export PATH="$PATH:$HOME/.cargo/bin"
 eval "$(zoxide init zsh)"
 
 # CUSTOM ALIASES & FUNCTIONS
@@ -265,7 +258,7 @@ export fasttrack="/usr/share/seclists/Passwords/fasttrack.txt"
 
 # Ease of use
 alias cd="z"
-alias ls="exa"
+alias ls="eza"
 alias open='xdg-open'
 alias tryhackme="sudo openvpn ~/.tryhackme.ovpn"
 alias listen="rlwrap nc -lnvp"