Remove more references to theme