Add black and white to color definitions