Only one issue I see with this pull request: adding `$ZSH_CUSTOM` in the template will make it nice for the new setups, but breaks backward compatibility for people who don't use it.

It's definitely a tough choice to make in order to move on, but I'd suggest using default values (such as this line that's getting removed) and surfacing options to override defaults, rather than having users set their own defaults