Fix Legacy and new themes.