Integrated highlighter into the main plugin