Updated Templates

Better, faster, stronger