Pulling template updates from kimmoli