Improve color support.

Change-Id: If59535bedd0c181c48dab4fa53e0777ff7d38de2