Move highlighter to extras and add a proper registry