Theme/Theming refactoring