cleaning up themes