clean up and new theme