Fix highlighter typehints and use correct import path

Fix highlighter typehints and use correct import path #938