diff --git a/alacritty.yml b/alacritty.yml
index 475d578..58f3c44 100644
--- a/alacritty.yml
+++ b/alacritty.yml
@@ -212,6 +212,16 @@ colors:
     # cyan:    '0xcdab53'
     # white:   '0xf7f7f7'
 
+  # Vi mode cursor colors
+  #
+  # Colors for the cursor when the vi mode is active.
+  #
+  # Allowed values are CellForeground and CellBackground, which reference the
+  # affected cell, or hexadecimal colors like #ff00ff.
+  vi_mode_cursor:
+    text: CellBackground
+    cursor: CellForeground
+
 # Colors (Tomorrow Night Bright)
 #colors:
   # Default colors
@@ -331,7 +341,7 @@ colors:
 # Allow terminal applications to change Alacritty's window title.
 #dynamic_title: true
 
-#cursor:
+cursor:
   # Cursor style
   #
   # Values for `style`:
@@ -343,6 +353,14 @@ colors:
   # If this is `true`, the cursor will be rendered as a hollow box when the
   # window is not focused.
   #unfocused_hollow: true
+  #
+  # Vi mode cursor style
+  #
+  # If the vi mode cursor style is `None` or not specified, it will fall back to
+  # the style of the active value of the normal cursor.
+  #
+  # See `cursor.style` for available options.
+  vi_mode_style: None
 
 # Live config reload (changes require restart)
 #live_config_reload: true
@@ -580,7 +598,69 @@ key_bindings:
   #- { key: PageDown,  mods: Shift,   action: ScrollPageDown, mode: ~Alt       }
   #- { key: Home,      mods: Shift,   action: ScrollToTop,    mode: ~Alt       }
   #- { key: End,       mods: Shift,   action: ScrollToBottom, mode: ~Alt       }
+  # - { key: I,      mods: Control,         chars: "\x07\x69"            }
+  # - { key: I,      mods: Control|Alt,     chars: "\x1c\x69"            }
 
+  # Vi Mode
+  - { key: Escape,  mods: Control,                action: ToggleViMode            }
+  #- { key: Escape,                      mode: Vi, action: ClearSelection          }
+  #- { key: I,                           mode: Vi, action: ScrollToBottom          }
+  - { key: U,                           mode: Vi, action: ToggleViMode            }
+  #- { key: Y,      mods: Control,       mode: Vi, action: ScrollLineUp            }
+  #- { key: E,      mods: Control,       mode: Vi, action: ScrollLineDown          }
+  #- { key: G,                           mode: Vi, action: ScrollToTop             }
+  #- { key: G,      mods: Shift,         mode: Vi, action: ScrollToBottom          }
+  - { key: PageUp,                      mode: Vi, action: ScrollPageUp            }
+  - { key: PageDown,                    mode: Vi, action: ScrollPageDown          }
+  - { key: P,      mods: Control,       mode: Vi, action: ScrollHalfPageUp        }
+  - { key: U,      mods: Control,       mode: Vi, action: ScrollHalfPageDown      }
+  #- { key: Y,                           mode: Vi, action: Copy                    }
+  #- { key: Y,                           mode: Vi, action: ClearSelection          }
+  #- { key: Copy,                        mode: Vi, action: ClearSelection          }
+  #- { key: V,                           mode: Vi, action: ToggleNormalSelection   }
+  #- { key: V,      mods: Shift,         mode: Vi, action: ToggleLineSelection     }
+  - { key: C,       mods: Shift,         mode: Vi, action: ToggleBlockSelection   }
+  #- { key: V,      mods: Alt,           mode: Vi, action: ToggleSemanticSelection }
+  #- { key: Return,                      mode: Vi, action: Open                    }
+  - { key: O,                           mode: Vi, action: Up                      }
+  - { key: E,                           mode: Vi, action: Down                    }
+  - { key: N,                           mode: Vi, action: Left                    }
+  - { key: I,                           mode: Vi, action: Right                   }
+
+  - { key: O,  mods: Control,           mode: Vi, action: Up                      }
+  - { key: O,  mods: Control,           mode: Vi, action: Up                      }
+  - { key: O,  mods: Control,           mode: Vi, action: Up                      }
+  - { key: O,  mods: Control,           mode: Vi, action: Up                      }
+  - { key: O,  mods: Control,           mode: Vi, action: Up                      }
+  - { key: O,  mods: Control,           mode: Vi, action: Up                      }
+  - { key: E,  mods: Control,           mode: Vi, action: Down                    }
+  - { key: E,  mods: Control,           mode: Vi, action: Down                    }
+  - { key: E,  mods: Control,           mode: Vi, action: Down                    }
+  - { key: E,  mods: Control,           mode: Vi, action: Down                    }
+  - { key: E,  mods: Control,           mode: Vi, action: Down                    }
+  - { key: E,  mods: Control,           mode: Vi, action: Down                    }
+
+  #- { key: Up,                          mode: Vi, action: Up                      }
+  #- { key: Down,                        mode: Vi, action: Down                    }
+  #- { key: Left,                        mode: Vi, action: Left                    }
+  #- { key: Right,                       mode: Vi, action: Right                   }
+  - { key: Home,                        mode: Vi, action: First                   }
+  - { key: End,                         mode: Vi, action: Last                    }
+  #- { key: Key6,   mods: Shift,         mode: Vi, action: FirstOccupied           }
+  #- { key: H,      mods: Shift,         mode: Vi, action: High                    }
+  #- { key: M,      mods: Shift,         mode: Vi, action: Middle                  }
+  #- { key: L,      mods: Shift,         mode: Vi, action: Low                     }
+  #- { key: B,                           mode: Vi, action: SemanticLeft            }
+  #- { key: W,                           mode: Vi, action: SemanticRight           }
+  #- { key: E,                           mode: Vi, action: SemanticRightEnd        }
+  - { key: N,      mods: Control,         mode: Vi, action: WordLeft                }
+  - { key: I,      mods: Control,         mode: Vi, action: WordRight               }
+  #- { key: E,      mods: Shift,         mode: Vi, action: WordRightEnd            }
+  #- { key: Key5,   mods: Shift,         mode: Vi, action: Bracket                 }
+  #- { key: Slash,                       mode: Vi, action: SearchForward           }
+  #- { key: Slash,  mods: Shift,         mode: Vi, action: SearchBackward          }
+  #- { key: N,                           mode: Vi, action: SearchNext              }
+  #- { key: N,      mods: Shift,         mode: Vi, action: SearchPrevious          }
 #debug:
   # Display the time it takes to redraw each frame.
   #render_timer: false