diff --git a/README.md b/README.md
index 0da0c11..424a19a 100644
--- a/README.md
+++ b/README.md
@@ -160,14 +160,19 @@ BULLETTRAIN_GIT_EXTENDED=true
 Git icons info:
 
 ```bash
-BULLETTRAIN_GIT_CLEAN="✔"
+BULLETTRAIN_GIT_PREFIX=""
+BULLETTRAIN_GIT_SUFFIX=""
 BULLETTRAIN_GIT_DIRTY="✘"
+BULLETTRAIN_GIT_CLEAN="✔"
 BULLETTRAIN_GIT_ADDED="%F{green}✚%F{black}"
 BULLETTRAIN_GIT_MODIFIED="%F{blue}✹%F{black}"
 BULLETTRAIN_GIT_DELETED="%F{red}✖%F{black}"
 BULLETTRAIN_GIT_UNTRACKED="%F{yellow}✭%F{black}"
 BULLETTRAIN_GIT_RENAMED="➜"
 BULLETTRAIN_GIT_UNMERGED="═"
+BULLETTRAIN_GIT_AHEAD=" ⬆"
+BULLETTRAIN_GIT_BEHIND=" ⬇"
+BULLETTRAIN_GIT_DIVERGED=" ⬍"
 ```
 
 
diff --git a/bullet-train.zsh-theme b/bullet-train.zsh-theme
index a75b026..de20982 100644
--- a/bullet-train.zsh-theme
+++ b/bullet-train.zsh-theme
@@ -124,44 +124,70 @@ if [ ! -n "${BULLETTRAIN_CONTEXT_FG+1}" ]; then
 fi
 
 # GIT PROMPT
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_PREFIX+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_PREFIX+1}" ]; then
   ZSH_THEME_GIT_PROMPT_PREFIX=" \ue0a0 "
+else
+  ZSH_THEME_GIT_PROMPT_PREFIX=$BULLETTRAIN_GIT_PREFIX
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_SUFFIX+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_SUFFIX+1}" ]; then
   ZSH_THEME_GIT_PROMPT_SUFFIX=""
+else
+  ZSH_THEME_GIT_PROMPT_SUFFIX=$BULLETTRAIN_GIT_SUFFIX
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_DIRTY+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_DIRTY+1}" ]; then
   ZSH_THEME_GIT_PROMPT_DIRTY=" ✘"
+else
+  ZSH_THEME_GIT_PROMPT_DIRTY=$BULLETTRAIN_GIT_DIRTY
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_CLEAN+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_CLEAN+1}" ]; then
   ZSH_THEME_GIT_PROMPT_CLEAN=" ✔"
+else
+  ZSH_THEME_GIT_PROMPT_CLEAN=$BULLETTRAIN_GIT_CLEAN
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_ADDED+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_ADDED+1}" ]; then
   ZSH_THEME_GIT_PROMPT_ADDED=" %F{green}✚%F{black}"
+else
+  ZSH_THEME_GIT_PROMPT_ADDED=$BULLETTRAIN_GIT_ADDED
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_MODIFIED+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_MODIFIED+1}" ]; then
   ZSH_THEME_GIT_PROMPT_MODIFIED=" %F{blue}✹%F{black}"
+else
+  ZSH_THEME_GIT_PROMPT_MODIFIED=$BULLETTRAIN_GIT_MODIFIED
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_DELETED+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_DELETED+1}" ]; then
   ZSH_THEME_GIT_PROMPT_DELETED=" %F{red}✖%F{black}"
+else
+  ZSH_THEME_GIT_PROMPT_DELETED=$BULLETTRAIN_GIT_DELETED
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_UNTRACKED+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_UNTRACKED+1}" ]; then
   ZSH_THEME_GIT_PROMPT_UNTRACKED=" %F{yellow}✭%F{black}"
+else
+  ZSH_THEME_GIT_PROMPT_UNTRACKED=$BULLETTRAIN_GIT_UNTRACKED
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_RENAMED+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_RENAMED+1}" ]; then
   ZSH_THEME_GIT_PROMPT_RENAMED=" ➜"
+else
+  ZSH_THEME_GIT_PROMPT_RENAMED=$BULLETTRAIN_GIT_RENAMED
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_UNMERGED+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_UNMERGED+1}" ]; then
   ZSH_THEME_GIT_PROMPT_UNMERGED=" ═"
+else
+  ZSH_THEME_GIT_PROMPT_UNMERGED=$BULLETTRAIN_GIT_UNMERGED
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_AHEAD+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_AHEAD+1}" ]; then
   ZSH_THEME_GIT_PROMPT_AHEAD=" ⬆"
+else
+  ZSH_THEME_GIT_PROMPT_AHEAD=$BULLETTRAIN_GIT_AHEAD
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_BEHIND+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_BEHIND+1}" ]; then
   ZSH_THEME_GIT_PROMPT_BEHIND=" ⬇"
+else
+  ZSH_THEME_GIT_PROMPT_BEHIND=$BULLETTRAIN_GIT_BEHIND
 fi
-if [ ! -n "${ZSH_THEME_GIT_PROMPT_DIVERGED+1}" ]; then
+if [ ! -n "${BULLETTRAIN_GIT_DIVERGED+1}" ]; then
   ZSH_THEME_GIT_PROMPT_DIVERGED=" ⬍"
+else
+  ZSH_THEME_GIT_PROMPT_DIVERGED=$BULLETTRAIN_GIT_PROMPT_DIVERGED
 fi
 
 # ------------------------------------------------------------------------------