Fixed case where wrapping a line and parseColours is false
Improved colour handling