Work on remap colours and add exception for HARV and MCV