diff --git a/vim/settings/ale.vim b/vim/settings/ale.vim
index 8285214..a41f0a9 100644
--- a/vim/settings/ale.vim
+++ b/vim/settings/ale.vim
@@ -1,2 +1,2 @@
-nmap <silent> <localleader>n <Plug>(ale_previous_wrap)
-nmap <silent> <localleader>p <Plug>(ale_next_wrap)
+nmap <silent> <leader>e <Plug>(ale_previous_wrap)
+nmap <silent> <leader>E <Plug>(ale_next_wrap)
diff --git a/vim/settings/yankring.vim b/vim/settings/yankring.vim
deleted file mode 100644
index 2f50a2d..0000000
--- a/vim/settings/yankring.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-let g:yankring_history_file = '.yankring-history'
-nnoremap ,yr :YRShow<CR>
-nnoremap C-y :YRShow<CR>
diff --git a/vim/settings/yankstack.vim b/vim/settings/yankstack.vim
new file mode 100644
index 0000000..5fd6927
--- /dev/null
+++ b/vim/settings/yankstack.vim
@@ -0,0 +1,2 @@
+nmap <leader>p <Plug>yankstack_substitute_older_paste
+nmap <leader>P <Plug>yankstack_substitute_newer_paste
diff --git a/vim/vundles/vim-improvements.vundle b/vim/vundles/vim-improvements.vundle
index c0b8219..7ab4e61 100644
--- a/vim/vundles/vim-improvements.vundle
+++ b/vim/vundles/vim-improvements.vundle
@@ -12,7 +12,7 @@ Bundle "MarcWeber/vim-addon-mw-utils.git"
 Bundle "bogado/file-line.git"
 Bundle "mattn/webapi-vim.git"
 Bundle "sjl/gundo.vim"
-Bundle "skwp/YankRing.vim"
+Bundle "maxbrunsfeld/vim-yankstack"
 Bundle "tomtom/tlib_vim.git"
 Bundle "tpope/vim-abolish"
 Bundle "tpope/vim-endwise.git"