diff --git a/config.fish b/config.fish
index 0e21f73..22cd07e 100644
--- a/config.fish
+++ b/config.fish
@@ -1,4 +1,7 @@
 if status is-interactive
+    # start vi mode
+    set -g fish_key_bindings fish_vi_key_bindings
+
     # Set greeting
     set fish_greeting ""
 
diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish
index d76fca5..1f19c15 100644
--- a/functions/fish_prompt.fish
+++ b/functions/fish_prompt.fish
@@ -1,3 +1,3 @@
-function fish_prompt 
-printf '%s%s%s♥%s%s \n %s%s%s%s%s ' (set_color $fish_color_user) $USER (set_color magenta) (set_color $fish_color_host) $hostname (set_color $fish_color_cwd) (prompt_pwd) (set_color green) (fish_git_prompt) (set_color normal)
+function fish_prompt
+    printf '%s%s%s♥%s %s%s%s%s%s%s☛ '(set_color $fish_color_user) $USER (set_color magenta) (set_color $fish_color_host) $hostname (set_color $fish_color_cwd) (prompt_pwd) (set_color green) (set_color normal)
 end
diff --git a/functions/fish_right_prompt.fish b/functions/fish_right_prompt.fish
new file mode 100644
index 0000000..3e055bf
--- /dev/null
+++ b/functions/fish_right_prompt.fish
@@ -0,0 +1,7 @@
+function fish_right_prompt
+    set -g __fish_git_prompt_show_informative_status
+    set -g __fish_git_prompt_showupstream informative
+    set -g __fish_git_prompt_describe_style branch
+    set -g __fish_git_prompt_showcolorhints
+    fish_git_prompt
+end