Fix colours wrapping, somewhat