Color Changes

Change-Id: I404b88ded9b741f052d955847cdadb396f69c246