Fixups for Theming, fully themed