Even more color fixes