Added handling of colors