Added a host of new templates