Cleanup
Fix installation of standalone templates