Updated toggle highlight mapping.