Improve color handling.