Templates follow suit

Signed-off-by: Chris Burnell <me@chrisburnell.com>