More color fixes.