Closed #3080 Unified label option across Theme API calls