fix(editor): contrast, surfaces and controls that report what they claim to

fix(editor): contrast, surfaces and controls that report what they claim to #1973