More color fixes, I want to see this on a device.