More color fixes