diff --git a/vim/.vimrc b/vim/.vimrc
index b28639e..338a41b 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -109,6 +109,25 @@ hi CursorLine  cterm=NONE ctermbg=darkgrey ctermfg=white
 nmap ]h <Plug>(GitGutterNextHunk)
 nmap [h <Plug>(GitGutterPrevHunk)
 
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Colors
+"
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+set termguicolors
+" set t_Co=256
+" colorscheme gruvbox
+colorscheme catppuccin_macchiato
+set bg=dark
+
+" tmux color correction
+
+if exists('+termguicolors')
+  let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+  let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+  set termguicolors
+endif
+
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "
 " Status Line on the bottom
@@ -156,45 +175,32 @@ function! GitStatus()
   return printf('ap:+%d md: ~%d rm: -%d', a, m, r)
 endfunction
 
+highlight BufTab ctermfg=black ctermbg=White
+highlight GitDetails ctermfg=Magenta ctermbg=Black
+highlight FileDetails ctermfg=Black ctermbg=Blue
+
 set laststatus=2
 set statusline=
 set statusline+=%#PmenuSel#
 " set statusline+=%{StatuslineGit()}
 set statusline+=%{b:branchstatus}
-set statusline+=%#BufTabLineCurrent#
+set statusline+=%#BufTab#
 set statusline+=\ %M
 set statusline+=\ %r
 set statusline+=\ %F
 set statusline+=%= "Right side settings
 " set statusline+=%{FugitiveStatusline()}
-set statusline+=\ [%{GitStatus()}]
+set statusline+=%#GitDetails#
+set statusline+=[%{GitStatus()}]
 set statusline+=\ [%{LinterStatus()}\]
 set statusline+=\ %y
-set statusline+=%#CursorColumn#
+set statusline+=%#FileDetails#
 set statusline+=\ %{&fileencoding?&fileencoding:&encoding}
 set statusline+=\[%{&fileformat}\]
-set statusline+=\ %c:%l/%L
+set statusline+=\ [%c:%l/%L]
 set statusline+=\ %p%%
 set statusline+=\ [%n]
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"
-" Colors
-"
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-set termguicolors
-" colorscheme gruvbox
-colorscheme catppuccin_macchiato
-set bg=dark
-
-" tmux color correction
-
-if exists('+termguicolors')
-  let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
-  let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
-  set termguicolors
-endif
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "
 " tagbar, press F8