diff --git a/starship/starship.toml b/starship/starship.toml
new file mode 100644
index 0000000..9dfadb9
--- /dev/null
+++ b/starship/starship.toml
@@ -0,0 +1,26 @@
+[username]
+style_user = 'red bold'
+style_root = 'black bold'
+format = '[$user]($style) '
+disabled = false
+show_always = true
+
+[time]
+format = '[$time]($style) '
+disabled = false
+
+[os]
+disabled = false
+style = 'blue bold'
+
+[os.symbols]
+Arch = "  "
+
+
+[git_branch]
+format = '[$symbol$branch]($style) '
+
+[git_metrics]
+disabled = false
+[aws]
+disabled = true
diff --git a/zsh/zshrc b/zsh/zshrc
index 854059f..5aaa2f0 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -8,7 +8,7 @@ alias cs-update="/home/thomas/repos/eolas/_scripts/auto_save.sh"
 alias cs-query="/home/thomas/repos/eolas/_scripts/query.sh"
 # Set properties based on OS
 
-ZSH_THEME=spaceship
+ZSH_THEME=""
 SPACESHIP_TIME_SHOW=true
 SPACESHIP_PROMPT_ASYNC=true
 SPACESHIP_CHAR_SYMBOL="▶ "
@@ -31,12 +31,15 @@ export PYENV_ROOT="$HOME/.pyenv"
 export PATH="$PYENV_ROOT/bin:$PATH"
 eval "$(pyenv init --path)"
 
-prompt_end() {
-  if [[ -n $CURRENT_BG ]]; then
-    echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
-  else
-    echo -n "%{%k%}"
-  fi
-  echo -n "\n%{%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{%f%}"
-  CURRENT_BG=''
-}
+# prompt_end() {
+#   if [[ -n $CURRENT_BG ]]; then
+#     echo -n " %{%k%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR"
+#   else
+#     echo -n "%{%k%}"
+#   fi
+#   echo -n "\n%{%F{$CURRENT_BG}%}$SEGMENT_SEPARATOR%{%f%}"
+#   CURRENT_BG=''
+# }
+
+
+eval "$(starship init zsh)"