Updated templates to be bootstrapped