More color fixes

Merged Sylvain Berfini requested to merge fix/colors_2 into master

Merge request reports