Bug#77833 Fixes of match colors