diff --git a/.vimrc.bundles b/.vimrc.bundles
index 409b3ca..e674b0f 100644
--- a/.vimrc.bundles
+++ b/.vimrc.bundles
@@ -191,10 +191,16 @@ endfunction
         let g:startify_lists = [
             \ { 'header': ['   RECENT'],            'type': 'files' },
             \ { 'header': ['   SESSIONS'],       'type': 'sessions' },
-            \ { 'header': ['   WORKING DIR: '. getcwd()], 'type': 'dir' },
         \ ]
     endif
     " }
+    "
+    " ryanoasis/vim-devicons {
+    if HasPlug("vim-devicons")
+        let g:webdevicons_enable_airline_statusline = 0
+    endif
+    " }
+    "
     " simeji/winresizer {
     if HasPlug("winresizer")
         let g:winresizer_vert_resize  = 2
@@ -321,19 +327,17 @@ endfunction
         
         " This must using my fork version of bufferline
         "
-        let g:bufferline_max_length   = &columns - 30
+        let g:bufferline_max_length   = &columns - 22
         function! BufferNumber()
             return len(g:index_to_buffer)
         endfunction
         call airline#parts#define_function('bufnum', 'BufferNumber')
 
-        let g:airline_section_b       = ''
+        let g:airline_extensions = ['bufferline', 'filetype']
         let g:airline_section_x       = airline#section#create(['bufnum'])
         let g:airline_section_y       = ''
         let g:airline_section_z       = airline#section#create(['filetype'])
-        "let g:airline_section_gutter  = ''
-        let g:airline_section_warning = ''
-        let g:airline_section_error   = ''
+        let g:airline_skip_empty_sections = 1
         "let g:airline_exclude_filetypes = ['nerdtree'] " see source for current list
         let g:airline#extensions#nerdtree_statusline = 0
         "let g:airline#extensions#bufferline#overwrite_variables = 0
@@ -610,9 +614,9 @@ endfunction
         end   
 
         if g:vim_version >= 0.5 && HasPlug("/github-nvim-theme")
-            " let g:dark_theme = 'github_dark'
+            let g:dark_theme = 'github_dark'
             " let g:dark_theme = 'github_dark_default'
-            let g:dark_theme = 'github_dimmed'
+            " let g:dark_theme = 'github_dimmed'
             let g:airline_dark_theme = "hybrid"               
         end
     endif
@@ -696,19 +700,19 @@ endfunction
         " nnoremap <Leader>7 :b7<CR>
         " nnoremap <Leader>8 :b8<CR>
         " nnoremap <Leader>9 :b9<CR>
-        nnoremap <nowait> <Leader>1 :call bufferline#jump(1)<CR>
-        nnoremap <nowait> <Leader>2 :call bufferline#jump(2)<CR>
-        nnoremap <nowait> <Leader>3 :call bufferline#jump(3)<CR>
-        nnoremap <nowait> <Leader>4 :call bufferline#jump(4)<CR>
-        nnoremap <nowait> <Leader>5 :call bufferline#jump(5)<CR>
-        nnoremap <nowait> <Leader>6 :call bufferline#jump(6)<CR>
-        nnoremap <nowait> <Leader>7 :call bufferline#jump(7)<CR>
-        nnoremap <nowait> <Leader>8 :call bufferline#jump(8)<CR>
-        nnoremap <nowait> <Leader>9 :call bufferline#jump(9)<CR>
-        nnoremap <nowait> <Space>10 :call bufferline#jump(10)<CR>
-        nnoremap <nowait> <Space>11 :call bufferline#jump(11)<CR>
-        nnoremap <nowait> <Space>12 :call bufferline#jump(12)<CR>
-        nnoremap <nowait> <Space>13 :call bufferline#jump(13)<CR>
+        nnoremap <silent> <nowait> <Leader>1 :call bufferline#jump(1)<CR>
+        nnoremap <silent> <nowait> <Leader>2 :call bufferline#jump(2)<CR>
+        nnoremap <silent> <nowait> <Leader>3 :call bufferline#jump(3)<CR>
+        nnoremap <silent> <nowait> <Leader>4 :call bufferline#jump(4)<CR>
+        nnoremap <silent> <nowait> <Leader>5 :call bufferline#jump(5)<CR>
+        nnoremap <silent> <nowait> <Leader>6 :call bufferline#jump(6)<CR>
+        nnoremap <silent> <nowait> <Leader>7 :call bufferline#jump(7)<CR>
+        nnoremap <silent> <nowait> <Leader>8 :call bufferline#jump(8)<CR>
+        nnoremap <silent> <nowait> <Leader>9 :call bufferline#jump(9)<CR>
+        nnoremap <silent> <nowait> <Space>10 :call bufferline#jump(10)<CR>
+        nnoremap <silent> <nowait> <Space>11 :call bufferline#jump(11)<CR>
+        nnoremap <silent> <nowait> <Space>12 :call bufferline#jump(12)<CR>
+        nnoremap <silent> <nowait> <Space>13 :call bufferline#jump(13)<CR>
     end
 
     " split window comform with other window management shortcuts