added rest of the colors, fixed small bug