Highlight fix

This is a fix for #3.  It may not be solving what the original motivation was for turning off all the highlighting; but this works fine for us.