moved template filler types into templates.go