Updated with default template folder