Theming API is now more generic