diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 3536e8c..ab60b04 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -18,7 +18,6 @@ Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
 Plug 'kyazdani42/nvim-web-devicons'
 Plug 'kyazdani42/nvim-tree.lua'
-Plug 'akinsho/nvim-bufferline.lua'
 Plug 'svermeulen/vimpeccable'
 call plug#end()
 
@@ -49,7 +48,7 @@ set background=dark
 set backspace=indent,eol,start
 set number
 set autoread
-set mouse=a
+" set mouse=a
 set nobackup
 set nowb
 set noswapfile
@@ -75,6 +74,9 @@ nmap N Nzz
 
 let g:airline_powerline_fonts=1
 let g:airline_theme='base16_eighties'
+let g:airline#extensions#tabline#enabled = 1
+noremap <F2> :bp<CR>
+noremap <F3> :bn<CR>
 
 set pastetoggle=<F5>
 
@@ -101,10 +103,6 @@ map <Leader>s :StripWhitespace<CR>
 nnoremap <leader>g :Rg<CR>
 nnoremap <silent><leader>l :Buffers<CR>
 
-if !has('gui_running')
-  set t_Co=256
-endif
-
 nnoremap <F8> :call SetNewPassword()<CR>
 function! SetNewPassword()
   let cur_word = expand('<cword>')
@@ -134,7 +132,3 @@ nnoremap <leader>n :NvimTreeFindFile<CR>
 let g:nvim_tree_auto_close = 1
 " let g:nvim_tree_quit_on_open = 1
 let g:nvim_tree_git_hl = 1
-
-lua require'bufferline'.setup{}
-noremap <F2> :BufferLineCyclePrev<CR>
-noremap <F3> :BufferLineCycleNext<CR>