Fixed Legacy and new themes.