More color fixes!