Move template changes into template overrides instead of modifying core