theming: clean-up