diff --git a/bullet-train.zsh-theme b/bullet-train.zsh-theme
index a01bf67..83a629f 100644
--- a/bullet-train.zsh-theme
+++ b/bullet-train.zsh-theme
@@ -1,31 +1,15 @@
-# FreeAgent puts the powerline style in zsh !
+# Basic colors: RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, BLACK, WHITE
 
-if [ "$BULLETTRAIN_DATE_FORMAT" = "" ]; then
-  BULLETTRAIN_DATE_FORMAT=%D{%Y-%m-%d}
-fi
-
-if [ "$BULLETTRAIN_RIGHT_B" = "" ]; then
-  BULLETTRAIN_RIGHT_B=%D{%H:%M:%S}
-elif [ "$BULLETTRAIN_RIGHT_B" = "none" ]; then
-  BULLETTRAIN_RIGHT_B=""
-fi
-
-if [ "$BULLETTRAIN_RIGHT_A" = "mixed" ]; then
-  BULLETTRAIN_RIGHT_A=%(?."$BULLETTRAIN_DATE_FORMAT".%F{red}✘ %?)
-elif [ "$BULLETTRAIN_RIGHT_A" = "exit-status" ]; then
-  BULLETTRAIN_RIGHT_A=%(?.%F{green}✔ %?.%F{red}✘ %?)
-elif [ "$BULLETTRAIN_RIGHT_A" = "date" ]; then
-  BULLETTRAIN_RIGHT_A="$BULLETTRAIN_DATE_FORMAT"
-fi
+BULLETTRAIN_DATE=%D{%H:%M:%S}
 
 if [ "$BULLETTRAIN_HIDE_USER_NAME" = "" ] && [ "$BULLETTRAIN_HIDE_HOST_NAME" = "" ]; then
-    BULLETTRAIN_USER_NAME="%n@%M"
+  BULLETTRAIN_USER_NAME="%n@%M"
 elif [ "$BULLETTRAIN_HIDE_USER_NAME" != "" ] && [ "$BULLETTRAIN_HIDE_HOST_NAME" = "" ]; then
-    BULLETTRAIN_USER_NAME="@%M"
+  BULLETTRAIN_USER_NAME="@%M"
 elif [ "$BULLETTRAIN_HIDE_USER_NAME" = "" ] && [ "$BULLETTRAIN_HIDE_HOST_NAME" != "" ]; then
-    BULLETTRAIN_USER_NAME="%n"
+  BULLETTRAIN_USER_NAME="%n"
 else
-    BULLETTRAIN_USER_NAME=""
+  BULLETTRAIN_USER_NAME=""
 fi
 
 BULLETTRAIN_CURRENT_PATH="%d"
@@ -81,29 +65,24 @@ ZSH_THEME_GIT_PROMPT_AHEAD=" ⬆"
 ZSH_THEME_GIT_PROMPT_BEHIND=" ⬇"
 ZSH_THEME_GIT_PROMPT_DIVERGED=" ⬍"
 
-# if [ "$(git_prompt_info)" = "" ]; then
-   # BULLETTRAIN_GIT_INFO_LEFT=""
-   # BULLETTRAIN_GIT_INFO_RIGHT=""
-# else
-    if [ "$BULLETTRAIN_SHOW_GIT_ON_RIGHT" = "" ]; then
-        if [ "$BULLETTRAIN_HIDE_GIT_PROMPT_STATUS" = "" ]; then
-            BULLETTRAIN_GIT_INFO_LEFT=" %F{blue}%K{white}"$'\ue0b0'"%F{white}%F{black}%K{white}"$'$(git_prompt_info)$(git_prompt_status)%F{white}'
-        else
-            BULLETTRAIN_GIT_INFO_LEFT=" %F{blue}%K{white}"$'\ue0b0'"%F{white}%F{black}%K{white}"$'$(git_prompt_info)%F{white}'
-        fi
-        BULLETTRAIN_GIT_INFO_RIGHT=""
-    else
-        BULLETTRAIN_GIT_INFO_LEFT=""
-        BULLETTRAIN_GIT_INFO_RIGHT="%F{white}"$'\ue0b2'"%F{black}%K{white}"$'$(git_prompt_info)'" %K{white}"
-    fi
-# fi
+if [ "$BULLETTRAIN_SHOW_GIT_ON_RIGHT" = "" ]; then
+  if [ "$BULLETTRAIN_HIDE_GIT_PROMPT_STATUS" = "" ]; then
+    BULLETTRAIN_GIT_INFO_LEFT=" %F{blue}%K{white}"$'\ue0b0'"%F{white}%F{black}%K{white}"$'$(git_prompt_info)$(git_prompt_status)%F{white}'
+  else
+    BULLETTRAIN_GIT_INFO_LEFT=" %F{blue}%K{white}"$'\ue0b0'"%F{white}%F{black}%K{white}"$'$(git_prompt_info)%F{white}'
+  fi
+  BULLETTRAIN_GIT_INFO_RIGHT=""
+else
+  BULLETTRAIN_GIT_INFO_LEFT=""
+  BULLETTRAIN_GIT_INFO_RIGHT="%F{white}"$'\ue0b2'"%F{black}%K{white}"$'$(git_prompt_info)'" %K{white}"
+fi
 
 if [ $(id -u) -eq 0 ]; then
-    BULLETTRAIN_SEC1_BG=%K{red}
-    BULLETTRAIN_SEC1_FG=%F{red}
+  BULLETTRAIN_SEC1_BG=%K{red}
+  BULLETTRAIN_SEC1_FG=%F{red}
 else
-    BULLETTRAIN_SEC1_BG=%K{green}
-    BULLETTRAIN_SEC1_FG=%F{green}
+  BULLETTRAIN_SEC1_BG=%K{green}
+  BULLETTRAIN_SEC1_FG=%F{green}
 fi
 BULLETTRAIN_SEC1_TXT=%F{black}
 if [ "$BULLETTRAIN_DETECT_SSH" != "" ]; then
@@ -113,19 +92,11 @@ if [ "$BULLETTRAIN_DETECT_SSH" != "" ]; then
     BULLETTRAIN_SEC1_TXT=%F{white}
   fi
 fi
-PROMPT="$BULLETTRAIN_SEC1_BG$BULLETTRAIN_SEC1_TXT $BULLETTRAIN_USER_NAME %k%f$BULLETTRAIN_SEC1_FG%K{blue}"$'\ue0b0'"%k%f%F{white}%K{blue} "$BULLETTRAIN_CURRENT_PATH"%F{blue}"$BULLETTRAIN_GIT_INFO_LEFT" %k"$'\ue0b0'"%f "
+
+PROMPT="$BULLETTRAIN_SEC1_BG$BULLETTRAIN_SEC1_TXT %k%f$BULLETTRAIN_SEC1_FG%K{blue}"$'\ue0b0'"%k%f%F{white}%K{blue} "$BULLETTRAIN_CURRENT_PATH"%F{blue}"$BULLETTRAIN_GIT_INFO_LEFT" %k"$'\ue0b0'"%f "
+PROMPT="%K{red} %F{red}%K{yellow}"$'\ue0b0'"%F{white}%K{yellow} "$BULLETTRAIN_DATE" %F{yellow}%K{green}"$'\ue0b0'$PROMPT
 
 if [ "$BULLETTRAIN_NO_BLANK_LINE" = "" ]; then
-    PROMPT="
+  PROMPT="
 "$PROMPT
 fi
-
-if [ "$BULLETTRAIN_DISABLE_RPROMPT" = "" ]; then
-    if [ "$BULLETTRAIN_RIGHT_A" = "" ]; then
-        RPROMPT="$BULLETTRAIN_GIT_INFO_RIGHT%F{white}"$'\ue0b2'"%k%F{black}%K{white} $BULLETTRAIN_RIGHT_B %f%k"
-    elif [ "$BULLETTRAIN_RIGHT_B" = "" ]; then
-        RPROMPT="$BULLETTRAIN_GIT_INFO_RIGHT%F{white}"$'\ue0b2'"%k%F{240}%K{white} $BULLETTRAIN_RIGHT_A %f%k"
-    else
-        RPROMPT="$BULLETTRAIN_GIT_INFO_RIGHT%F{white}"$'\ue0b2'"%k%F{black}%K{white} $BULLETTRAIN_RIGHT_B %f%F{240}"$'\ue0b2'"%f%k%K{240}%F{255} $BULLETTRAIN_RIGHT_A %f%k"
-    fi
-fi