diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 268ee95..095f85f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -22,3 +22,5 @@
 	pulls = !git pull && git submodule init && git submodule update && git submodule status
 [status]
 	submodulesummary = true
+[push]
+	default = simple

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 268ee95..095f85f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -22,3 +22,5 @@
 	pulls = !git pull && git submodule init && git submodule update && git submodule status
 [status]
 	submodulesummary = true
+[push]
+	default = simple
diff --git a/zsh/completion.zsh b/zsh/completion.zsh
new file mode 100644
index 0000000..e9ba3c2
--- /dev/null
+++ b/zsh/completion.zsh
@@ -0,0 +1,29 @@
+# Completion System
+autoload -U compinit
+compinit -i
+
+# URL magic
+autoload -U url-quote-magic
+zle -N self-insert url-quote-magic
+
+# Show completion menu on succesive tab press
+setopt COMPLETE_ALIASES
+setopt ALWAYS_TO_END
+setopt AUTO_MENU
+setopt COMPLETE_IN_WORD
+
+# color code completion
+zstyle ':completion:*' list-colors "=(#b) #([0-9]#)*=36=31"
+
+# If no match is found, pass the string on to the command
+setopt nonomatch
+
+# Enable menu selection
+zstyle ':completion:*' menu select
+
+# Enable case insensitive and backwards completion
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+
+# Completion caching
+zstyle ':completion:*' use-cache on
+zstyle ':completion:*' cache-path ~/.zsh/cache

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 268ee95..095f85f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -22,3 +22,5 @@
 	pulls = !git pull && git submodule init && git submodule update && git submodule status
 [status]
 	submodulesummary = true
+[push]
+	default = simple
diff --git a/zsh/completion.zsh b/zsh/completion.zsh
new file mode 100644
index 0000000..e9ba3c2
--- /dev/null
+++ b/zsh/completion.zsh
@@ -0,0 +1,29 @@
+# Completion System
+autoload -U compinit
+compinit -i
+
+# URL magic
+autoload -U url-quote-magic
+zle -N self-insert url-quote-magic
+
+# Show completion menu on succesive tab press
+setopt COMPLETE_ALIASES
+setopt ALWAYS_TO_END
+setopt AUTO_MENU
+setopt COMPLETE_IN_WORD
+
+# color code completion
+zstyle ':completion:*' list-colors "=(#b) #([0-9]#)*=36=31"
+
+# If no match is found, pass the string on to the command
+setopt nonomatch
+
+# Enable menu selection
+zstyle ':completion:*' menu select
+
+# Enable case insensitive and backwards completion
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+
+# Completion caching
+zstyle ':completion:*' use-cache on
+zstyle ':completion:*' cache-path ~/.zsh/cache
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
index dab3893..7b92e43 100644
--- a/zsh/prompt.zsh
+++ b/zsh/prompt.zsh
@@ -8,14 +8,14 @@
     command git diff --quiet --ignore-submodules HEAD &>/dev/null;
     
     if [[ $? -eq 1 ]]; then
-        local background=yellow
+        local color=yellow
     else
-        local background=green
+        local color=green
     fi   
     
-    echo "%{%K{$background}%}%{%F{black}%}  $(__git_ps1 "%s") %{%F{$background}%K{blue}%}"
+    echo "%{%F{$color}%} $(__git_ps1 "%s")"
   else
-    echo "%{%K{blue}%}"
+    echo ""
   fi
 }
 
@@ -24,11 +24,11 @@
     RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1"
     zle reset-prompt
 }
+PROMPT_EC='%(?.%{%F{green}%}.%{%F{red}%})%?'
+PROMPT_USER='%{%F{magenta}%}%n'
+PROMPT_DIR='%{%F{blue}%}%~%  '
+PROMPT_SU='%{%f%k%b%}%(!.%{%F{red}%}# %{%k%F{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_USER  $PROMPT_DIR  $(_git_info)
+%{%f%k%b%}> '
 

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 268ee95..095f85f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -22,3 +22,5 @@
 	pulls = !git pull && git submodule init && git submodule update && git submodule status
 [status]
 	submodulesummary = true
+[push]
+	default = simple
diff --git a/zsh/completion.zsh b/zsh/completion.zsh
new file mode 100644
index 0000000..e9ba3c2
--- /dev/null
+++ b/zsh/completion.zsh
@@ -0,0 +1,29 @@
+# Completion System
+autoload -U compinit
+compinit -i
+
+# URL magic
+autoload -U url-quote-magic
+zle -N self-insert url-quote-magic
+
+# Show completion menu on succesive tab press
+setopt COMPLETE_ALIASES
+setopt ALWAYS_TO_END
+setopt AUTO_MENU
+setopt COMPLETE_IN_WORD
+
+# color code completion
+zstyle ':completion:*' list-colors "=(#b) #([0-9]#)*=36=31"
+
+# If no match is found, pass the string on to the command
+setopt nonomatch
+
+# Enable menu selection
+zstyle ':completion:*' menu select
+
+# Enable case insensitive and backwards completion
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+
+# Completion caching
+zstyle ':completion:*' use-cache on
+zstyle ':completion:*' cache-path ~/.zsh/cache
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
index dab3893..7b92e43 100644
--- a/zsh/prompt.zsh
+++ b/zsh/prompt.zsh
@@ -8,14 +8,14 @@
     command git diff --quiet --ignore-submodules HEAD &>/dev/null;
     
     if [[ $? -eq 1 ]]; then
-        local background=yellow
+        local color=yellow
     else
-        local background=green
+        local color=green
     fi   
     
-    echo "%{%K{$background}%}%{%F{black}%}  $(__git_ps1 "%s") %{%F{$background}%K{blue}%}"
+    echo "%{%F{$color}%} $(__git_ps1 "%s")"
   else
-    echo "%{%K{blue}%}"
+    echo ""
   fi
 }
 
@@ -24,11 +24,11 @@
     RPROMPT="${${KEYMAP/vicmd/$VIM_NORMAL}/(main|viins)/} $EPS1"
     zle reset-prompt
 }
+PROMPT_EC='%(?.%{%F{green}%}.%{%F{red}%})%?'
+PROMPT_USER='%{%F{magenta}%}%n'
+PROMPT_DIR='%{%F{blue}%}%~%  '
+PROMPT_SU='%{%f%k%b%}%(!.%{%F{red}%}# %{%k%F{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_USER  $PROMPT_DIR  $(_git_info)
+%{%f%k%b%}> '
 
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index 4d39747..a11b1a6 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -71,3 +71,7 @@
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 
 source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets cursor)
+# Override highlighter colors
+ZSH_HIGHLIGHT_STYLES[single-hyphen-option]=gold
+ZSH_HIGHLIGHT_STYLES[double-hyphen-option]=gold