Changing reference of colours to number
Moved enum of colour elsewhere