diff --git a/.vim/templates/md b/.vim/templates/md
index aca8638..eb2fc20 100644
--- a/.vim/templates/md
+++ b/.vim/templates/md
@@ -1,16 +1,17 @@
 :insert
+---
 
-# Title
-
-Created: 
-
-Updated: 
-
-## Summary
-
-
+tags: [ untagged ]
+title: 
+created: 
 
 ---
 
-## Reference(s):
+# Title
+
+## Summary
+
+___
+
+## Reference(s)
 
diff --git a/.vimrc b/.vimrc
index 3efdbc7..6786ec7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -251,9 +251,11 @@ autocmd bufWritePost,filewritepost *.py execute "normal `a"
 " ==> Templates: markdown documents (.md, .mkd)
 
 autocmd BufNewFile *.md,*.mkd so $HOME/.vim/templates/md
-autocmd BufNewFile *.md,*.mkd exe "g/Created:.*/s//Created: " .strftime("%c")
+autocmd BufNewFile *.md,*.mkd %s/title:.*/\='title: '.expand('%:r')/e
+autocmd BufNewFile *.md,*.mkd %s/\# Title.*/\='# '.expand('%:r')/e
+autocmd BufNewFile *.md,*.mkd exe "g/created:.*/s//created: " .strftime("%c")
 autocmd BufWritePre,filewritepre *.md,*.mkd execute "normal ma"
-autocmd BufWritePre,filewritepre *.md,*.mkd exe "g/Updated:.*/s//Updated: " .strftime("%c")
+"autocmd BufWritePre,filewritepre *.md,*.mkd exe "g/Updated:.*/s//Updated: " .strftime("%c")
 autocmd bufWritePost,filewritepost *.md,*.mkd execute "normal `a"
 
 " ---------------------------------------------------------------------------------------------------------------------