Make colouring more consistent