Theme name cleanup