Index: config/fish/fish_variables
==================================================================
--- config/fish/fish_variables
+++ config/fish/fish_variables
@@ -8,11 +8,11 @@
 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:003cb3
+SETUVAR fish_color_command:205cb3
 SETUVAR fish_color_comment:6600cc
 SETUVAR fish_color_cwd:209060
 SETUVAR fish_color_end:730099
 SETUVAR fish_color_error:ff0000
 SETUVAR fish_color_escape:00a6b2
@@ -19,12 +19,12 @@
 SETUVAR fish_color_history_current:normal
 SETUVAR fish_color_host:176945
 SETUVAR fish_color_jobs:ffff00
 SETUVAR fish_color_match:normal
 SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:cc33ff
-SETUVAR fish_color_param:3377ff
+SETUVAR fish_color_operator:cc6fdf
+SETUVAR fish_color_param:3377cf
 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:29bc7d

Index: config/fish/functions/fgrep.fish
==================================================================
--- config/fish/functions/fgrep.fish
+++ config/fish/functions/fgrep.fish
@@ -1,7 +1,7 @@
 function fgrep
-	if which ggrep >/dev/null
+	if which ggrep >/dev/null ^&1
 		command ggrep -F --color=auto $argv
 	else
 		command fgrep --color=auto $argv
 	end
 end

Index: config/fish/functions/grep.fish
==================================================================
--- config/fish/functions/grep.fish
+++ config/fish/functions/grep.fish
@@ -1,7 +1,7 @@
 function grep
-	if which ggrep >/dev/null
+	if which ggrep >/dev/null ^&1
 		command ggrep --color=auto $argv
 	else
 		command grep --color=auto $argv
 	end
 end

Index: config/fish/functions/ls.fish
==================================================================
--- config/fish/functions/ls.fish
+++ config/fish/functions/ls.fish
@@ -1,7 +1,7 @@
 function ls --description 'List contents of directory'
-	if which gls >/dev/null
+	if which gls >/dev/null ^&1
 		command gls --color=auto $argv
 	else
 		command ls --color=auto $argv
 	end
 end

Index: config/fish/functions/make.fish
==================================================================
--- config/fish/functions/make.fish
+++ config/fish/functions/make.fish
@@ -1,9 +1,10 @@
 # Automatically use bmake instead of make when using pkgsrc
 function make
-	if which bmake >/dev/null && string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
+	if which bmake >/dev/null ^&1 && \
+	    string match -q -r '/pkgsrc$|/pkgsrc/' $PWD
 		# pkgsrc does not like MAKEFLAGS including -j
 		env MAKEFLAGS= bmake $argv
 	else
 		command make $argv
 	end
 end

ADDED   config/fish/functions/pkg_rolling-replace.fish
Index: config/fish/functions/pkg_rolling-replace.fish
==================================================================
--- config/fish/functions/pkg_rolling-replace.fish
+++ config/fish/functions/pkg_rolling-replace.fish
@@ -0,0 +1,4 @@
+function pkg_rolling-replace
+	set -lx MAKEFLAGS
+	command pkg_rolling-replace $argv
+end

Index: config/fish/functions/pw.fish
==================================================================
--- config/fish/functions/pw.fish
+++ config/fish/functions/pw.fish
@@ -1,13 +1,13 @@
 function pw
 	set -l clipboard
-	if which pbcopy >/dev/null
+	if which pbcopy >/dev/null ^&1
 		set clipboard pbcopy
-	else if which xclip >/dev/null
+	else if which xclip >/dev/null ^&1
 		set clipboard xclip
 	else
 		echo "No clipboard handler found!"
 		return 1
 	end
 
 	cryptopassphrase -k ~/.scrypt-pwgen.key $argv | tr -d '\n' | $clipboard
 end