diff --git a/.vimrc b/.vimrc
index 19e24c6..0e0a2f5 100644
--- a/.vimrc
+++ b/.vimrc
@@ -57,7 +57,7 @@ Plugin 'kergoth/vim-bitbake' " Bitbake templates and syntax
 Plugin 'ludovicchabant/vim-gutentags' "Auto generate tags
 Plugin 'mileszs/ack.vim' " Ack integration
 Plugin 'rhysd/git-messenger.vim' " show git history
-
+Plugin 'vimwiki/vimwiki'
 call vundle#end()            " required
 
 " ========== Vim Basic Settings ============="
@@ -127,8 +127,6 @@ set showmatch
 set matchtime=3
 set hlsearch
 nnoremap <leader><space> :noh<cr>
-nnoremap <tab> %
-"vnoremap <tab> %
 
 " Make Vim to handle long lines nicely.
 set wrap
@@ -214,10 +212,6 @@ endif
 
 " ========== Plugin Settings =========="
 
-" Mapping to NERDTree
-"nnoremap <C-n> :NERDTreeToggle<cr>
-"let NERDTreeIgnore=['\.vim$', '\~$', '\.pyc$']
-
 " Mini Buffer some settigns."
 "let g:miniBufExplMapWindowNavVim = 1
 "let g:miniBufExplMapWindowNavArrows = 1
@@ -466,6 +460,14 @@ set ttimeoutlen=0
 let g:matchparen_timeout = 2
 let g:matchparen_insert_timeout = 2
 
+" Mapping to NERDTree
+"nnoremap <C-n> :NERDTreeToggle<cr>
+"let NERDTreeIgnore=['\.vim$', '\~$', '\.pyc$']
+let g:netrw_banner=0
+let g:netrw_wisize=20
+let g:netrw_liststyle=3
+let g:netrw_lolcalrmdir='rm -r'
+nnoremap <leader>n :Lexplore<CR>
 
 " taken from Damian Conway