Fixed colouring issues