1 files changed, 7 insertions, 5 deletions

diff --git a/plugin/statusline.vim b/plugin/statusline.vim
index dc98a71..e6f175d 100644
--- a/plugin/statusline.vim
+++ b/plugin/statusline.vim
@@ -58,12 +58,13 @@ augroup MAX_FANCYLINE
                     \ .'%#StatusLineHighlight#'
                     \ .'%#'.a:highlight_group.'#'
                     \ .g:symbol_screen_edge
-                    \ .'%(%w%h%q%)'.' '.l:mode.' '.g:status_sym_sep_start
+                    \ .'%{&buftype != "" ? " ".&buftype : ""}'
+                    \ .' '.l:mode.g:status_sym_sep_start
                     \ .'%{argc() > 1 ? " ".(argidx() + 1).":".argc()." ".g:status_sym_sep_start : ""}'
                     \ .'%{haslocaldir() ? fnamemodify(getcwd(), ":.:~")." " :""}'
                     \ .'%{&readonly ? " 🔒" : ""}'
                     \ .'%{&modified ? " 💾 " : ""}'
-                    \ .'%{winbufnr(0)." "}'
+                    \ .'%{" [".winbufnr(0)."] "}'
                     \ .'%{bufname("%") == "" ? "" : fnamemodify(expand("%"), ":~:.")}'
                     \ .'%{&titlestring ? has("nvim") ? b:term_title:expand(&titlestring) : "" }'
                     \ .'%{exists("w:quickfix_title") ? w:quickfix_title : ""}'
@@ -111,7 +112,7 @@ augroup MAX_FANCYLINE
                     \ .g:status_sym_start
                     \ .'%(%#'.a:highlight_group.'#%)'
                     \ .' '
-                    \ .'%-3(%)'
+                    \ .'%-2(%)'
                     \ .'%(%#'.a:highlight_group.'#%)'
                     \ .'%(%{v:servername} %{v:this_session}%)'
                     \ .g:status_sym_sep_end.' '
@@ -136,10 +137,11 @@ augroup MAX_FANCYLINE
         highlight! StatusLine cterm=reverse
         " exec 'highlight! User3 guifg=#D2A032 guibg='.l:fgcolor
     endfunction
+    call ApplyColorScheme()
+
     " apply colors from the loaded colorscheme...
     " when changing the colorscheme also apply new colors to the statusbar...
-    autocmd VimEnter,ColorScheme  * call ApplyColorScheme()
-
+    autocmd ColorScheme  * call ApplyColorScheme()
     autocmd WinEnter    * setlocal statusline=%!UpdateStatus(g:group_active)
     autocmd WinLeave    * setlocal statusline<
 augroup END " MAX_FANCYLINE