diff --git a/packages/language-support/src/antlr-grammar/Cypher5Lexer.g4 b/packages/language-support/src/antlr-grammar/Cypher5Lexer.g4
index e5db867f..e89bec55 100644
--- a/packages/language-support/src/antlr-grammar/Cypher5Lexer.g4
+++ b/packages/language-support/src/antlr-grammar/Cypher5Lexer.g4
@@ -1295,15 +1295,15 @@ IDENTIFIER
    ;
 
 ARROW_LINE
-   : [\-\u00AD]
+   : [\-\u00AD\u2010\u2011\u2012\u2013\u2014\u2015\ufe58\ufe63\uff0d]
    ;
 
 ARROW_LEFT_HEAD
-   : [<]
+   : [\u27e8\u3008\ufe64\uff1c\u003c]
    ;
 
 ARROW_RIGHT_HEAD
-   : [>]
+   : [\u27e9\u3009\ufe65\uff1e]
    ;
 
 fragment LETTER
diff --git a/packages/vscode-extension/esbuild.js b/packages/vscode-extension/esbuild.js
index 2d3264ea..31cf834f 100644
--- a/packages/vscode-extension/esbuild.js
+++ b/packages/vscode-extension/esbuild.js
@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 const esbuild = require('esbuild');
 
 const production = process.argv.includes('--production');
diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json
index b523260b..5900e99e 100644
--- a/packages/vscode-extension/package.json
+++ b/packages/vscode-extension/package.json
@@ -299,7 +299,7 @@
     "vscode:prepublish": "npm run build",
     "bundle-language-server": "cd ../language-server && npm run bundle && cp dist/cypher-language-server.js ../vscode-extension/dist/ && npm run bundle-worker && cp dist/lintWorker.js ../vscode-extension/dist/",
     "bundle-extension": "node ./esbuild.js --production",
-    "bundle-ndl": "esbuild src/ndl.ts --outfile=resources/styles/ndl.js --bundle --loader:.woff2=dataurl",
+    "bundle-ndl": "cp ./node_modules/@neo4j-ndl/base/lib/neo4j-ds-styles.css ./resources/styles/ndl.css",
     "bundle-extension:dev": "node ./esbuild.js",
     "bundle-webview-controllers": "esbuild ./src/webviews/controllers/* --bundle --outdir=dist --platform=browser",
     "build": "tsc -b && npm run gen-textmate && npm run bundle-extension && npm run bundle-language-server && npm run bundle-webview-controllers && npm run bundle-ndl",
diff --git a/packages/vscode-extension/src/ndl.ts b/packages/vscode-extension/src/ndl.ts
deleted file mode 100644
index 063f277a..00000000
--- a/packages/vscode-extension/src/ndl.ts
+++ /dev/null
@@ -1 +0,0 @@
-import '@neo4j-ndl/base/lib/neo4j-ds-styles.css';
diff --git a/vendor/antlr4-c3/package.json b/vendor/antlr4-c3/package.json
index 594b1f02..342c8700 100644
--- a/vendor/antlr4-c3/package.json
+++ b/vendor/antlr4-c3/package.json
@@ -30,7 +30,7 @@
     "build-commonjs": "tsc --module commonjs --outDir dist/cjs",
     "prepublishOnly": "npm run generate && npm run test",
     "test": "vitest run",
-    "generate": "cd tests && generate.sh",
+    "generate": "cd tests && sh generate.sh",
     "eslint": "eslint .",
     "clean": "rm -rf dist"
   },