diff --git a/shell/.profile b/shell/.profile
index 33253d1..a795521 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -19,17 +19,11 @@ if [ -n "$BASH_VERSION" ]; then
     fi
 fi
 
-if [ -d "$HOME/.cargo/bin" ] ; then
-    PATH="$HOME/.cargo/bin:$PATH"
-fi
-
-if [ -d "$HOME/go/bin" ] ; then
-    PATH="$HOME/go/bin:$PATH"
-fi
-
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi
+for dir in ~/.cargo/bin ~/go/bin ~/.local/bin ~/bin; do
+    if [ -d "$dir" ]; then
+	PATH="$dir:$PATH"
+    fi
+done
 
 export PATH
 
diff --git a/shell/.zshrc b/shell/.zshrc
index ffd3085..4194415 100644
--- a/shell/.zshrc
+++ b/shell/.zshrc
@@ -18,9 +18,9 @@ setopt share_history
 autoload -Uz vcs_info
 precmd () { vcs_info }
 setopt prompt_subst
-zstyle ':vcs_info:git:*' formats '%F{yellow}(%b)%r%f '
+zstyle ':vcs_info:git:*' formats '%F{magenta}(%b)%r%f '
 zstyle ':vcs_info:*' enable git
-PS1='%B%F{green}%n@%m%f %F{blue}%~%f%b ${vcs_info_msg_0_}%B%#%f%b '
+PS1='%B%F{blue}%n@%m%f %F{green}%~%f%b ${vcs_info_msg_0_}%B%#%f%b '
 RPROMPT='%(?..%B%F{red}%?%f%b)'
 
 # Completion.
diff --git a/spectrwm/.spectrwm.conf b/spectrwm/.spectrwm.conf
index b87ab68..af37047 100644
--- a/spectrwm/.spectrwm.conf
+++ b/spectrwm/.spectrwm.conf
@@ -22,8 +22,6 @@ bar_format		= +< +N:+I +S +< %a %R +< +W
 
 # Launch at start
 
-autorun			= ws[1]:emacsclient -n -c
-autorun			= ws[2]:st
 autorun			= ws[9]:firefox
 
 # Programs