100+ commits inbound for the color changes