diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 54fa020..fffbe16 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -22,6 +22,7 @@
 alias vimf='vim --remote-silent'
 alias pgrep='ps -eo "%p %c %U %C" | grep'
 alias nano='nano -m'
+alias emacs='emacs -nw'
 
 alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
 alias localip="ipconfig getifaddr en0"

diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 54fa020..fffbe16 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -22,6 +22,7 @@
 alias vimf='vim --remote-silent'
 alias pgrep='ps -eo "%p %c %U %C" | grep'
 alias nano='nano -m'
+alias emacs='emacs -nw'
 
 alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
 alias localip="ipconfig getifaddr en0"
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
index 7678b62..ccfdf9e 100644
--- a/zsh/prompt.zsh
+++ b/zsh/prompt.zsh
@@ -24,11 +24,11 @@
     RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1"
     zle reset-prompt
 }
-
+PROMPT_EC='%{%F{blue}%K{black}%} %?'
 PROMPT_HOST='%{%F{yellow}%K{black}%} %n %{%F{black}%}'
 PROMPT_DIR='%{%F{black}%} %~%  '
 PROMPT_SU='%(!.%{%k%F{blue}%K{black}%}%{%F{yellow}%} ⚡ %{%k%F{black}%}.%{%k%F{blue}%})%{%f%k%b%}'
 
-PROMPT='%{%f%b%k%}$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU
+PROMPT='%{%f%b%k%}$PROMPT_EC$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU
 ❯ '
 

diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 54fa020..fffbe16 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -22,6 +22,7 @@
 alias vimf='vim --remote-silent'
 alias pgrep='ps -eo "%p %c %U %C" | grep'
 alias nano='nano -m'
+alias emacs='emacs -nw'
 
 alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
 alias localip="ipconfig getifaddr en0"
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
index 7678b62..ccfdf9e 100644
--- a/zsh/prompt.zsh
+++ b/zsh/prompt.zsh
@@ -24,11 +24,11 @@
     RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1"
     zle reset-prompt
 }
-
+PROMPT_EC='%{%F{blue}%K{black}%} %?'
 PROMPT_HOST='%{%F{yellow}%K{black}%} %n %{%F{black}%}'
 PROMPT_DIR='%{%F{black}%} %~%  '
 PROMPT_SU='%(!.%{%k%F{blue}%K{black}%}%{%F{yellow}%} ⚡ %{%k%F{black}%}.%{%k%F{blue}%})%{%f%k%b%}'
 
-PROMPT='%{%f%b%k%}$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU
+PROMPT='%{%f%b%k%}$PROMPT_EC$PROMPT_HOST$(_git_info)$PROMPT_DIR$PROMPT_SU
 ❯ '
 
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index e6fb62d..cde79c4 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -19,6 +19,7 @@
 # Init autocomplete
 autoload -U compinit
 compinit
+zstyle ':completion:*' menu select
 
 # History
 HISTFILE=~/.zsh_history
@@ -71,3 +72,5 @@
 
 eval "$(jenv init -)"
 
+source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)