LIB001-438 Make highlighting configurable

Make highlighting configurable