updated to new colors except red