Added color to all types of draw