diff --git a/config/fish/fish_variables b/config/fish/fish_variables
index 88e5cc0..1e8e9f3 100644
--- a/config/fish/fish_variables
+++ b/config/fish/fish_variables
@@ -13,7 +13,6 @@ 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
@@ -28,13 +27,13 @@ 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
diff --git a/config/fish/functions/fish_prompt.fish b/config/fish/functions/fish_prompt.fish
index 3a44246..d7e7b63 100644
--- a/config/fish/functions/fish_prompt.fish
+++ b/config/fish/functions/fish_prompt.fish
@@ -1,16 +1,9 @@
 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
 
@@ -24,6 +17,6 @@ function fish_prompt --description 'Write out the prompt'
 	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
diff --git a/config/fish/functions/fish_right_prompt.fish b/config/fish/functions/fish_right_prompt.fish
index b85e95e..62cc252 100644
--- a/config/fish/functions/fish_right_prompt.fish
+++ b/config/fish/functions/fish_right_prompt.fish
@@ -11,4 +11,6 @@ function fish_right_prompt
 		set_color $fish_color_error
 		echo "$code "
 	end
+
+	set_color normal
 end
diff --git a/config/fish/functions/hybrid_bindings.fish b/config/fish/functions/hybrid_bindings.fish
deleted file mode 100644
index ed16100..0000000
--- a/config/fish/functions/hybrid_bindings.fish
+++ /dev/null
@@ -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