diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 1330fa2..c576cdf 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -5,12 +5,13 @@ alias aupg="sudo apt upgrade"
 alias aurup="sudo aura -Akua"
 alias bubc="brew upgrade && brew cleanup"
 alias bubo="brew update && brew outdated"
-alias brewcurl="/usr/local/opt/curl/bin/curl --cacert /usr/local/etc/openssl/cert.pem"
+alias brewcurl="/usr/local/opt/curl/bin/curl --cacert /usr/local/etc/openssl@1.1/cert.pem"
 alias brewssl="/usr/local/opt/openssl@1.1/bin/openssl"
 alias ga="git add"
 alias gf="git fetch --all; git fetch --tags"
 alias git="hub"
 alias gs="git status"
+alias gb="git rev-parse --abbrev-ref HEAD"
 alias irc="ssh jmb -t '. ~/.zshrc; tmux attach -t irc'"
 test $PLATFORM = 'linux' && alias ls="ls -F --color=always"
 test $PLATFORM = 'osx' && alias ls="ls -FG"
@@ -18,4 +19,5 @@ test $PLATFORM = 'linux' && alias pipup="pip freeze --local | grep -v '^\-e' | c
 test $PLATFORM = 'osx' && alias pipup="pip3 freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip3 install -U"
 alias rtor="tmux attach -t rtor"
 alias startace="acestreamengine --client-console --upload-limit 0 --download-limit 0"
-alias up="sudo pacman -Syu"
\ No newline at end of file
+alias up="sudo pacman -Syu"
+alias aws-whoami="aws sts get-caller-identity"
diff --git a/zsh/powerline-prompt.zsh b/zsh/powerline-prompt.zsh
index 26d7753..70b7721 100644
--- a/zsh/powerline-prompt.zsh
+++ b/zsh/powerline-prompt.zsh
@@ -6,6 +6,8 @@ test -e '/usr/local/lib/python3.6/site-packages/powerline/bindings/zsh/powerline
     && source /usr/local/lib/python3.6/site-packages/powerline/bindings/zsh/powerline.zsh
 test -e '/usr/local/lib/python3.7/site-packages/powerline/bindings/zsh/powerline.zsh' \
     && source /usr/local/lib/python3.7/site-packages/powerline/bindings/zsh/powerline.zsh
+test -e '/usr/local/lib/python3.8/site-packages/powerline/bindings/zsh/powerline.zsh' \
+    && source /usr/local/lib/python3.8/site-packages/powerline/bindings/zsh/powerline.zsh
 test -e '/usr/lib/python3.7/site-packages/powerline/bindings/zsh/powerline.zsh' \
     && source /usr/lib/python3.7/site-packages/powerline/bindings/zsh/powerline.zsh
 test -e '/usr/lib/python3.6/site-packages/powerline/bindings/zsh/powerline.zsh' \
diff --git a/zshrc.zsh b/zshrc.zsh
index ad7817c..b23c80a 100644
--- a/zshrc.zsh
+++ b/zshrc.zsh
@@ -3,8 +3,10 @@
 HISTFILE=~/.histfile
 HISTSIZE=10000
 SAVEHIST=10000
+
 # vim binddings
 bindkey -v
+
 # ZSH builtin autoload
 autoload -Uz compinit promptinit run-help
 compinit
@@ -32,9 +34,6 @@ export MANPATH="/usr/local/man:$MANPATH"
 # Determine the running OS
 source $HOME/.zsh/platform.zsh
 
-# Set a powerline prompt
-source $HOME/.zsh/powerline-prompt.zsh
-
 # ZSH syntax highlighting
 source $HOME/.zsh/zsh-syntax-highlighting.zsh
 
@@ -64,8 +63,6 @@ export PATH="$PATH:/usr/local/go/bin:/usr/local/opt/go/libexec/bin:$GOPATH/bin"
 # GnuPG stuff
 GPG_TTY=`tty`
 export GPG_TTY
-gpg-connect-agent /bye
-export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 
 # composer global
 export PATH="$PATH:$HOME/.composer/vendor/bin"
@@ -107,3 +104,6 @@ test -e ${HOME}/.iterm2_shell_integration.zsh && source ${HOME}/.iterm2_shell_in
 
 # Source the untracked `extra` file
 test -e $HOME/.extra && source $HOME/.extra
+
+# Init starship prompt -- https://starship.rs
+eval "$(starship init zsh)"