Added trait-based colouring.