diff --git a/tree/.config/nvim/init.vim.tpl b/tree/.config/nvim/init.vim.tpl
index 59c3c27..0cb6faa 100644
--- a/tree/.config/nvim/init.vim.tpl
+++ b/tree/.config/nvim/init.vim.tpl
@@ -123,6 +123,14 @@ inoremap <right> <nop>
 syntax enable
 filetype plugin indent on
 
+" Handlebars -> HTML
+autocmd BufNewFile,BufRead *.hbs set syntax=html
+
+" Config template files
+autocmd BufNewFile,BufRead *.vim.tpl set syntax=vim
+autocmd BufNewFile,BufRead *.yml.tpl set syntax=yaml
+autocmd BufNewFile,BufRead *.toml.tpl set syntax=toml
+
 " Rust syntax highlighting for rust-ish files
 autocmd BufNewFile,BufRead *.ron set syntax=rust
 autocmd BufNewFile,BufRead *.lalrpop set syntax=rust