Updated colors throughout