Make highlighting use this new thing