Updated #308 - Ready to merge - Remove colors form a report definition