Improve color choice