Updated with new color states