Fix orange colour schemes. See #1471