diff --git a/.vim/vimrc b/.vim/vimrc
index 68cc853..b2d6242 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -138,14 +138,13 @@ highlight VertSplit  ctermfg=1 ctermbg=0
 " let &t_SI = "\e[6 q"                " insert mode: ibeam cursor
 " let &t_EI = "\e[2 q"                " normal mode: block cursor
 
-" TAB NAVIGATION
-set tabpagemax=25                   " allowed max tabs (10)
-inoremap [5^ <Esc>:tabn<CR>       " Strg+PgUp: Next tab
-nnoremap [5^ :tabn<CR>
-inoremap [6^ <Esc>:tabp<CR>       " Strg+PgDown: Previous tab
-nnoremap [6^ :tabp<CR>
-inoremap  <Esc>:tabnew<CR>        " Strg+T: New tab
-nnoremap  :tabnew<CR>
+" Buffer NAVIGATION
+map  :bnext<CR>
+imap  :bnext<CR>
+nmap  :bnext<CR>
+map  :bprevious<CR>
+imap  :bprevious<CR>
+nmap  :bprevious<CR>
 
 " TMUX FIXES
 map   <PageDown>
@@ -231,8 +230,8 @@ if has("cscope")
     endfunction
 endif
 
-nmap  :cnext<CR>
-nmap  :cprevious<CR>
+" nmap  :cnext<CR>
+" nmap  :cprevious<CR>
 nmap  :execute "grep " . expand("<cword>")<CR><CR>
 
 nmap mm :make<CR><CR><CR>