Updated colors to Jay's scheme

On the phone, we also decided
1) to make the diagonal black
2) to darken the deemphasized text for the default gray scale