Ticket #2169: Colors fixups for backward compability