diff --git a/.vim/templates/mdfm b/.vim/templates/mdfm
new file mode 100644
index 0000000..5dd1eef
--- /dev/null
+++ b/.vim/templates/mdfm
@@ -0,0 +1,8 @@
+:insert
+---
+filename:
+filecreated:
+fileupdated: 
+filetags: []
+---
+
diff --git a/.vim/templates/rlfm b/.vim/templates/rlfm
new file mode 100644
index 0000000..1537e50
--- /dev/null
+++ b/.vim/templates/rlfm
@@ -0,0 +1,16 @@
+:insert
+---
+filename:
+filecreated:
+fileupdated: 
+filetags: []
+booktitle: 
+bookauthor: 
+bookstarted:
+bookfinished: 
+---
+
+[Goodreads Link]()
+
+# Highlights / Notes
+
diff --git a/.vimrc b/.vimrc
index a2061a4..350425a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -337,13 +337,26 @@ hi SpellRare cterm=underline ctermbg=black ctermfg=gray
  
 " ---------------------------------------------------------------------------------------------------------------------
 " ==> Templates: markdown documents (.md)
+" 
+" autocmd BufNewFile *.md so $HOME/.vim/templates/md
+" autocmd BufNewFile *.md %s/filename/\=expand('%:t:r')/g
+" autocmd BufNewFile *.md exe "g/^- Created :.*/s//- Created : " .strftime("%Y-%m-%d")
+" autocmd BufNewFile *.md exe "normal Go"
+" autocmd BufWritePre,filewritepre *.md execute "normal! ma"
+" autocmd BufWritePre,filewritepre *.md exe "g/^- Updated :.*/s//- Updated : " .strftime("%Y-%m-%d %H:%M")
+" autocmd BufWritePost,filewritepost *.md execute "normal! `a"
 
-autocmd BufNewFile *.md so $HOME/.vim/templates/md
-autocmd BufNewFile *.md %s/filename/\=expand('%:t:r')/g
-autocmd BufNewFile *.md exe "g/^- Created :.*/s//- Created : " .strftime("%Y-%m-%d")
+" ---------------------------------------------------------------------------------------------------------------------
+" ==> Templates: markdown documents with frontmatter (.md)
+
+autocmd BufNewFile *.md so $HOME/.vim/templates/mdfm
+"autocmd BufNewFile *.md %s/filename:.*/s//filename:\=expand('%:t:r')
+"autocmd BufNewFile *.md %s/filename:.*/\='filename: '.expand('%:t:r')
+autocmd BufNewFile *.md exe "g/^filename:.*/s//filename: " .expand('%:t:r')
+autocmd BufNewFile *.md exe "g/^filecreated:.*/s//filecreated: " .strftime("%Y-%m-%d")
 autocmd BufNewFile *.md exe "normal Go"
 autocmd BufWritePre,filewritepre *.md execute "normal! ma"
-autocmd BufWritePre,filewritepre *.md exe "g/^- Updated :.*/s//- Updated : " .strftime("%Y-%m-%d %H:%M")
+autocmd BufWritePre,filewritepre *.md exe "g/^fileupdated:.*/s//fileupdated: " .strftime("%Y-%m-%d %H:%M")
 autocmd BufWritePost,filewritepost *.md execute "normal! `a"
 " ---------------------------------------------------------------------------------------------------------------------
 " ==> Templates: shell scripts (.sh)
@@ -370,10 +383,12 @@ nnoremap ,begend :-1read $HOME/.vim/templates/begend<CR>jA
 nnoremap ,sh :0read $HOME/.vim/templates/sh<CR> <bar> :1<CR>dd <bar> :4%s/filename/\=expand('%:t')/g<CR>
 
 "     section readinglist header
-nnoremap ,rl :0read $HOME/.vim/templates/readinglist<CR> <bar> :1<CR>dd $
+"nnoremap ,rl :0read $HOME/.vim/templates/readinglist<CR> <bar> :1<CR>dd $
+nnoremap ,rl :0read $HOME/.vim/templates/rlfm<CR> <bar>zR<CR> <bar> :1<CR>dd :%s/^filename:/\="filename: " . expand('%:t:r')/g<CR>
 
 "     section markdown file header
-nnoremap ,md :0read $HOME/.vim/templates/md<CR> <bar> :1<CR>dd <bar> :%s/filename/\=expand('%:t:r')/g<CR>
+"nnoremap ,md :0read $HOME/.vim/templates/md<CR> <bar> :1<CR>dd <bar> :%s/filename/\=expand('%:t:r')/g<CR>
+nnoremap ,md :0read $HOME/.vim/templates/mdfm<CR> <bar>zR<CR> <bar> :1<CR>dd :%s/^filename:/\="filename: " . expand('%:t:r')/g<CR>
 
 " ---------------------------------------------------------------------------------------------------------------------
 " ==> NetrwTreeListing readonly fix (https://vi.stackexchange.com/a/13012)