Updated with new set colors