diff --git a/.config/i3/config b/.config/i3/config
index eb0c151..a1b1d0d 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -159,7 +159,7 @@ bindsym $mod+r mode "resize"
 set $mode_cmd [c st] [F firefox] [H hibernate] [L suspend] 
 
 mode "$mode_cmd" {
-     bindsym c exec st -e /usr/bin/fish; mode "default"
+     bindsym c exec st; mode "default"
      bindsym Shift+f exec "firefox"; mode "default"
      bindsym --release Shift+h exec "systemctl hibernate"; mode "default"
      bindsym --release Shift+l exec "systemctl suspend"; mode "default"
diff --git a/.config/stumpwm/config b/.config/stumpwm/config
index 7fa28fe..fb644d6 100644
--- a/.config/stumpwm/config
+++ b/.config/stumpwm/config
@@ -14,8 +14,8 @@
 (setf *time-modeline-string* "%k:%M")
 
 (define-key *root-map* (kbd ";") "colon")
-(define-key *root-map* (kbd "c") "exec st -e /usr/bin/fish")
-(define-key *root-map* (kbd "C-c") "exec st -e /usr/bin/fish")
+(define-key *root-map* (kbd "c") "exec st")
+(define-key *root-map* (kbd "C-c") "exec st")
 (define-key *root-map* (kbd "s-TAB") "gother")
 (define-key *root-map* (kbd "H") "exec systemctl hibernate")
 (define-key *root-map* (kbd "L") "exec systemctl suspend")
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
new file mode 100644
index 0000000..b9f5bf3
--- /dev/null
+++ b/.config/zsh/.zprofile
@@ -0,0 +1,6 @@
+# start X at login on first console or otherwise source ~/.profile
+if [[ -z "$DISPLAY" && "$XDG_VTNR" -eq 1 ]] && which /bin/sx > /dev/null; then
+    exec sx ~/.xsession
+else
+    source ~/.profile
+fi
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
new file mode 100644
index 0000000..3a360de
--- /dev/null
+++ b/.config/zsh/.zshrc
@@ -0,0 +1,42 @@
+# Path to oh-my-zsh installation.
+export ZSH="/home/lupan/.config/zsh/oh-my-zsh"
+
+# Set name of the theme to load.
+ZSH_THEME="gentoo"
+
+# Disable auto-update checks.
+DISABLE_AUTO_UPDATE="true"
+
+# Change the command execution time stamp shown in the history command output.
+HIST_STAMPS="yyyy-mm-dd"
+
+# Change path to history file.
+HISTFILE="$ZDOTDIR/.zsh_history"
+
+# Styles.
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#ff00ff,underline"
+
+# Plugins to load.
+plugins=(git scd zsh-syntax-highlighting zsh-autosuggestions)
+
+source $ZSH/oh-my-zsh.sh
+
+# Directory tracking in Emacs vterm.
+
+function vterm_printf(){
+    if [ -n "$TMUX" ]; then
+        # tell tmux to pass the escape sequences through
+        # (Source: http://permalink.gmane.org/gmane.comp.terminal-emulators.tmux.user/1324)
+        printf "\ePtmux;\e\e]%s\007\e\\" "$1"
+    elif [ "${TERM%%-*}" = "screen" ]; then
+        # GNU screen (screen, screen-256color, screen-256color-bce)
+        printf "\eP\e]%s\007\e\\" "$1"
+    else
+        printf "\e]%s\e\\" "$1"
+    fi
+}
+
+vterm_prompt_end() {
+    vterm_printf "51;A$(whoami)@$(hostname):$(pwd)";
+}
+PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'
diff --git a/.zshenv b/.zshenv
new file mode 100644
index 0000000..1f6242a
--- /dev/null
+++ b/.zshenv
@@ -0,0 +1 @@
+ZDOTDIR="$HOME/.config/zsh"