adjustments to highlighting options and template