theme select cleanup