diff --git a/README.md b/README.md
index b8f4c7f..8832d12 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,8 @@ This theme is based loosely on [agnoster][agnoster].
      * Previous command failed (`!`)
      * Background jobs (`%`)
      * You currently have superpowers (`$`)
+ * Current vi mode
+     * _You'll need to `set -g theme_display_vi yes` to enable_
  * `User@Host` (unless you're the default user)
  * Current RVM or rbenv (Ruby) version
  * Current virtualenv (Python) version
@@ -63,6 +65,8 @@ set -g theme_display_hg yes
 set -g theme_display_virtualenv no
 set -g theme_display_ruby no
 set -g theme_display_user yes
+set -g theme_display_vi yes
+set -g theme_display_vi_hide_mode default
 set -g theme_title_display_process yes
 set -g theme_title_display_path no
 set -g theme_title_use_abbreviated_path no
diff --git a/fish_prompt.fish b/fish_prompt.fish
index 51ba263..5c4e372 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -19,11 +19,8 @@
 #     set -g theme_display_virtualenv no
 #     set -g theme_display_ruby no
 #     set -g theme_display_user yes
-#     set -g theme_display_vi no
+#     set -g theme_display_vi yes
 #     set -g theme_display_vi_hide_mode default
-#     set -g theme_title_display_process yes
-#     set -g theme_title_display_path no
-#     set -g theme_date_format "+%a %H:%M"
 #     set -g theme_avoid_ambiguous_glyphs yes
 #     set -g default_user your_normal_user
 
diff --git a/fish_right_prompt.fish b/fish_right_prompt.fish
index 80a3590..aba702d 100644
--- a/fish_right_prompt.fish
+++ b/fish_right_prompt.fish
@@ -1,3 +1,6 @@
+# You can override some default title options in your config.fish:
+#     set -g theme_date_format "+%a %H:%M"
+
 function fish_right_prompt -d 'bobthefish is all about the right prompt'
   set_color $fish_color_autosuggestion[1]
   set -q theme_date_format; or set -l theme_date_format "+%c"