Added constant colourisation, corrected generic type parameter colourisation.