Improve color/formatting handling