Theme: reduce overhead and actually fix hacks that we had to make to patch bugs

Tentative Guidelines:

• Deprecate pretty freely as we won't remove deprecations until 10.0.
• make sure to add guidance to the upgrade guide