fix templates & add new type (no content)