Use a gray for code color, merge steve's changes

[merge]