Pre-release: added two new templates; reworked description of the existing templates