diff --git a/functions/_tide_item_vi_mode.fish b/functions/_tide_item_vi_mode.fish
index c3c4230..582855d 100644
--- a/functions/_tide_item_vi_mode.fish
+++ b/functions/_tide_item_vi_mode.fish
@@ -3,6 +3,9 @@ function _tide_item_vi_mode
         case default
             tide_vi_mode_bg_color=$tide_vi_mode_bg_color_default tide_vi_mode_color=$tide_vi_mode_color_default \
                 _tide_print_item vi_mode $tide_vi_mode_icon_default
+        case insert
+            tide_vi_mode_bg_color=$tide_vi_mode_bg_color_insert tide_vi_mode_color=$tide_vi_mode_color_insert \
+                _tide_print_item vi_mode $tide_vi_mode_icon_insert
         case replace replace_one
             tide_vi_mode_bg_color=$tide_vi_mode_bg_color_replace tide_vi_mode_color=$tide_vi_mode_color_replace \
                 _tide_print_item vi_mode $tide_vi_mode_icon_replace
diff --git a/functions/tide/configure/choices/all/finish.fish b/functions/tide/configure/choices/all/finish.fish
index 42c2d85..f60a128 100644
--- a/functions/tide/configure/choices/all/finish.fish
+++ b/functions/tide/configure/choices/all/finish.fish
@@ -18,17 +18,7 @@ function _tide_finish
     set -e _tide_selected_option # Skip through all the _next_choices
 
     # Deal with prompt char/vi mode
-    if contains character $fake_tide_left_prompt_items
-        _tide_find_and_remove vi_mode fake_tide_right_prompt_items
-    else
-        # If no character, insert vi_mode
-        _tide_find_and_remove vi_mode fake_tide_right_prompt_items
-        if contains time $fake_tide_right_prompt_items
-            set fake_tide_right_prompt_items $fake_tide_right_prompt_items[1..-2] vi_mode $fake_tide_right_prompt_items[-1]
-        else
-            set -a fake_tide_right_prompt_items vi_mode
-        end
-    end
+    contains character $fake_tide_left_prompt_items || set -p fake_tide_left_prompt_items vi_mode
 
     # Set the real variables
     for fakeVar in (set --names | string match -r "^fake_tide.*")
diff --git a/functions/tide/configure/configs/classic.fish b/functions/tide/configure/configs/classic.fish
index cbf275a..be106d8 100644
--- a/functions/tide/configure/configs/classic.fish
+++ b/functions/tide/configure/configs/classic.fish
@@ -22,8 +22,8 @@ tide_context_color_root $_tide_color_gold
 tide_context_color_ssh D7AF87
 tide_docker_bg_color 444444
 tide_docker_color 2496ED
-tide_docker_icon 
 tide_docker_default_contexts default colima
+tide_docker_icon 
 tide_git_bg_color 444444
 tide_git_bg_color_unstable 444444
 tide_git_bg_color_urgent 444444
@@ -85,7 +85,7 @@ tide_pwd_icon_home
 tide_pwd_icon_unwritable 
 tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json
 tide_right_prompt_frame_enabled true
-tide_right_prompt_items status cmd_duration context jobs node virtual_env rustc java php chruby go kubectl toolbox terraform aws nix_shell vi_mode
+tide_right_prompt_items status cmd_duration context jobs node virtual_env rustc java php chruby go kubectl toolbox terraform aws nix_shell
 tide_right_prompt_prefix 
 tide_right_prompt_separator_diff_color 
 tide_right_prompt_separator_same_color 
@@ -113,14 +113,17 @@ tide_toolbox_bg_color 444444
 tide_toolbox_color 613583
 tide_toolbox_icon ⬢
 tide_vi_mode_bg_color_default 444444
+tide_vi_mode_bg_color_insert 444444
 tide_vi_mode_bg_color_replace 444444
 tide_vi_mode_bg_color_visual 444444
-tide_vi_mode_color_default 87af00
-tide_vi_mode_color_replace d78700
-tide_vi_mode_color_visual 5f87d7
-tide_vi_mode_icon_default DEFAULT
-tide_vi_mode_icon_replace REPLACE
-tide_vi_mode_icon_visual VISUAL
+tide_vi_mode_color_default 949494
+tide_vi_mode_color_insert 87AFAF
+tide_vi_mode_color_replace 87AF87
+tide_vi_mode_color_visual FF8700
+tide_vi_mode_icon_default D
+tide_vi_mode_icon_insert I
+tide_vi_mode_icon_replace R
+tide_vi_mode_icon_visual V
 tide_virtual_env_bg_color 444444
 tide_virtual_env_color 00AFAF
 tide_virtual_env_icon 
diff --git a/functions/tide/configure/configs/rainbow.fish b/functions/tide/configure/configs/rainbow.fish
index ba8f744..84f15ad 100644
--- a/functions/tide/configure/configs/rainbow.fish
+++ b/functions/tide/configure/configs/rainbow.fish
@@ -85,7 +85,7 @@ tide_pwd_icon_home
 tide_pwd_icon_unwritable 
 tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json
 tide_right_prompt_frame_enabled true
-tide_right_prompt_items status cmd_duration context jobs node virtual_env rustc java php chruby go kubectl toolbox terraform aws nix_shell vi_mode
+tide_right_prompt_items status cmd_duration context jobs node virtual_env rustc java php chruby go kubectl toolbox terraform aws nix_shell
 tide_right_prompt_prefix 
 tide_right_prompt_separator_diff_color 
 tide_right_prompt_separator_same_color 
@@ -112,15 +112,18 @@ tide_time_format %T
 tide_toolbox_bg_color 613583
 tide_toolbox_color 000000
 tide_toolbox_icon ⬢
-tide_vi_mode_bg_color_default 008000
-tide_vi_mode_bg_color_replace 808000
-tide_vi_mode_bg_color_visual 000080
+tide_vi_mode_bg_color_default 949494
+tide_vi_mode_bg_color_insert 87AFAF
+tide_vi_mode_bg_color_replace 87AF87
+tide_vi_mode_bg_color_visual FF8700
 tide_vi_mode_color_default 000000
+tide_vi_mode_color_insert 000000
 tide_vi_mode_color_replace 000000
 tide_vi_mode_color_visual 000000
-tide_vi_mode_icon_default DEFAULT
-tide_vi_mode_icon_replace REPLACE
-tide_vi_mode_icon_visual VISUAL
+tide_vi_mode_icon_default D
+tide_vi_mode_icon_insert I
+tide_vi_mode_icon_replace R
+tide_vi_mode_icon_visual V
 tide_virtual_env_bg_color 444444
 tide_virtual_env_color 00AFAF
 tide_virtual_env_icon 