diff --git a/.gitignore b/.gitignore
index 45a0592..e84c594 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 .vim/bundle
 .vim/undodir
 Brewfile.lock.json
+Caskfile.lock.json
diff --git a/Makefile b/Makefile
index cad4323..b751c80 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ vim:
 
 zsh:
 	mkdir -p ~/.zsh/plugins
+	-git clone git@github.com:zsh-git-prompt/zsh-git-prompt.git ~/.zsh/plugins/zsh-git-prompt
 	-git clone git@github.com:arzzen/calc.plugin.zsh.git ~/.zsh/plugins/calc.plugin.zsh
 	-git clone git@github.com:softmoth/zsh-vim-mode.git ~/.zsh/plugins/zsh-vim-mode
 	-git clone https://github.com/lukechilds/zsh-better-npm-completion.git ~/.zsh/plugins/.zsh-better-npm-completion
diff --git a/macos/Brewfile b/macos/Brewfile
index 9280b22..5f514e4 100644
--- a/macos/Brewfile
+++ b/macos/Brewfile
@@ -5,6 +5,7 @@ brew 'bash-git-prompt'
 brew 'bitwarden-cli'
 brew 'coreutils'
 brew 'docker'
+brew 'eza'
 brew 'findutils'
 brew 'gh'
 brew 'git'
diff --git a/macos/macos_setup.sh b/macos/macos_setup.sh
index 0943523..5d6c39d 100755
--- a/macos/macos_setup.sh
+++ b/macos/macos_setup.sh
@@ -49,7 +49,8 @@ defaults write NSGlobalDomain NSAutomaticQuoteSubstitutionEnabled -bool false
 defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false
 
 # Set the timezone; see `sudo systemsetup -listtimezones` for other values
-sudo systemsetup -settimezone "Europe/Sofia" > /dev/null
+# This is throwing errors - investigate
+# sudo systemsetup -settimezone "Europe/Sofia" > /dev/null
 
 ###############################################################################
 # Trackpad, mouse, keyboard, Bluetooth accessories, and input                 #
diff --git a/shell/.zprompt b/shell/.zprompt
index 7b8d3c5..65f9a09 100644
--- a/shell/.zprompt
+++ b/shell/.zprompt
@@ -1,4 +1,5 @@
-source $HOME/Git/zsh-git-prompt/zshrc.sh
+GIT_PROMPT_EXECUTABLE="shell"
+source $ZDOTDIR/plugins/zsh-git-prompt/zshrc.sh
 
 function git_email_prompt() {
   GIT_USER=$(git config user.email)
diff --git a/shell/.zshrc b/shell/.zshrc
index 6ed452b..a58be20 100644
--- a/shell/.zshrc
+++ b/shell/.zshrc
@@ -1,10 +1,8 @@
 ZDOTDIR=~/.zsh
 
-source $ZDOTDIR/.zprompt
-
-setopt AUTO_CD
-setopt NO_CASE_GLOB
-setopt GLOB_COMPLETE
+setopt auto_cd
+setopt no_case_glob
+setopt glob_complete
 
 setopt correct
 setopt correct_all
@@ -75,3 +73,7 @@ autoload -Uz compinit && compinit -i
 
 # Load bashcompinit for some old bash completions
 autoload bashcompinit && bashcompinit
+
+
+# Prompt
+source $ZDOTDIR/.zprompt