fixed 'at' matching, fixed highlight color