diff --git a/tmux.conf b/tmux.conf
index 4a6843f7..5805878d 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -114,8 +114,8 @@ bind M run '~/.dotfiles/tmux/swap-pane.rb master'
 
 bind o resize-pane -Z
 bind P run-shell '~/.dotfiles/tmux/select-pane.sh'
-bind S run-shell '~/.dotfiles/tmux/select-session.sh'
-bind W run-shell '~/.dotfiles/tmux/select-window.sh'
+bind S choose-session
+bind W choose-window
 bind / choose-session
 bind . choose-window
 
@@ -163,7 +163,7 @@ set -g status-justify left
 set -g status-right-length 100
 set -g status-left-length 80
 set -g status-left '#[fg=white] #S #[fg=yellow]'
-set -g status-right "#[fg=colour242]<#[fg=colour248]< #(sysctl -n vm.loadavg | awk '{ print $2,$3,$4 }') < #[fg=yellow]#(dig +short myip.opendns.com @208.67.222.222) #[bg=yellow]#[fg=black] #(hostname) "
+set -g status-right "#[fg=colour242]<#[fg=colour248]< #(tmux-mem-cpu-load -i 5) < #[fg=yellow]#(dig +short myip.opendns.com @208.67.222.222) #[bg=yellow]#[fg=black] #(hostname) "
 
 set -g window-status-format " #I #W:#T "
 set -g window-status-current-format " ⮀ #W:#T "