Moved entry-specific templates to separate templates