diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 136220a..4d63b03 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -2,11 +2,13 @@ if status is-interactive
 	#fastfetch
 	alias ls lsd
 	alias vim nvim
-	#	set -g theme_color_scheme gruvbox
-	set -g theme_display_git_dirty yes
-	set -g theme_display_git_untracked yes
+	set -g fish_greeting
+	set -g theme_display_git_default_branch yes
 	set -g theme_display_git_ahead_verbose yes
 	set -g theme_display_git_dirty_verbose yes
-	set -g theme_display_git_stashed_verbose yes
+	set -g theme_nerd_fonts yes
+	set -g theme_color_scheme dark
+	set -g theme_display_user ssh
+	set -g theme_show_exit_status yes
 end
 ###
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index 32960cc..06ccd34 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -10,3 +10,4 @@ SETUVAR budspencer_nogreeting:\x1d
 SETUVAR budspencer_pwdstyle:short\x1elong\x1enone
 SETUVAR budspencer_sessions_active:\x1d
 SETUVAR budspencer_sessions_active_pid:\x1d
+SETUVAR fish_greeting:\x1d