Theme clean up.