Trying to use the builtin highlighter

There was so much diff in there