Updating colors to include highlights from android style guide