Add category and tag templates. Resolves #24