Index: config/fish/fish_variables
==================================================================
--- config/fish/fish_variables
+++ config/fish/fish_variables
@@ -8,33 +8,34 @@
 SETUVAR __fish_init_3_x:\x1d
 SETUVAR _fish_abbr_gpg:gpg2
 SETUVAR _fish_abbr_vi:vim
 SETUVAR fish_color_autosuggestion:4e4e4e
 SETUVAR fish_color_cancel:normal
-SETUVAR fish_color_command:5f87d7
-SETUVAR fish_color_comment:ff8787
-SETUVAR fish_color_cwd:c0b090
+SETUVAR fish_color_command:003cb3
+SETUVAR fish_color_comment:6600cc
+SETUVAR fish_color_cwd:209060
 SETUVAR fish_color_cwd_root:800000
-SETUVAR fish_color_end:afffd7
-SETUVAR fish_color_error:ff6060
+SETUVAR fish_color_end:730099
+SETUVAR fish_color_error:ff0000
 SETUVAR fish_color_escape:00a6b2
 SETUVAR fish_color_history_current:normal
-SETUVAR fish_color_host:a08080
-SETUVAR fish_color_jobs:ffff60
+SETUVAR fish_color_host:176945
+SETUVAR fish_color_jobs:ffff00
 SETUVAR fish_color_match:normal
 SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:8fdf3f
-SETUVAR fish_color_param:87afd7
-SETUVAR fish_color_quote:ffaf5f
-SETUVAR fish_color_redirection:f090d0
+SETUVAR fish_color_operator:cc33ff
+SETUVAR fish_color_param:3377ff
+SETUVAR fish_color_quote:ff751a
+SETUVAR fish_color_redirection:bf4080
 SETUVAR fish_color_search_match:ffff00
 SETUVAR fish_color_selection:c0c0c0
-SETUVAR fish_color_suffix:ffffe0
+SETUVAR fish_color_suffix:6ddfad
 SETUVAR fish_color_user:00ff00
 SETUVAR fish_color_valid_path:normal
-SETUVAR fish_color_vcs:cfffb0
+SETUVAR fish_color_vcs:43d696
+SETUVAR fish_color_vcs_braces:29bc7d
 SETUVAR fish_greeting:
 SETUVAR fish_key_bindings:hybrid_bindings
 SETUVAR fish_pager_color_completion:normal
 SETUVAR fish_pager_color_description:B3A06D\x1eyellow
 SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan

Index: config/fish/functions/bmake.fish
==================================================================
--- config/fish/functions/bmake.fish
+++ config/fish/functions/bmake.fish
@@ -1,7 +1,8 @@
 # pkgsrc does not like MAKEFLAGS being set
 function bmake
 	if string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
-		set -lx MAKEFLAGS
+		env MAKEFLAGS= bmake $argv
+	else
+		command bmake $argv
 	end
-	command bmake $argv
 end

Index: config/fish/functions/fish_prompt.fish
==================================================================
--- config/fish/functions/fish_prompt.fish
+++ config/fish/functions/fish_prompt.fish
@@ -9,20 +9,21 @@
 				set color_cwd $fish_color_cwd
 			end
 			set suffix '#'
 		case '*'
 			set color_cwd $fish_color_cwd
-			set suffix '$'
+			set suffix '>'
 	end
 
 	set -l branch (git symbolic-ref HEAD 2>/dev/null)
 	set branch (string replace -r "^refs/heads/" "" $branch)
 	set -l vcs
 	if test -n "$branch" -a "$branch" != "master"
-		set vcs "($branch)"
+		set vcs (set_color $fish_color_vcs_braces)"(" \
+		    (set_color $fish_color_vcs)"$branch" \
+		    (set_color $fish_color_vcs_braces)")"
 	end
 
-	echo -n -s (set_color $fish_color_host) (prompt_hostname) ':' \
-	    (set_color $color_cwd) (prompt_pwd) \
-	    (set_color $fish_color_vcs) "$vcs" \
+	echo -n -s (set_color $fish_color_host) (prompt_hostname) ' ' \
+	    (set_color $color_cwd) (prompt_pwd) (string join "" $vcs) \
 	    (set_color $fish_color_suffix) "$suffix "
 end

Index: config/fish/functions/gpgssh.fish
==================================================================
--- config/fish/functions/gpgssh.fish
+++ config/fish/functions/gpgssh.fish
@@ -1,4 +1,4 @@
 function gpgssh
-	set -x SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
+	set -lx SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent.ssh
 	ssh $argv
 end