Substituting -grey for #999

Moving #888 text color to -grey

Adding border-dark-grey

Removing border-dark-grey from places where it isn't appropriate