diff --git a/after/syntax/markdown.vim b/after/syntax/markdown.vim
index 822b8b5..5586e17 100644
--- a/after/syntax/markdown.vim
+++ b/after/syntax/markdown.vim
@@ -48,3 +48,8 @@ syn match markdownTodo 'TODO'
 
 hi link markdownTodo Todo
 syn cluster markdownInline add=markdownTodo
+
+" yaml frontmatter
+syn region markdownFrontmatter matchgroup=markdownFrontmatterDelimiter start='\%^---' keepend end='^---' contains=@markdownHighlightyaml
+hi default link markdownFrontmatterDelimiter Special
+
diff --git a/vimrc b/vimrc
index 4c4a560..ee6cd49 100644
--- a/vimrc
+++ b/vimrc
@@ -131,7 +131,7 @@ let g:DoxygenToolkit_commentType = "C++"
 
 " markdown live browser preview
 Plug 'suan/vim-instant-markdown'
-let g:markdown_fenced_languages = ['cpp', 'c', 'cmake', 'sh', 'vim', 'python']
+let g:markdown_fenced_languages = ['cpp', 'c', 'cmake', 'sh', 'vim', 'python', 'yaml']
 
 " xterm-color-table.vim - view term and hex colors
 Plug 'guns/xterm-color-table.vim'
@@ -143,6 +143,7 @@ Plug 'tikhomirov/vim-glsl'
 Plug 'beyondmarc/hlsl.vim'
 Plug 'frasercrmck/opencl.vim'
 Plug 'asciidoc/vim-asciidoc'
+Plug 'mustache/vim-mustache-handlebars'
 
 if filereadable(expand('~/.vim/local.vim'))
   source ~/.vim/local.vim