Update grid colors
Merge pull request #4019 from huffman/update-grid-colors

Update grid colors