Color More

Change-Id: Ibf32d10a61914341c62376508edca216ff366e9a