Index: config/fish/fish_variables
==================================================================
--- config/fish/fish_variables
+++ config/fish/fish_variables
@@ -11,11 +11,10 @@
 SETUVAR fish_color_autosuggestion:4e4e4e
 SETUVAR fish_color_cancel:normal
 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:730099
 SETUVAR fish_color_error:ff0000
 SETUVAR fish_color_escape:00a6b2
 SETUVAR fish_color_history_current:normal
 SETUVAR fish_color_host:176945
@@ -26,16 +25,16 @@
 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:6ddfad
+SETUVAR fish_color_suffix:29bc7d
 SETUVAR fish_color_user:00ff00
 SETUVAR fish_color_valid_path:normal
 SETUVAR fish_color_vcs:43d696
 SETUVAR fish_color_vcs_braces:29bc7d
 SETUVAR fish_greeting:
-SETUVAR fish_key_bindings:hybrid_bindings
+SETUVAR fish_key_bindings:fish_default_key_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/fish_prompt.fish
==================================================================
--- config/fish/functions/fish_prompt.fish
+++ config/fish/functions/fish_prompt.fish
@@ -1,18 +1,11 @@
 function fish_prompt --description 'Write out the prompt'
-	set -l color_cwd
 	set -l suffix
 	switch "$USER"
 		case root toor
-			if set -q fish_color_cwd_root
-				set color_cwd $fish_color_cwd_root
-			else
-				set color_cwd $fish_color_cwd
-			end
-			set suffix '#'
+			set suffix (set_color ff0000)'#'
 		case '*'
-			set color_cwd $fish_color_cwd
 			set suffix '>'
 	end
 
 	set -l branch (git symbolic-ref HEAD 2>/dev/null)
 	set branch (string replace -r "^refs/heads/" "" $branch)
@@ -22,8 +15,8 @@
 		    (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) (string join "" $vcs) \
+	    (set_color $fish_color_cwd) (prompt_pwd) (string join "" $vcs) \
 	    (set_color $fish_color_suffix) "$suffix "
 end

Index: config/fish/functions/fish_right_prompt.fish
==================================================================
--- config/fish/functions/fish_right_prompt.fish
+++ config/fish/functions/fish_right_prompt.fish
@@ -9,6 +9,8 @@
 
 	if test $code -gt 0
 		set_color $fish_color_error
 		echo "$code "
 	end
+
+	set_color normal
 end

DELETED config/fish/functions/hybrid_bindings.fish
Index: config/fish/functions/hybrid_bindings.fish
==================================================================
--- config/fish/functions/hybrid_bindings.fish
+++ config/fish/functions/hybrid_bindings.fish
@@ -1,7 +0,0 @@
-function hybrid_bindings --description 'Vi bindings with a bit of Emacs bindings'
-	for mode in default insert visual
-		fish_default_key_bindings -M $mode
-	end
-
-	fish_vi_key_bindings --no-erase
-end