diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index c2d22ee..ccf3a37 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -114,6 +114,13 @@ Plug 'neoclide/coc.nvim', {'branch': 'release'}
 " Syntax highlighting for almost every language
 Plug 'sheerun/vim-polyglot'
 
+" Add two-character motions with s and S
+Plug 'ggandor/leap.nvim'
+Plug 'tpope/vim-repeat'
+
+" VSCode-like multi-cursor support
+Plug 'mg979/vim-visual-multi', {'branch': 'master'}
+
 " Easy commenting/uncommenting
 Plug 'numToStr/Comment.nvim'
 
@@ -188,6 +195,9 @@ let g:vim_svelte_plugin_load_full_syntax = 1
 let g:vim_svelte_plugin_use_typescript = 1
 let g:vim_svelte_plugin_use_sass = 1
 
+" Configure leap
+lua require('leap').add_default_mappings()
+
 " Configure Comment.nvim
 lua require('Comment').setup()
 
diff --git a/.config/nvim/vscode-neovim.vim b/.config/nvim/vscode-neovim.vim
index ac56ad4..e52c6b0 100644
--- a/.config/nvim/vscode-neovim.vim
+++ b/.config/nvim/vscode-neovim.vim
@@ -65,6 +65,10 @@ autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)'))
 " Fetch plugins with Plug
 call plug#begin()
 
+" Add two-character motions with s and S
+Plug 'ggandor/leap.nvim'
+Plug 'tpope/vim-repeat'
+
 " Easy commenting/uncommenting
 Plug 'numToStr/Comment.nvim'
 
@@ -74,5 +78,8 @@ Plug 'tpope/vim-surround'
 " End of plugin fetching
 call plug#end()
 
+" Configure leap
+lua require('leap').add_default_mappings()
+
 " Configure Comment.nvim
 lua require('Comment').setup()
diff --git a/.iterm2_preferences/com.googlecode.iterm2.plist b/.iterm2_preferences/com.googlecode.iterm2.plist
index 0856af8..1375c2a 100644
--- a/.iterm2_preferences/com.googlecode.iterm2.plist
+++ b/.iterm2_preferences/com.googlecode.iterm2.plist
@@ -4,16 +4,6 @@
 <dict>
 	<key>AllowClipboardAccess</key>
 	<false/>
-	<key>AppleAntiAliasingThreshold</key>
-	<integer>1</integer>
-	<key>ApplePressAndHoldEnabled</key>
-	<false/>
-	<key>AppleScrollAnimationEnabled</key>
-	<integer>0</integer>
-	<key>AppleSmoothFixedFontsSizeThreshold</key>
-	<integer>1</integer>
-	<key>AppleWindowTabbingMode</key>
-	<string>manual</string>
 	<key>Command</key>
 	<string></string>
 	<key>CopySelection</key>