And make highlight colors consistent with our selection colors. Differential Revision: https://phabricator.services.mozilla.com/D120874