diff --git a/.gitconfig b/.gitconfig
index 4cc94be..c1887eb 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -4,7 +4,7 @@ editor = nvim
 pager = diff-so-fancy | less -+R -nBJFXRgiM -h512 -x4
 
 [user]
-name = Daniel Lundin
+	name = Daniel Lundin
 email = dln@eintr.org
 
 [column]
diff --git a/.tmux.conf b/.tmux.conf
index 9f9e7e6..28d3ba2 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -4,14 +4,14 @@ set -g base-index 1
 set -g display-panes-time 3000
 #set -s escape-time 7
 set -s escape-time 50
-set -g status-interval 60
+set -g status-interval 30
 set -g terminal-overrides "xterm*:XT:smcup@:rmcup@:kUP5=\eOA:kDN5=\eOB:kLFT5=\eOD:kRIT5=\eOC"
 set -g terminal-overrides ",*:colors=256:smso=\e[3m:rmso=\e[23m:sitm=\e[3m:ritm=\e[23m"
 set -g terminal-overrides ",xterm-256color:Tc"
 set -ga terminal-overrides ",st-256color:Tc"
 set -g default-terminal "st-256color"
 
-set-option -g mouse 
+set-option -g mouse on
 #bind -n WheelUpPane copy-mode
 
 set -g update-environment "WINDOWID SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION"
@@ -26,6 +26,7 @@ setw -g automatic-rename off
 setw -g mode-keys vi
 
 # Status and Titles
+set -g status-justify left
 set -g status-left-length 30
 set -g status-right-length 90
 set -g set-titles off
@@ -33,6 +34,10 @@ set -g set-titles-string "###I : #T"
 #set -g set-titles-string '#H:#S.#I.#P #W #T' # window number,program name, active(or not)
 
 # Key bindings
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
 bind -n M-Tab last-pane
 bind -n M-1 select-window -t 1
 bind -n M-- select-window -t 2
@@ -61,6 +66,7 @@ bind k next-window
 bind j previous-window
 bind l next-window
 bind h previous-window
+bind r source-file ~/.tmux.conf
 bind -n C-Right next-window
 bind -n C-Left previous-window
 bind C-k next-window
@@ -76,6 +82,10 @@ bind C-p select-pane -U
 bind K confirm kill-server
 bind C-k clear-history
 
+setw -g window-status-format ""
+setw -g window-status-current-format "#H: #W"
+setw -g window-status-separator ""
+
 # Colors (MonoLight)
 set -g status-fg "#cccccc"
 set -g status-bg "#222222"
diff --git a/.zshrc b/.zshrc
index f4c2d97..e7cb64c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -177,6 +177,7 @@ command -v kubectl >/dev/null 2>&1 && source <(kubectl completion zsh)
 command -v kops >/dev/null 2>&1 && source <(kops completion zsh)
 command -v helm >/dev/null 2>&1 && source <(helm completion zsh)
 
+[ -f /usr/share/bash-completion/completions/aws ] && source /usr/share/bash-completion/completions/aws
 [ -f /opt/google-cloud-sdk/completion.zsh.inc ] && source /opt/google-cloud-sdk/completion.zsh.inc
 
 # Pager