added deftemplate and ^:text type-hinting