Update templates to have includes and base template