diff --git a/.vim/after/plugin/keymaps.vim b/.vim/after/plugin/keymaps.vim
index fb0cb85..84b4382 100644
--- a/.vim/after/plugin/keymaps.vim
+++ b/.vim/after/plugin/keymaps.vim
@@ -1,9 +1,12 @@
-unmap <C-n>
+silent! unmap <C-n>
 
 let NERDTreeShowHidden=1
 map <silent> <C-n> :NERDTreeToggle<CR>
 nnoremap <silent> <C-g> :Goyo<CR>
-nnoremap <silent> <Space> <C-w>
+"nnoremap <silent> <Space> <C-w>
 nnoremap <buffer> <F5> :w<cr> :! clear; ./% <cr>
 nnoremap Q <nop>
 command PG  :r!echo -n $(passgen)
+
+xmap ga <Plug>(EasyAlign)
+nmap ga <Plug>(EasyAlign)
diff --git a/.vimrc b/.vimrc
index 87e36bd..cd09f39 100644
--- a/.vimrc
+++ b/.vimrc
@@ -33,6 +33,8 @@ Plugin 'godlygeek/tabular'
 Plugin 'plasticboy/vim-markdown'
 Plugin 'mg979/vim-visual-multi'
 Plugin 'itchyny/calendar.vim'
+Plugin 'liuchengxu/vim-which-key'
+Plugin 'junegunn/vim-easy-align'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
@@ -73,6 +75,7 @@ set shiftwidth=4
 set ruler
 set signcolumn=yes
 set noexpandtab
+set notimeout
 
 let g:closetag_filenames = '*.html,*.xhtml,*.phtml,*.php'
 let g:python_recommended_style = 0