diff --git a/zsh/files/completion.zsh b/zsh/files/completion.zsh
index 579fa35..9442187 100644
--- a/zsh/files/completion.zsh
+++ b/zsh/files/completion.zsh
@@ -29,7 +29,7 @@ zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-dir
 zstyle ':completion:*' use-cache yes
 zstyle ':completion:*' cache-path "$HOME/.cache/zsh/compcache/"
 
-zstyle ':completion:*:*:*:users' ignored-patterns adm amanda apache at avahi avahi-autoipd backup beaglidx bin bitcoin bitwarden_rs cacti canna clamav ceph colord consul couchdb cups daemon dbus dhcp dhcpcd distcache dnsdist dnsmasq dovecot eeleater elasticsearch fax flatpak flaskdemo ftp games gdm geoclue git gitea gkrellmd gluster gopher gophernicus gnats hacluster haldaemon halt hsqldb http ident irc junkbust kdm kibana landscape ldap lightdm list lldpd logstash lp lxd mail mailman mailnull man mattermost messagebus mldonkey mongodb mxisd mysql nagios named netdata netdump news nfsnobody nm-openvpn nm-openconnect nobody nscd ntp nut nvidia-persistenced nweger nx obsrun openvpn operator pcap pcp polkitd pollinate postfix postgres powerdns privoxy proxy pulse prosody puppet pvm quagga radiusd radvd redis rpc rpcuser rpm rtkit root saned scard sddm shutdown smmsp squid sshd statd strongswan stunnel svn synapse sync sys syslog systemd-coredump systemd-journal-remote systemd-network systemd-resolve systemd-timesync tcpdump teamspeak tftp tinyproxy tor transmission tss turnserver usbmux unbound uucp uuidd vault vcsa webvirtmgr wildfly wwwrun www-data xfs xrdp youtrack zabbix-agent zabbix-server zabbix zerotier-one zerotier '_*'
+zstyle ':completion:*:*:*:users' ignored-patterns adm amanda apache at avahi avahi-autoipd backup beaglidx bin bitcoin bitwarden_rs cacti canna clamav ceph colord consul couchdb cups daemon dbus Debian-exim debian-tor dhcp dhcpcd distcache dnsdist dnsmasq dovecot eeleater elasticsearch epmd fax flatpak flaskdemo ftp games gdm geoclue git gitea gkrellmd gluster gopher gophernicus gnats hacluster haldaemon halt hsqldb http ident irc junkbust kdm kibana landscape ldap lightdm list lldpd logstash lp lxd mail mailman mailnull man mattermost messagebus mldonkey mongodb mxisd mysql nagios named netdata netdump news nfsnobody nm-openvpn nm-openconnect nobody nscd ntp nut nvidia-persistenced nweger nx obsrun openvpn operator pcap pcp polkitd pollinate postfix postgres powerdns privoxy proxy pulse prosody puppet pvm quagga radiusd radvd redis rpc rpcuser rpm rtkit root saned scard sddm shutdown smmsp squid sshd statd strongswan stunnel svn synapse sync sys syslog systemd-coredump systemd-journal-remote systemd-network systemd-resolve systemd-timesync tcpdump teamspeak test tftp tinyproxy tor transmission tss turnserver usbmux unbound uucp uuidd vault vcsa webvirtmgr wildfly wwwrun www-data xfs xrdp youtrack zabbix-agent zabbix-server zabbix zerotier-one zerotier '_*'
 
 zstyle '*' single-ignored show
 
diff --git a/zsh/rc.zsh b/zsh/rc.zsh
index b64b8a4..640cf2b 100644
--- a/zsh/rc.zsh
+++ b/zsh/rc.zsh
@@ -1,6 +1,10 @@
 export path=($path $HOME/.config/dotfiles/bin)
 export fpath=($fpath $ZDOTDIR/plugins/completions/src $ZDOTDIR/local/fpath)
 
+# Theme
+export STARSHIP_CONFIG=$ZDOTDIR/starship.toml
+eval "$(starship init zsh)"
+
 # Completions
 mkdir -p $HOME/.cache/zsh
 autoload -Uz compinit
@@ -34,7 +38,3 @@ source $ZDOTDIR/plugins/syntax/zsh-syntax-highlighting.zsh
 
 # Local RC
 [[ -f "$ZDOTDIR/local/rc.zsh" ]] && source "$ZDOTDIR/local/rc.zsh"
-
-# Theme
-export STARSHIP_CONFIG=$ZDOTDIR/starship.toml
-eval "$(starship init zsh)"
diff --git a/zsh/starship.toml b/zsh/starship.toml
index 6871365..dbb374c 100644
--- a/zsh/starship.toml
+++ b/zsh/starship.toml
@@ -3,14 +3,5 @@ add_newline = false
 [time]
 disabled = false
 
-[git_branch]
-disabled = true
-
-[git_commit]
-disabled = true
-
-[git_state]
-disabled = true
-
 [git_status]
 disabled = true