I don't want to have to maintain them both any longer than necessary,
but I recognize that porting over customizations could be
time-consuming.
I think we need some sort of announcement that this is officially going to be deprecated so that we have time to port the customizations from both themes, but I don't think that one release cycle is enough.