Updated templates to use Mike Swanson's shape.