Improve highlight defs