Updated colors based on Ryan Bates changes