Fixing line wrapping issues, at the cost of colour-since-commit working. Will look into it more later