Add patch from 2007 highlight options.