diff --git a/home/.config/nvim/nvimrc b/home/.config/nvim/nvimrc
index d541dcc..a3d73ff 100644
--- a/home/.config/nvim/nvimrc
+++ b/home/.config/nvim/nvimrc
@@ -6,6 +6,7 @@ set mouse=a
 
 " Cd to current file's directory
 command! Cwd :execute 'cd %:p:h'
+command! Reload :execute "bufdo execute 'checktime . bufnr('%')'"
 
 " set timeout timeoutlen=1000 ttimeoutlen=100
 
@@ -33,6 +34,7 @@ let sh_fold_enabled=1         " sh
 let vimsyn_folding='af'       " Vim script
 let xml_syntax_folding=1      " XML
 
+set foldmethod=indent
 autocmd FileType java set foldmethod=indent
 autocmd FileType html set foldmethod=indent
 autocmd FileType javascript set foldmethod=indent
@@ -184,8 +186,8 @@ Plug 'Lokaltog/vim-easymotion'
 " Plug 'junegunn/seoul256.vim'
 " Plug 'whatyouhide/vim-gotham'
 Plug 'rstacruz/sparkup'
-Plug 'L9'
-Plug 'FuzzyFinder'
+" Plug 'L9'
+" Plug 'FuzzyFinder'
 " Plug 'git://git.wincent.com/command-t.git'
 " Plug 'git://github.com/vim-scripts/YankRing.vim.git'
 Plug 'git://github.com/maxbrunsfeld/vim-yankstack.git' 
@@ -203,11 +205,11 @@ Plug 'scrooloose/nerdcommenter'
 Plug 'garbas/vim-snipmate'
 " Plug 'amiorin/vim-project'
 Plug 'MarcWeber/vim-addon-mw-utils'
-Plug 'tomtom/tlib_vim'
+" Plug 'tomtom/tlib_vim'
 Plug 'nathanaelkane/vim-indent-guides'
 " Plug 'flazz/vim-colorschemes'
 Plug 'vim-scripts/sessionman.vim'
-Plug 'kien/ctrlp.vim'
+" Plug 'kien/ctrlp.vim'
 " Plug 'leshill/vim-json'
 Plug 'godlygeek/tabular'
 Plug 'majutsushi/tagbar'
@@ -218,8 +220,8 @@ Plug 'vim-scripts/AutoComplPop'
 " Plug 'Valloric/YouCompleteMe'
 " Plug 'Shougo/eocomplcache'
 Plug 'spf13/vim-autoclose'
-Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
-Plug 'harish2704/harish2704-vim'
+Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeFind' }
+Plug 'git@github.com:harish2704/harish2704-vim'
 Plug 'kchmck/vim-coffee-script', { 'for': 'coffee' }
 Plug 'digitaltoad/vim-jade', { 'for': 'jade' }
 Plug 'AndrewRadev/vim-eco', { 'for': [ 'ect', 'eco' ] }
@@ -235,7 +237,7 @@ Plug 'heavenshell/vim-jsdoc', { 'for': 'javascript' }
 " Plug 'vim-scripts/EasyGrep'
 Plug 'briancollins/vim-jst', { 'for': 'jst' }
 Plug 'vim-scripts/matchit.zip'
-Plug 'harish2704/vim-snippets'
+Plug 'git@github.com:harish2704/vim-snippets.git'
 " Plug 'vim-scripts/SyntaxRange'
 Plug 'harish2704/gtags.vim'
 " Plug 'vim-scripts/guicolorscheme.vim'
@@ -243,6 +245,9 @@ Plug 'harish2704/gtags.vim'
 " Plug 'vim-scripts/adt.vim'
 " Plug 'tpope/eclim'
 Plug 'tomasr/molokai'
+Plug 'joonty/vdebug'
+Plug 'junegunn/fzf', { 'dir': '~/.local/Apps/fzf' }
+Plug 'junegunn/fzf.vim'
 call plug#end()
 
 " Source support_function.vim to support vim-snippets.
@@ -251,6 +256,8 @@ if filereadable(expand( g:nvim_conf_root ."bundle/vim-snippets/snippets/support_
 endif
 
 " }
+let $FZF_DEFAULT_COMMAND='ag -g ""'
+nmap <C-p> :Files<CR>
 
 " Neovim specific settings
 syntax on 
@@ -337,9 +344,9 @@ nmap <Leader><Leader>en :execute 'OpenSnippets'<CR>
 " for moving tab {
 " Ctrl-Shift + Page-Up/Down to rearrange tab {
 nmap <C-S-PageUp> :execute 'tabmove ' . (tabpagenr()-2 )<CR>
-nmap <C-S-PageDown> :execute 'tabmove ' . tabpagenr()<CR>
+nmap <C-S-PageDown> :execute 'tabmove ' . ( tabpagenr()+1 )<CR>
 nmap <M-PageUp> :execute 'tabmove ' . (tabpagenr()-2 )<CR>
-nmap <M-PageDown> :execute 'tabmove ' . tabpagenr()<CR>
+nmap <M-PageDown> :execute 'tabmove ' . ( tabpagenr()+1 )<CR>
 " }
 
 
@@ -391,6 +398,10 @@ nmap <Leader><Leader>aQ ysiw"
 nmap <Leader><Leader>dq ds'
 " \\dQ  remove double quote
 nmap <Leader><Leader>aq ysiw'
+" In insert mode, <Alt-S> will quote current word
+imap <M-S-s> <Esc>maysiw"`aa
+" In insert mode, <Alt-S> will quote current word with double quotes
+imap <M-s> <Esc>maysiw'`ai
 " }
 
 
@@ -398,16 +409,15 @@ nmap <Leader><Leader>aq ysiw'
 nmap <leader>jt <Esc>:%!python -m json.tool<CR><Esc>:set filetype=json<CR>
 " }
 
-
 " Alt + [1-8] to Switch tabs {
-map 1 1gt
-map 2 2gt
-map 3 3gt
-map 4 4gt
-map 5 5gt
-map 6 6gt
-map 7 7gt
-map 8 8gt
+map <M-1> 1gt
+map <M-2> 2gt
+map <M-3> 3gt
+map <M-4> 4gt
+map <M-5> 5gt
+map <M-6> 6gt
+map <M-7> 7gt
+map <M-8> 8gt
 " }
 
 " NerdTree {