diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index eacf111..f5e225f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -12,5 +12,9 @@
 [mergetool]
   prompt = false
 [alias]
-    tree = log --oneline --decorate --all --graph
-    pulls = !git pull && git submodule init && git submodule
+	tree = log --oneline --decorate --all --graph
+	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 eacf111..f5e225f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -12,5 +12,9 @@
 [mergetool]
   prompt = false
 [alias]
-    tree = log --oneline --decorate --all --graph
-    pulls = !git pull && git submodule init && git submodule
+	tree = log --oneline --decorate --all --graph
+	pulls = !git pull && git submodule init && git submodule update && git submodule status
+[status]
+	submodulesummary = true
+[push]
+	default = simple
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
index 46f4db1..7b92e43 100644
--- a/zsh/prompt.zsh
+++ b/zsh/prompt.zsh
@@ -13,7 +13,7 @@
         local color=green
     fi   
     
-    echo "%{%F{$color}%}  $(__git_ps1 "%s")"
+    echo "%{%F{$color}%} $(__git_ps1 "%s")"
   else
     echo ""
   fi
@@ -26,9 +26,9 @@
 }
 PROMPT_EC='%(?.%{%F{green}%}.%{%F{red}%})%?'
 PROMPT_USER='%{%F{magenta}%}%n'
-PROMPT_DIR='%{%F{blue}%}%~%'
+PROMPT_DIR='%{%F{blue}%}%~%  '
 PROMPT_SU='%{%f%k%b%}%(!.%{%F{red}%}# %{%k%F{black}%})'
 
-PROMPT='%{%f%b%k%} $PROMPT_EC  $PROMPT_USER  $PROMPT_DIR  $(_git_info)
-%{%f%k%b%}▸ '
+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 eacf111..f5e225f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -12,5 +12,9 @@
 [mergetool]
   prompt = false
 [alias]
-    tree = log --oneline --decorate --all --graph
-    pulls = !git pull && git submodule init && git submodule
+	tree = log --oneline --decorate --all --graph
+	pulls = !git pull && git submodule init && git submodule update && git submodule status
+[status]
+	submodulesummary = true
+[push]
+	default = simple
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
index 46f4db1..7b92e43 100644
--- a/zsh/prompt.zsh
+++ b/zsh/prompt.zsh
@@ -13,7 +13,7 @@
         local color=green
     fi   
     
-    echo "%{%F{$color}%}  $(__git_ps1 "%s")"
+    echo "%{%F{$color}%} $(__git_ps1 "%s")"
   else
     echo ""
   fi
@@ -26,9 +26,9 @@
 }
 PROMPT_EC='%(?.%{%F{green}%}.%{%F{red}%})%?'
 PROMPT_USER='%{%F{magenta}%}%n'
-PROMPT_DIR='%{%F{blue}%}%~%'
+PROMPT_DIR='%{%F{blue}%}%~%  '
 PROMPT_SU='%{%f%k%b%}%(!.%{%F{red}%}# %{%k%F{black}%})'
 
-PROMPT='%{%f%b%k%} $PROMPT_EC  $PROMPT_USER  $PROMPT_DIR  $(_git_info)
-%{%f%k%b%}▸ '
+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 7ebf47f..7ca4e5b 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -89,4 +89,7 @@
 eval "$(jenv init -)"
 
 source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets cursor)
+# Override highlighter colors
+ZSH_HIGHLIGHT_STYLES[single-hyphen-option]=gold
+ZSH_HIGHLIGHT_STYLES[double-hyphen-option]=gold