Fix highlighter typehints and use correct import path (#943)

Fix highlighter typehints and use correct import path (#943) #939