clean up theming