Theme clean-up