diff --git a/.vimrc b/.vimrc
index 3426e37..2b3bc1a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -51,16 +51,16 @@ set expandtab
 
 set laststatus=2                                     " always show statusline
 set statusline=                                      " clear on reload
-set statusline+=[\ b%n\ ]                            " buffer number
-set statusline+=\ %f                                 " filename
-set statusline+=\ [%{strlen(&fenc)?&fenc:'none'},    " file encoding
-set statusline+=\ %{&ff}]                            " file format
-set statusline+=\ %y                                 " filetype
-set statusline+=\ %H\ %m\ %r\ %W                     " flags
+set statusline+=[\ Buf\ %n\ ]                        " buffer number
+set statusline+=\%H\ %m\ %r\ %W                      " flags
+set statusline+=[\ %f\ ]                             " filename
+set statusline+=\%y                                  " filetype
+set statusline+=\[%{strlen(&fenc)?&fenc:'none'},     " file encoding
+set statusline+=\%{&ff}]                             " file format
 set statusline+=%=                                   " left/right separator
-set statusline+=l:%l/%L                              " cursor line/total lines
-set statusline+=\ c:%c                               " cursor column
-set statusline+=\ %P                                 " percent through file
+set statusline+=line:%l\ of\ %L                      " cursor line/total lines
+set statusline+=\ col:%c                             " cursor column
+set statusline+=\ [%P]                               " percent through file
 
 autocmd! bufwritepost .vimrc source ~/.vimrc         " When vimrc is edited, reload it
 
@@ -84,8 +84,7 @@ set omnifunc=syntaxcomplete#Complete
 
 " Personal Notes settings
 " export NOTES_DIR=<your notes directory> before use
-
-" Go to index of notes and set working directory to my notes
+" Go to index of notes and set working directory
 nnoremap <leader>ww :e $NOTES_DIR/Index.md<CR>:cd $NOTES_DIR<CR>
 
 " <leader>[ to grep inside Notes files
@@ -185,7 +184,7 @@ hi visual cterm=NONE ctermbg=darkyellow ctermfg=white
 set fillchars=vert:│,fold:┈,diff:┈
 " In split windows - active buffer status bar is green, inactive is yellow
 hi StatusLine   ctermfg=white ctermbg=darkgreen cterm=bold 
-hi StatusLineNC ctermfg=white ctermbg=darkyellow cterm=none 
+hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=none 
 
 " ---------------------------------------------------------------------------------------------------------------------
 " => Keymaps: Highlights
@@ -317,7 +316,7 @@ autocmd BufWritePost,filewritepost *.md execute "normal! `a"
 " ==> Templates: shell scripts (.sh)
 
 autocmd BufNewFile *.sh so $HOME/.vim/templates/sh
-autocmd BufNewFile *.sh %s/FILE:.*/\='FILE: '.expand('%:t:r')/e
+autocmd BufNewFile *.sh :%s/filename/\=expand('%:t:r')/g
 autocmd BufNewFile *.sh exe "g/CREATED:.*/s//CREATED: " .strftime("%Y-%m-%d")
 autocmd BufNewFile *.sh exe "normal Go"
 autocmd BufWritePre,filewritepre *.sh execute "normal ma"
@@ -353,7 +352,7 @@ autocmd FileType netrw setl bufhidden=delete
 " ---------------------------------------------------------------------------------------------------------------------
 " ==> yaml stuff (https://lornajane.net/posts/2018/vim-settings-for-working-with-yaml)
 "
-"autocmd BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml 
-"autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
+autocmd BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml  foldmethod=indent
+autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab