diff --git a/vim/.vim/colors/madtheme.vim b/vim/.vim/colors/madtheme.vim
index 022c0b8..d8a45b7 100644
--- a/vim/.vim/colors/madtheme.vim
+++ b/vim/.vim/colors/madtheme.vim
@@ -65,18 +65,15 @@ hi EasyMotionMoveHL cterm=none ctermbg=none ctermfg=darkblue
 hi EasyMotionTarget2First ctermbg=none ctermfg=red
 hi EasyMotionTarget2Second ctermbg=none ctermfg=lightred
 
-"    MBE
-hi   MBENormal                 cterm=none   ctermfg=grey        ctermbg=none
-hi   MBEChanged                cterm=none   ctermfg=white       ctermbg=none
-hi   MBEVisibleNormal          cterm=none   ctermfg=blue        ctermbg=none
-hi   MBEVisibleChanged         cterm=none   ctermfg=blue        ctermbg=none
-hi   MBEVisibleActiveNormal    cterm=none   ctermfg=lightblue   ctermbg=none
-hi   MBEVisibleActiveChanged   cterm=none   ctermfg=lightblue   ctermbg=none
-
 " ModeLine
 hi ModeLineNormal cterm=none ctermbg=none ctermfg=none
 hi ModeLineReplace cterm=none ctermbg=red ctermfg=none
 hi ModeLineInsert cterm=none ctermbg=green ctermfg=none
 hi ModeLineInsertPaste cterm=none ctermbg=blue ctermfg=none
 
+" Tabs
+hi TabLine cterm=none ctermfg=white ctermbg=none
+hi TabLineSel cterm=none ctermfg=lightblue ctermbg=none
+hi TabLineFill cterm=none ctermfg=none ctermbg=none
+
 "vim: sw=4
diff --git a/vim/.vimrc b/vim/.vimrc
index eedc53c..646d775 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -22,7 +22,7 @@ Plugin 'kana/vim-textobj-indent' "Indent based text objects
 Plugin 'benmills/vimux' "Tmux integration
 Plugin 'vim-scripts/argtextobj.vim' "function argument textobj
 Plugin 'rstacruz/sparkup' "quick html writing
-Plugin 'fholgado/minibufexpl.vim' "Top bar for buffers
+Plugin 'ap/vim-buftabline' "Buffer as tabline
 
 " --- End init vundle
 call vundle#end()
@@ -121,7 +121,7 @@ let mapleader = ","
 nnoremap <silent> <leader>q         :bd<cr>
 nnoremap <silent> <leader>w         :w<cr>
 " Insert empty line before and after
-nnoremap <silent> <C-o>             o<ESC>k
+nnoremap <silent> <C-o>             o<ESC>kO
 " Goto next emptyline
 nnoremap <silent> <space>           /^$<cr>
 " nnoremap <silent> <>         ?^$<cr>