Changes that align with the current polaris base template