diff --git a/.gitmodules b/.gitmodules
index dd235ab..08f5333 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "pack/local/start/Conque-Shell"]
-	path = pack/local/start/Conque-Shell
-	url = https://github.com/oplatek/Conque-Shell.git
 [submodule "pack/local/start/jsbeautify"]
 	path = pack/local/start/jsbeautify
 	url = https://github.com/vim-scripts/jsbeautify.git
@@ -16,9 +13,6 @@
 [submodule "pack/local/start/taglist-plus"]
 	path = pack/local/start/taglist-plus
 	url = https://github.com/vim-scripts/taglist-plus.git
-[submodule "pack/local/start/TextFormat"]
-	path = pack/local/start/TextFormat
-	url = https://github.com/vim-scripts/TextFormat.git
 [submodule "pack/local/start/The-NERD-Commenter"]
 	path = pack/local/start/The-NERD-Commenter
 	url = https://github.com/vim-scripts/The-NERD-Commenter.git
@@ -76,3 +70,9 @@
 [submodule "pack/local/start/nerdtree"]
 	path = pack/local/start/nerdtree
 	url = git@github.com:preservim/nerdtree.git
+[submodule "pack/local/start/vim-devicons"]
+	path = pack/local/start/vim-devicons
+	url = git@github.com:ryanoasis/vim-devicons.git
+[submodule "pack/local/start/nerdtree-git-plugin"]
+	path = pack/local/start/nerdtree-git-plugin
+	url = git@github.com:Xuyuanp/nerdtree-git-plugin.git
diff --git a/gvimrc b/gvimrc
index b749458..2300855 100644
--- a/gvimrc
+++ b/gvimrc
@@ -7,7 +7,7 @@
 if has('mac') || has('macunix')
     set guifont=Monaco:h13
     set fuoptions=maxvert,maxhorz
-    set transparency=4
+    set transparency=2
 else
     set guifont=Monaco\ 13
 endif
@@ -71,10 +71,6 @@ else
     nnoremap <silent> <M-0> 10gt
 endif
 
-" Emacs like indenting. Pressing Tab indents line
-set indentkeys=0{,0},0),:,0#,!^F,o,O,e,!<Tab>,!^F
-set cinkeys=0{,0},0),:,0#,!^F,o,O,e,!<Tab>,!^F
-
 
 autocmd BufWritePost ~/.gvimrc   so ~/.gvimrc
 autocmd BufWritePost ~/.vim/gvimrc   so ~/.vim/gvimrc
diff --git a/pack/local/start/Conque-Shell b/pack/local/start/Conque-Shell
deleted file mode 160000
index b146b16..0000000
--- a/pack/local/start/Conque-Shell
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b146b1650ef448ae919beafac5b445cb422af0d4
diff --git a/pack/local/start/TextFormat b/pack/local/start/TextFormat
deleted file mode 160000
index 7fa3514..0000000
--- a/pack/local/start/TextFormat
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7fa3514aa0edef9d3acbca60ff2b81a1ccf25f11
diff --git a/pack/local/start/nerdtree-git-plugin b/pack/local/start/nerdtree-git-plugin
new file mode 160000
index 0000000..bca0ed6
--- /dev/null
+++ b/pack/local/start/nerdtree-git-plugin
@@ -0,0 +1 @@
+Subproject commit bca0ed63883d028e6afc7f11a78c56fcaf34d363
diff --git a/pack/local/start/vim-devicons b/pack/local/start/vim-devicons
new file mode 160000
index 0000000..4c2df59
--- /dev/null
+++ b/pack/local/start/vim-devicons
@@ -0,0 +1 @@
+Subproject commit 4c2df59e37b6680e0ec17b543b11a405dc40262c
diff --git a/vimrc b/vimrc
index 2669593..fc8027e 100644
--- a/vimrc
+++ b/vimrc
@@ -18,6 +18,7 @@ set autochdir
 set nofoldenable
 set background=dark
 set title
+set number
 
 set browsedir=buffer
 set autochdir
@@ -90,7 +91,32 @@ endif
 " """"""""
 let NERDTreeIgnore = ['\.vim$', '\~$', '\.pyc']
 let NERDTreeShowBookmarks = 1
-let NERDChristmasTree = 1
+let g:NERDTreeGitStatusUseNerdFonts = 1
+let g:NERDTreeGitStatusShowClean = 0
+let g:NERDTreeCustomOpenArgs={'file':{'where': 't'}}
+
+" Start NERDTree and leave the cursor in it.
+autocmd VimEnter * NERDTree | wincmd p
+" Start NERDTree when Vim is started without file arguments.
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NERDTree | endif
+" If a file is specified, move the cursor to its window.
+autocmd VimEnter * NERDTree | if argc() > 0 || exists("s:std_in") | wincmd p | endif
+" Start NERDTree when Vim starts with a directory argument.
+autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists('s:std_in') |
+    \ execute 'NERDTree' argv()[0] | wincmd p | enew | execute 'cd '.argv()[0] | endif
+" Exit Vim if NERDTree is the only window left.
+autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
+    \ quit | endif
+" If another buffer tries to replace NERDTree, put it in the other window, and bring back NERDTree.
+autocmd BufEnter * if bufname('#') =~ 'NERD_tree_\d\+' && bufname('%') !~ 'NERD_tree_\d\+' && winnr('$') > 1 |
+    \ let buf=bufnr() | buffer# | execute "normal! \<C-W>w" | execute 'buffer'.buf | endif
+" Open the existing NERDTree on each new tab.
+autocmd BufWinEnter * silent NERDTreeMirror
+
+nnoremap <silent> <Leader>N :NERDTreeToggle<CR>
+nnoremap <silent> <Leader>n :NERDTreeFocus<CR>
+
 
 " """"""""""""""
 " NERD Commenter
@@ -128,10 +154,6 @@ let g:airline_symbols.whitespace = 'Ξ'
 nnoremap <silent> <Leader>l :set list!<CR>
 nnoremap <silent> <Leader>f :set fullscreen!<CR>
 nnoremap <silent> <Leader>x :set paste!<CR>
-nnoremap <silent> <Leader>n :NERDTreeToggle<CR>
-nnoremap <silent> <Leader>T :Tlist<CR>
-nnoremap <silent> <Leader>N :set number!<CR>
-" nnoremap <silent> <Leader>b :HSBufExplorer<CR>
 
 nnoremap <silent> da "_dd