#209 Correction of the charts & changing the colours