More theming refactoring