Upgrade to new highlighting option.