Cleaning up the theme'